|
@@ -156,6 +156,7 @@ my %elf_mach_map = (
|
|
|
ELF_MACH_MN10300_CYGNUS() => ELF_MACH_MN10300,
|
|
|
ELF_MACH_OR1K_OLD() => ELF_MACH_OR1K,
|
|
|
ELF_MACH_S390_OLD() => ELF_MACH_S390,
|
|
|
+ ELF_MACH_SPARC32PLUS() => ELF_MACH_SPARC,
|
|
|
ELF_MACH_SPARC64_OLD() => ELF_MACH_SPARC64,
|
|
|
ELF_MACH_XTENSA_OLD() => ELF_MACH_XTENSA,
|
|
|
);
|
|
@@ -210,16 +211,6 @@ sub get_format {
|
|
|
my $tmpl = "x16(S2Lx[${elf_word}3]L)${elf_endian}";
|
|
|
@elf{qw(type mach version flags)} = unpack $tmpl, $header;
|
|
|
|
|
|
- # XXX: We need to special case ELF_MACH_SPARC32PLUS, because NetBSD
|
|
|
- # treats it differently depending on the ELF bits.
|
|
|
- if ($elf{mach} == ELF_MACH_SPARC32PLUS) {
|
|
|
- if ($elf{bits} == ELF_BITS_32) {
|
|
|
- $elf{mach} = ELF_MACH_SPARC;
|
|
|
- } else {
|
|
|
- $elf{mach} = ELF_MACH_SPARC64;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
# Canonicalize the machine ID.
|
|
|
$elf{mach} = $elf_mach_map{$elf{mach}} // $elf{mach};
|
|
|
|