diff options
| author | Jim McGrath <jimmc2@gmail.com> | 2010-10-11 14:45:01 -0400 |
|---|---|---|
| committer | Jim McGrath <jimmc2@gmail.com> | 2010-10-11 14:45:01 -0400 |
| commit | 0eca4ed7aec0fc0590acecd79fe1e82538314c1c (patch) | |
| tree | 3687411a72552a6747a201e4b38dc430a11df81e | |
| parent | 0c5220e55dcd06fd9dca2a371461a74582d2cae9 (diff) | |
| download | go-0eca4ed7aec0fc0590acecd79fe1e82538314c1c.tar.gz | |
6l: correct offset for __nl_symbol_ptr in Mach-O.
Fixes malformed object message from nm etc.
Fixes issue 1180.
R=golang-dev, rsc
CC=golang-dev
http://codereview.appspot.com/2390042
Committer: Russ Cox <rsc@golang.org>
| -rw-r--r-- | src/cmd/ld/macho.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cmd/ld/macho.c b/src/cmd/ld/macho.c index 63668a81d..a3d302401 100644 --- a/src/cmd/ld/macho.c +++ b/src/cmd/ld/macho.c @@ -497,7 +497,7 @@ asmbmacho(vlong symdatva, vlong symo) ms->vaddr = va+v; ms->vsize = w; ms->fileoffset = v; - ms->filesize = datsize; + ms->filesize = datsize+dynptrsize; ms->prot1 = 7; ms->prot2 = 3; @@ -510,6 +510,7 @@ asmbmacho(vlong symdatva, vlong symo) msect = newMachoSect(ms, "__nl_symbol_ptr"); msect->addr = va+v+datsize; msect->size = dynptrsize; + msect->off = v+datsize; msect->align = 2; msect->flag = 6; /* section with nonlazy symbol pointers */ /* |