diff options
| author | emaste <emaste@FreeBSD.org> | 2015-12-18 01:44:03 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2015-12-18 01:44:03 +0000 |
| commit | a22ae7157f85004671251161ac6424dacda7e1b6 (patch) | |
| tree | e698f79f83b28434531c021ccc118e284df77bfe /usr.sbin | |
| parent | 4f0dd9d34230cbe52db6cc67f11621ae6818eba7 (diff) | |
| download | FreeBSD-src-a22ae7157f85004671251161ac6424dacda7e1b6.zip FreeBSD-src-a22ae7157f85004671251161ac6424dacda7e1b6.tar.gz | |
Sync crunchide(1) arch support with HEAD
MFC r276764, r281781, r282291, r292106
Add support to crunchide for handling AArch64 (arm64) ELF files.
Remove local EM_* ELF definitions provided by system ELF headers
Restore local EM_AARCH64 constant for bootstrapping
Add RISC-V to supported machine types
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/crunch/crunchide/exec_elf32.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c index 288edf69..dd8c1b0 100644 --- a/usr.sbin/crunch/crunchide/exec_elf32.c +++ b/usr.sbin/crunch/crunchide/exec_elf32.c @@ -175,37 +175,20 @@ ELFNAMEEND(check)(int fd, const char *fn) switch (xe16toh(eh.e_machine)) { case EM_386: break; case EM_ALPHA: break; -#ifndef EM_ARM -#define EM_ARM 40 +#ifndef EM_AARCH64 +#define EM_AARCH64 183 #endif + case EM_AARCH64: break; case EM_ARM: break; -#ifndef EM_MIPS -#define EM_MIPS 8 -#endif -#ifndef EM_MIPS_RS4_BE /* same as EM_MIPS_RS3_LE */ -#define EM_MIPS_RS4_BE 10 -#endif case EM_MIPS: break; case /* EM_MIPS_RS3_LE */ EM_MIPS_RS4_BE: break; -#ifndef EM_IA_64 -#define EM_IA_64 50 -#endif - case EM_IA_64: break; -#ifndef EM_PPC -#define EM_PPC 20 -#endif case EM_PPC: break; -#ifndef EM_PPC64 -#define EM_PPC64 21 -#endif case EM_PPC64: break; -#ifndef EM_SPARCV9 -#define EM_SPARCV9 43 +#ifndef EM_RISCV +#define EM_RISCV 243 #endif + case EM_RISCV: break; case EM_SPARCV9: break; -#ifndef EM_X86_64 -#define EM_X86_64 62 -#endif case EM_X86_64: break; /* ELFDEFNNAME(MACHDEP_ID_CASES) */ |
