diff options
| author | Alex Brainman <alex.brainman@gmail.com> | 2011-02-23 14:30:40 +1100 |
|---|---|---|
| committer | Alex Brainman <alex.brainman@gmail.com> | 2011-02-23 14:30:40 +1100 |
| commit | 0cf6f8c096e8482da62ffa264ba6929f9179945e (patch) | |
| tree | 352a215bc65de99ccab93ce279912a1b766eefc3 /src/cmd/ld/data.c | |
| parent | cd0f799e65619c30e984c03b905507ff0216e825 (diff) | |
| download | go-0cf6f8c096e8482da62ffa264ba6929f9179945e.tar.xz | |
5l/6l/8l: use enums for header type and symbolic strings for -H option values
Thanks to rsc for the suggestion.
R=r
CC=golang-dev
https://golang.org/cl/4174060
Diffstat (limited to 'src/cmd/ld/data.c')
| -rw-r--r-- | src/cmd/ld/data.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/ld/data.c b/src/cmd/ld/data.c index 0551232cfc..a20b057ce5 100644 --- a/src/cmd/ld/data.c +++ b/src/cmd/ld/data.c @@ -241,7 +241,7 @@ dynrelocsym(Sym *s) { Reloc *r; - if(thechar == '8' && HEADTYPE == 10) { // Windows PE + if(HEADTYPE == Hwindows) { Sym *rel, *targ; rel = lookup(".rel", 0); @@ -898,9 +898,9 @@ address(void) segdata.rwx = 06; segdata.vaddr = va; segdata.fileoff = va - segtext.vaddr + segtext.fileoff; - if((thechar == '6' || thechar == '8') && HEADTYPE == 10) // Windows PE + if(HEADTYPE == Hwindows) segdata.fileoff = segtext.fileoff + rnd(segtext.len, PEFILEALIGN); - if(thechar == '8' && HEADTYPE == 2) { // Plan 9 + if(HEADTYPE == Hplan9x32) { segdata.vaddr = va = rnd(va, 4096); segdata.fileoff = segtext.fileoff + segtext.filelen; } |