diff options
| author | christos <christos@pkgsrc.org> | 2014-05-15 20:00:47 +0000 |
|---|---|---|
| committer | christos <christos@pkgsrc.org> | 2014-05-15 20:00:47 +0000 |
| commit | e68afd4740351d973811d739fe5e5614d4d241bf (patch) | |
| tree | 184cfa22b4fe339a2e116a1b73f3d2dc974988b8 /lang | |
| parent | 6f7a855a44865435ce5a9c59f8015e66e72ca62d (diff) | |
| download | pkgsrc-e68afd4740351d973811d739fe5e5614d4d241bf.tar.gz | |
apply note creation bug fix from the go mercurial head, and adjust our code
so that it works in both cases.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/go/distinfo | 4 | ||||
| -rw-r--r-- | lang/go/patches/patch-src_cmd_ld_elf.c | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lang/go/distinfo b/lang/go/distinfo index f08372b6a0b..668de4b6895 100644 --- a/lang/go/distinfo +++ b/lang/go/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2014/05/15 19:35:49 christos Exp $ +$NetBSD: distinfo,v 1.7 2014/05/15 20:00:47 christos Exp $ SHA1 (go1.2.1.src.tar.gz) = 6a4b9991eddd8039438438d6aa25126ab7e07f2f RMD160 (go1.2.1.src.tar.gz) = ed813801a46e26952ab92be9acd145962937cc7e Size (go1.2.1.src.tar.gz) = 9520633 bytes -SHA1 (patch-src_cmd_ld_elf.c) = 4cdd754a7cb9c8e0a831090daa801c270f8f7a6c +SHA1 (patch-src_cmd_ld_elf.c) = fd65c28a0191d06b2cab3c33a12276393d615bc8 diff --git a/lang/go/patches/patch-src_cmd_ld_elf.c b/lang/go/patches/patch-src_cmd_ld_elf.c index bcfc022c118..91446ee2dfa 100644 --- a/lang/go/patches/patch-src_cmd_ld_elf.c +++ b/lang/go/patches/patch-src_cmd_ld_elf.c @@ -1,16 +1,24 @@ -$NetBSD: patch-src_cmd_ld_elf.c,v 1.1 2014/05/15 19:35:49 christos Exp $ +$NetBSD: patch-src_cmd_ld_elf.c,v 1.2 2014/05/15 20:00:47 christos Exp $ Correctly compute the note size! --- src/cmd/ld/elf.c.orig 2014-05-15 15:25:59.000000000 -0400 +++ src/cmd/ld/elf.c 2014-05-15 15:25:07.000000000 -0400 -@@ -388,7 +388,8 @@ +@@ -355,7 +355,7 @@ + sh->addralign = 4; + sh->addr = startva + resoff - n; + sh->off = resoff - n; +- sh->size = n; ++ sh->size = n - resoff % 4; + + return n; + } +@@ -388,7 +388,7 @@ { int n; - n = ELF_NOTE_NETBSD_NAMESZ + ELF_NOTE_NETBSD_DESCSZ + 1; + n = rnd(ELF_NOTE_NETBSD_NAMESZ, 4) + rnd(ELF_NOTE_NETBSD_DESCSZ, 4); -+ n -= resoff % 4; return elfnote(sh, startva, resoff, n); } |