diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-02-14 13:23:51 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-02-14 13:23:51 +0100 |
| commit | 758ff64c69e34965f8af5b2d6ffd65e8d7ab2150 (patch) | |
| tree | 6d6b34f8c678862fe9b56c945a7b63f68502c245 /src/cmd/8l/asm.c | |
| parent | 3e45412327a2654a77944249962b3652e6142299 (diff) | |
| download | golang-upstream/2011-02-01.1.tar.gz | |
Imported Upstream version 2011-02-01.1upstream/2011-02-01.1
Diffstat (limited to 'src/cmd/8l/asm.c')
| -rw-r--r-- | src/cmd/8l/asm.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/cmd/8l/asm.c b/src/cmd/8l/asm.c index cdb5a33e6..6e83d8dea 100644 --- a/src/cmd/8l/asm.c +++ b/src/cmd/8l/asm.c @@ -520,7 +520,7 @@ adddynsym(Sym *s) adduint8(d, 0); // section adduint16(d, 0); // desc adduint32(d, 0); // value - } else { + } else if(HEADTYPE != 10) { diag("adddynsym: unsupported binary format"); } } @@ -540,7 +540,7 @@ adddynlib(char *lib) elfwritedynent(lookup(".dynamic", 0), DT_NEEDED, addstring(s, lib)); } else if(HEADTYPE == 6) { // Mach-O machoadddynlib(lib); - } else { + } else if(HEADTYPE != 10) { diag("adddynlib: unsupported binary format"); } } @@ -936,14 +936,17 @@ asmb(void) sh->type = SHT_PROGBITS; sh->flags = SHF_ALLOC; sh->addralign = 1; - switch(HEADTYPE) { - case 7: - elfinterp(sh, startva, linuxdynld); - break; - case 9: - elfinterp(sh, startva, freebsddynld); - break; + if(interpreter == nil) { + switch(HEADTYPE) { + case 7: + interpreter = linuxdynld; + break; + case 9: + interpreter = freebsddynld; + break; + } } + elfinterp(sh, startva, interpreter); ph = newElfPhdr(); ph->type = PT_INTERP; |