diff options
| author | Jim McGrath <jimmc2@gmail.com> | 2010-10-11 14:45:01 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-10-11 14:45:01 -0400 |
| commit | 3d0726b04d123819648df7a8b492b349de48c31a (patch) | |
| tree | 1e8d7a4275f0539548643f9d998040a67aacae8d | |
| parent | 0f6926474f979f4ffd27b950fd0daf7603e17f29 (diff) | |
| download | go-3d0726b04d123819648df7a8b492b349de48c31a.tar.gz go-3d0726b04d123819648df7a8b492b349de48c31a.zip | |
6l: correct offset for __nl_symbol_ptr in Mach-O.
Fixes malformed object message from nm etc.
Fixes #1180.
R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/2390042
| -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 63668a81dd..a3d302401e 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 */ /* |