diff options
| author | forsyth <forsyth@lavoro.terzarima.net> | 2013-06-03 21:01:14 +0000 |
|---|---|---|
| committer | forsyth <forsyth@lavoro.terzarima.net> | 2013-06-03 21:01:14 +0000 |
| commit | 45a20ab721a513710138340faff3d59a31c3e01e (patch) | |
| tree | eea29d2684c51cc73725b8992a2125bede48e118 /utils/libmach/executable.c | |
| parent | cd8e99851af33e52bcdf8faf34f9d4e62fa0cbaf (diff) | |
sync compilers with Plan 9
remove 1[acl] 2[acl]
Diffstat (limited to 'utils/libmach/executable.c')
| -rw-r--r-- | utils/libmach/executable.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/utils/libmach/executable.c b/utils/libmach/executable.c index a6a2be31..b9954f0a 100644 --- a/utils/libmach/executable.c +++ b/utils/libmach/executable.c @@ -60,7 +60,6 @@ extern Mach mmips; extern Mach mmips2le; extern Mach mmips2be; extern Mach msparc; -extern Mach m68020; extern Mach mi386; extern Mach mamd64; extern Mach marm; @@ -141,24 +140,6 @@ ExecTable exectab[] = sizeof(struct sparcexec), beswal, sparcboot }, - { A_MAGIC, /* 68020 2.out & boot image */ - "68020 plan 9 executable", - "68020 plan 9 dlm", - F68020, - 1, - &m68020, - sizeof(Exec), - beswal, - common }, - { 0xFEEDFACE, /* Next boot image */ - "next plan 9 boot image", - nil, - FNEXTB, - 0, - &m68020, - sizeof(struct nextexec), - beswal, - nextboot }, { I_MAGIC, /* I386 8.out & boot image */ "386 plan 9 executable", "386 plan 9 dlm", @@ -364,12 +345,6 @@ commonboot(Fhdr *fp) fp->name = "ARM plan 9 boot image"; fp->dataddr = _round(fp->txtaddr+fp->txtsz, mach->pgsize); return; - case FALPHA: - fp->type = FALPHAB; - fp->txtaddr = (u32int)fp->entry; - fp->name = "alpha plan 9 boot image"; - fp->dataddr = fp->txtaddr+fp->txtsz; - break; case FPOWER: fp->type = FPOWERB; fp->txtaddr = (u32int)fp->entry; @@ -601,6 +576,10 @@ elfdotout(int fd, Fhdr *fp, ExecHdr *hp) mach = &mamd64; fp->type = FAMD64; break; + case ARM: + mach = &marm; + fp->type = FARM; + break; default: return 0; } |