From 3002e78a7d3dba2cf2776cebfd5f2a9e53071b3e Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 23 Dec 2022 17:43:21 +1030 Subject: obsolete target tidy Delete a few files only used for obsolete targets, and tidy config, xfails and other pieces of support specific to those targets. And since I was editing target triplets in test files, fix the nm alpha-linuxecoff fails. --- gas/Makefile.am | 1 - gas/Makefile.in | 1 - gas/config/te-svr4.h | 23 ----------------------- gas/configure | 3 +-- gas/configure.ac | 3 +-- gas/configure.tgt | 1 - gas/po/POTFILES.in | 1 - gas/testsuite/gas/aarch64/litpool.d | 2 +- gas/testsuite/gas/aarch64/mapmisc.d | 2 +- gas/testsuite/gas/aarch64/mapping3.d | 2 +- gas/testsuite/gas/aarch64/mapping4.d | 2 +- gas/testsuite/gas/all/gas.exp | 8 ++------ gas/testsuite/gas/cfi/cfi.exp | 2 +- 13 files changed, 9 insertions(+), 42 deletions(-) delete mode 100644 gas/config/te-svr4.h (limited to 'gas') diff --git a/gas/Makefile.am b/gas/Makefile.am index ba28965..03f51c7 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -341,7 +341,6 @@ TARG_ENV_HFILES = \ config/te-pc532mach.h \ config/te-pe.h \ config/te-solaris.h \ - config/te-svr4.h \ config/te-tmips.h \ config/te-vxworks.h \ config/te-wince-pe.h diff --git a/gas/Makefile.in b/gas/Makefile.in index 8319181..c86d333 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -828,7 +828,6 @@ TARG_ENV_HFILES = \ config/te-pc532mach.h \ config/te-pe.h \ config/te-solaris.h \ - config/te-svr4.h \ config/te-tmips.h \ config/te-vxworks.h \ config/te-wince-pe.h diff --git a/gas/config/te-svr4.h b/gas/config/te-svr4.h deleted file mode 100644 index 4fd7cb9..0000000 --- a/gas/config/te-svr4.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (C) 2007-2022 Free Software Foundation, Inc. - - This file is part of GAS, the GNU Assembler. - - GAS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 3, - or (at your option) any later version. - - GAS is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See - the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GAS; see the file COPYING. If not, write to the Free - Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA - 02110-1301, USA. */ - -#define TE_SVR4 -#define LOCAL_LABELS_FB 1 - -#include "obj-format.h" diff --git a/gas/configure b/gas/configure index bd9e7d3..b568369 100755 --- a/gas/configure +++ b/gas/configure @@ -12080,8 +12080,7 @@ _ACEOF generic_target=${cpu_type}-${target_vendor}-${target_os} case ${generic_target} in i386-*-msdosdjgpp* \ - | i386-*-go32* \ - | i386-go32-rtems*) + | i386-*-go32*) $as_echo "#define STRICTCOFF 1" >>confdefs.h diff --git a/gas/configure.ac b/gas/configure.ac index a471030..6a68fd7 100644 --- a/gas/configure.ac +++ b/gas/configure.ac @@ -246,8 +246,7 @@ for this_target in $target $canon_targets ; do generic_target=${cpu_type}-${target_vendor}-${target_os} case ${generic_target} in i386-*-msdosdjgpp* \ - | i386-*-go32* \ - | i386-go32-rtems*) + | i386-*-go32*) AC_DEFINE(STRICTCOFF, 1, [Using strict COFF?]) ;; diff --git a/gas/configure.tgt b/gas/configure.tgt index 765ba73..c210845 100644 --- a/gas/configure.tgt +++ b/gas/configure.tgt @@ -291,7 +291,6 @@ case ${generic_target} in m68hc12-*-* | m6812-*-*) fmt=elf ;; m68k-*-elf*) fmt=elf ;; - m68k-*-sysv4*) fmt=elf em=svr4 ;; m68k-*-linux-*) fmt=elf em=linux ;; m68k-*-uclinux*) fmt=elf em=uclinux ;; m68k-*-gnu*) fmt=elf ;; diff --git a/gas/po/POTFILES.in b/gas/po/POTFILES.in index 8f2efdb..fda3de0 100644 --- a/gas/po/POTFILES.in +++ b/gas/po/POTFILES.in @@ -209,7 +209,6 @@ config/te-nbsd532.h config/te-pc532mach.h config/te-pe.h config/te-solaris.h -config/te-svr4.h config/te-tmips.h config/te-vms.c config/te-vxworks.h diff --git a/gas/testsuite/gas/aarch64/litpool.d b/gas/testsuite/gas/aarch64/litpool.d index 5604424..e37e07df 100644 --- a/gas/testsuite/gas/aarch64/litpool.d +++ b/gas/testsuite/gas/aarch64/litpool.d @@ -1,7 +1,7 @@ #objdump: -d #name: AArch64 Bignums in Literal Pool (PR 16688) # This test is only valid on ELF based ports. -#notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* +#notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd .*: +file format.*aarch64.* diff --git a/gas/testsuite/gas/aarch64/mapmisc.d b/gas/testsuite/gas/aarch64/mapmisc.d index 1f2df6e..95dcd81 100644 --- a/gas/testsuite/gas/aarch64/mapmisc.d +++ b/gas/testsuite/gas/aarch64/mapmisc.d @@ -3,7 +3,7 @@ #name: AArch64 Mapping Symbols for miscellaneous directives #source: mapmisc.s # This test is only valid on ELF based ports. -#notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* +#notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd .*: +file format .*aarch64.* diff --git a/gas/testsuite/gas/aarch64/mapping3.d b/gas/testsuite/gas/aarch64/mapping3.d index ece7de1..e6e087c 100644 --- a/gas/testsuite/gas/aarch64/mapping3.d +++ b/gas/testsuite/gas/aarch64/mapping3.d @@ -2,7 +2,7 @@ #as: --generate-missing-build-notes=no #name: AArch64 Mapping Symbols Test 3 # This test is only valid on ELF based ports. -#notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* +#notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd .*: +file format.*aarch64.* diff --git a/gas/testsuite/gas/aarch64/mapping4.d b/gas/testsuite/gas/aarch64/mapping4.d index d0495da..0012f4e 100644 --- a/gas/testsuite/gas/aarch64/mapping4.d +++ b/gas/testsuite/gas/aarch64/mapping4.d @@ -2,7 +2,7 @@ #as: --generate-missing-build-notes=no #name: AArch64 Mapping Symbols Test 4 # This test is only valid on ELF based ports. -#notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* +#notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd .*: +file format.*aarch64.* diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp index 81d1121..734634f 100644 --- a/gas/testsuite/gas/all/gas.exp +++ b/gas/testsuite/gas/all/gas.exp @@ -278,10 +278,8 @@ if { ![istarget *c30*-*-*] && ![istarget ft32-*-*] && ![istarget h8300*-*-*] && ![istarget hppa*-*-*] } then { - # The vax fails because VMS can apparently actually handle this - # case in relocs, so gas doesn't handle it itself. # msp430, mn10[23]00 and riscv emit two relocs to handle the difference of two symbols. - setup_xfail "am3*-*-*" "mn10200-*-*" "mn10300*-*-*" "msp430*-*-*" "riscv*-*-*" "vax*-*-vms*" + setup_xfail "am3*-*-*" "mn10200-*-*" "mn10300*-*-*" "msp430*-*-*" "riscv*-*-*" do_930509a } @@ -323,11 +321,9 @@ switch -glob $target_triplet { # We omit the ARM toolchains because they define locals to # start with '.', which eliminates .eos, .text etc from the output. # Omit c54x, since .tag and .def mean something different on that target -if { ([istarget *-*-coff*] && ![istarget arm*-*-coff] && ![istarget *c4x*-*-coff] && ![istarget *c54x*-*-coff]) \ +if { ([istarget *-*-coff*] && ![istarget *c4x*-*-coff] && ![istarget *c54x*-*-coff]) \ ||([istarget *-*-pe*] && ![istarget arm*-*-pe*]) \ || [istarget i*86-*-aix*] \ - || [istarget i*86-*-sco*] \ - || [istarget i*86-*-isc*] \ || [istarget i*86-*-go32*] \ || [istarget i*86-*-cygwin*] \ || [istarget x86_64-*-mingw*] \ diff --git a/gas/testsuite/gas/cfi/cfi.exp b/gas/testsuite/gas/cfi/cfi.exp index c426466..fab64b9 100644 --- a/gas/testsuite/gas/cfi/cfi.exp +++ b/gas/testsuite/gas/cfi/cfi.exp @@ -94,7 +94,7 @@ if { [istarget "i*86-*-*"] || [istarget "x86_64-*-*"] } then { } } elseif [istarget "sh*-*"] then { - if { [istarget "*-pe" ] || [istarget "*-rtemscoff*"] } then { + if { [istarget "*-pe" ] } then { return } run_dump_test "cfi-sh-1" -- cgit v1.1