diff options
Diffstat (limited to 'binutils')
-rw-r--r-- | binutils/ChangeLog | 9 | ||||
-rw-r--r-- | binutils/ieee.c | 12 | ||||
-rw-r--r-- | binutils/od-macho.c | 1 | ||||
-rw-r--r-- | binutils/readelf.c | 18 | ||||
-rw-r--r-- | binutils/testsuite/binutils-all/objcopy.exp | 2 | ||||
-rw-r--r-- | binutils/testsuite/binutils-all/objdump.exp | 3 | ||||
-rw-r--r-- | binutils/testsuite/lib/binutils-common.exp | 6 |
7 files changed, 12 insertions, 39 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 1028851..e95fa85 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,12 @@ +2018-04-11 Alan Modra <amodra@gmail.com> + + * ieee.c: Remove i960 support. + * od-macho.c: Remove i860 support. + * readelf.c: Remove i860 and i960 support. + * testsuite/binutils-all/objcopy.exp: Likewise. + * testsuite/binutils-all/objdump.exp: Likewise. + * testsuite/lib/binutils-common.exp: Likewise. + 2018-04-11 Maciej W. Rozycki <macro@mips.com> * testsuite/lib/binutils-common.exp (is_elf_format): Also return diff --git a/binutils/ieee.c b/binutils/ieee.c index eab3e4d..902b882 100644 --- a/binutils/ieee.c +++ b/binutils/ieee.c @@ -3561,12 +3561,6 @@ ieee_regno_to_genreg (bfd *abfd, int r) r += 2; break; - case bfd_arch_i960: - /* Stabs uses 0 to 15 for r0 to r15, 16 to 31 for g0 to g15, and - 32 to 35 for fp0 to fp3. */ - --r; - break; - default: break; } @@ -3588,12 +3582,6 @@ ieee_genreg_to_regno (bfd *abfd, int r) r -= 2; break; - case bfd_arch_i960: - /* Stabs uses 0 to 15 for r0 to r15, 16 to 31 for g0 to g15, and - 32 to 35 for fp0 to fp3. */ - ++r; - break; - default: break; } diff --git a/binutils/od-macho.c b/binutils/od-macho.c index 09cc218..fb2ed70 100644 --- a/binutils/od-macho.c +++ b/binutils/od-macho.c @@ -106,7 +106,6 @@ static const bfd_mach_o_xlat_name bfd_mach_o_cpu_name[] = { "arm", BFD_MACH_O_CPU_TYPE_ARM }, { "mc88000", BFD_MACH_O_CPU_TYPE_MC88000 }, { "sparc", BFD_MACH_O_CPU_TYPE_SPARC }, - { "i860", BFD_MACH_O_CPU_TYPE_I860 }, { "alpha", BFD_MACH_O_CPU_TYPE_ALPHA }, { "powerpc", BFD_MACH_O_CPU_TYPE_POWERPC }, { "powerpc_64", BFD_MACH_O_CPU_TYPE_POWERPC_64 }, diff --git a/binutils/readelf.c b/binutils/readelf.c index 80075c2..166dd23 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -109,8 +109,6 @@ #include "elf/hppa.h" #include "elf/i386.h" #include "elf/i370.h" -#include "elf/i860.h" -#include "elf/i960.h" #include "elf/ia64.h" #include "elf/ip2k.h" #include "elf/lm32.h" @@ -765,7 +763,6 @@ guess_is_rela (unsigned int e_machine) /* Targets that use REL relocations. */ case EM_386: case EM_IAMCU: - case EM_960: case EM_ARM: case EM_D10V: case EM_CYGNUS_D10V: @@ -779,7 +776,6 @@ guess_is_rela (unsigned int e_machine) /* Targets that use RELA relocations. */ case EM_68K: - case EM_860: case EM_AARCH64: case EM_ADAPTEVA_EPIPHANY: case EM_ALPHA: @@ -1275,10 +1271,6 @@ dump_relocations (Filedata * filedata, rtype = elf_m68k_reloc_type (type); break; - case EM_960: - rtype = elf_i960_reloc_type (type); - break; - case EM_AVR: case EM_AVR_OLD: rtype = elf_avr_reloc_type (type); @@ -1428,10 +1420,6 @@ dump_relocations (Filedata * filedata, rtype = elf_cris_reloc_type (type); break; - case EM_860: - rtype = elf_i860_reloc_type (type); - break; - case EM_X86_64: case EM_L1OM: case EM_K1OM: @@ -2264,7 +2252,6 @@ get_machine_name (unsigned e_machine) case EM_68K: return "MC68000"; case EM_88K: return "MC88000"; case EM_IAMCU: return "Intel MCU"; - case EM_860: return "Intel 80860"; case EM_MIPS: return "MIPS R3000"; case EM_S370: return "IBM System/370"; /* 10 */ @@ -2273,7 +2260,6 @@ get_machine_name (unsigned e_machine) case EM_PARISC: return "HPPA"; case EM_VPP550: return "Fujitsu VPP500"; case EM_SPARC32PLUS: return "Sparc v8+" ; - case EM_960: return "Intel 90860"; case EM_PPC: return "PowerPC"; /* 20 */ case EM_PPC64: return "PowerPC64"; @@ -12195,10 +12181,6 @@ is_32bit_abs_reloc (Filedata * filedata, unsigned int reloc_type) return reloc_type == 1; /* R_386_32. */ case EM_68K: return reloc_type == 1; /* R_68K_32. */ - case EM_860: - return reloc_type == 1; /* R_860_32. */ - case EM_960: - return reloc_type == 2; /* R_960_32. */ case EM_AARCH64: return (reloc_type == 258 || reloc_type == 1); /* R_AARCH64_ABS32 || R_AARCH64_P32_ABS32 */ diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp index b308fd7..68fccbe 100644 --- a/binutils/testsuite/binutils-all/objcopy.exp +++ b/binutils/testsuite/binutils-all/objcopy.exp @@ -80,7 +80,6 @@ proc objcopy_test {testname srcfile} { setup_xfail "h8300-*-coff" setup_xfail "h8500-*-rtems*" "h8500-*-coff" setup_xfail "hppa*-*-*" - setup_xfail "i960-*" setup_xfail "m68*-*-*coff" "m68*-*-hpux*" "m68*-*-lynxos*" setup_xfail "m68*-*-sysv*" "m68*-apple-aux*" setup_xfail "m8*-*" @@ -1091,7 +1090,6 @@ if [is_elf_format] { || [istarget "d10v-*"] \ || [istarget "dlx-*"] \ || [istarget "i*86-*"] \ - || [istarget "i960-*"] \ || [istarget "m681*-*"] \ || [istarget "m68hc1*-*"] \ || ([istarget "mips*-*"] \ diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp index f006d64..5a31834 100644 --- a/binutils/testsuite/binutils-all/objdump.exp +++ b/binutils/testsuite/binutils-all/objdump.exp @@ -35,7 +35,7 @@ set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -i"] set cpus_expected [list] lappend cpus_expected aarch64 alpha am33-2 arc ARC700 ARCv2 arm cris -lappend cpus_expected d10v d30v fr30 fr500 fr550 h8 hppa i386 i860 i960 iamcu ip2022 +lappend cpus_expected d10v d30v fr30 fr500 fr550 h8 hppa i386 iamcu ip2022 lappend cpus_expected m16c m32c m32r m68hc11 m68hc12 m68k m88k MCore mep c5 h1 MicroBlaze lappend cpus_expected mips mn10200 mn10300 ms1 msp MSP430 nds32 n1h_v3 ns32k lappend cpus_expected or1k or1knd pj powerpc pyramid riscv romp rs6000 s390 sh sparc @@ -279,7 +279,6 @@ if { ![is_elf_format] } then { if { ![is_elf_format] || [istarget "hppa64*-*-hpux*"] || [istarget "i370-*-*"] - || [istarget "i960-*-*"] || [istarget "ia64*-*-*"] || [istarget "mcore-*-*"] || [istarget "moxie-*-*"] diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp index 325a07c..13f09b1 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp @@ -59,8 +59,7 @@ proc is_elf_format {} { || [istarget *-*-linux*oldld*] || [istarget *-*-rtemscoff*] || [istarget h8500-*-rtems*] - || [istarget i?86-*-freebsd\[12\].*] - || [istarget i960-*-rtems*] } { + || [istarget i?86-*-freebsd\[12\].*] } { return 0 } @@ -173,7 +172,7 @@ proc is_elf64 { binary_file } { # and Visium targets set OSABI to ELFOSABI_STANDALONE and cannot # support STB_GNU_UNIQUE. Likewise non-EABI ARM targets set OSABI to # ELFOSABI_ARM, and TI C6X targets to ELFOSABI_C6000_*. Finally -# rather than `bfd_elf_final_link' AM33/2.0, D30V, DLX, i960, and +# rather than `bfd_elf_final_link' AM33/2.0, D30V, DLX, and # picoJava targets use `_bfd_generic_final_link', which does not # support STB_GNU_UNIQUE symbol binding causing assertion failures. # @@ -201,7 +200,6 @@ proc supports_gnu_unique {} { if { [istarget "am33_2.0-*-*"] || [istarget "d30v-*-*"] || [istarget "dlx-*-*"] - || [istarget "i960-*-*"] || [istarget "pj*-*-*"] } { return 0 } |