diff options
| author | Tianon Gravi <admwiggin@gmail.com> | 2014-11-25 23:46:26 -0700 |
|---|---|---|
| committer | Tianon Gravi <admwiggin@gmail.com> | 2014-11-25 23:46:26 -0700 |
| commit | 8d8329ed5dfb9622c82a9fbec6fd99a580f9c9f6 (patch) | |
| tree | c4c86e525346536900b0e51a90f4d9a0db1ee895 /src/cmd | |
| parent | f4fa1ef6e6ccd9264db61c6400528158e5913bda (diff) | |
| download | golang-upstream/1.3.3.tar.gz | |
Imported Upstream version 1.3.3upstream/1.3.3
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/5l/asm.c | 4 | ||||
| -rw-r--r-- | src/cmd/6l/asm.c | 8 | ||||
| -rw-r--r-- | src/cmd/8l/asm.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/cmd/5l/asm.c b/src/cmd/5l/asm.c index 5e9267b5b..e87921218 100644 --- a/src/cmd/5l/asm.c +++ b/src/cmd/5l/asm.c @@ -599,10 +599,10 @@ asmb(void) if(iself) goto ElfSym; case Hplan9: - symo = HEADR+segtext.len+segdata.filelen; + symo = segdata.fileoff+segdata.filelen; break; ElfSym: - symo = rnd(HEADR+segtext.filelen, INITRND)+rnd(HEADR+segrodata.filelen, INITRND)+segdata.filelen; + symo = segdata.fileoff+segdata.filelen; symo = rnd(symo, INITRND); break; } diff --git a/src/cmd/6l/asm.c b/src/cmd/6l/asm.c index e251e32ca..7828e2892 100644 --- a/src/cmd/6l/asm.c +++ b/src/cmd/6l/asm.c @@ -689,10 +689,10 @@ asmb(void) case Hplan9: case Helf: debug['s'] = 1; - symo = HEADR+segtext.len+segdata.filelen; + symo = segdata.fileoff+segdata.filelen; break; case Hdarwin: - symo = rnd(HEADR+segtext.len, INITRND)+rnd(segdata.filelen, INITRND)+machlink; + symo = segdata.fileoff+rnd(segdata.filelen, INITRND)+machlink; break; case Hlinux: case Hfreebsd: @@ -701,11 +701,11 @@ asmb(void) case Hdragonfly: case Hsolaris: case Hnacl: - symo = rnd(HEADR+segtext.len, INITRND)+rnd(segrodata.len, INITRND)+segdata.filelen; + symo = segdata.fileoff+segdata.filelen; symo = rnd(symo, INITRND); break; case Hwindows: - symo = rnd(HEADR+segtext.filelen, PEFILEALIGN)+segdata.filelen; + symo = segdata.fileoff+segdata.filelen; symo = rnd(symo, PEFILEALIGN); break; } diff --git a/src/cmd/8l/asm.c b/src/cmd/8l/asm.c index 114a3eb5d..c135dce70 100644 --- a/src/cmd/8l/asm.c +++ b/src/cmd/8l/asm.c @@ -619,17 +619,17 @@ asmb(void) if(iself) goto Elfsym; case Hplan9: - symo = HEADR+segtext.filelen+segdata.filelen; + symo = segdata.fileoff+segdata.filelen; break; case Hdarwin: - symo = rnd(HEADR+segtext.filelen, INITRND)+rnd(segdata.filelen, INITRND)+machlink; + symo = segdata.fileoff+rnd(segdata.filelen, INITRND)+machlink; break; Elfsym: - symo = rnd(HEADR+segtext.filelen, INITRND)+rnd(HEADR+segrodata.filelen, INITRND)+segdata.filelen; + symo = segdata.fileoff+segdata.filelen; symo = rnd(symo, INITRND); break; case Hwindows: - symo = rnd(HEADR+segtext.filelen, PEFILEALIGN)+segdata.filelen; + symo = segdata.fileoff+segdata.filelen; symo = rnd(symo, PEFILEALIGN); break; } |