From: Alan Modra Date: Mon, 16 Apr 2018 05:43:07 +0000 (+0930) Subject: Remove sony newsos3 support X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5972ac7375e9b6a6f0c4bdef31d3da574fb1b65e;p=binutils-gdb.git Remove sony newsos3 support include/ * aout/host.h: Remove newsos3 support. bfd/ * Makefile.am: Remove newsos3 support. * aoutx.h: Likewise. * config.bfd: Likewise. * configure.ac: Likewise. * targets.c: Likewise. * newsos3.c: Delete. * Makefile.in: Regenerate. * configure: Regenerate. * po/SRC-POTFILES.in: Regenerate. binutils/ * testsuite/binutils-all/copy-2.d: Remove newsos3 support. * testsuite/binutils-all/nm.exp: Likewise. ld/ * Makefile.am: Remove newsos3 support. * configure.tgt: Likewise. * emulparams/news.sh: Delete. * Makefile.in: Regenerate. * po/BLD-POTFILES.in: Regenerate. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9e26d906bdc..f17bcc75699 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,15 @@ +2018-04-16 Alan Modra + + * Makefile.am: Remove newsos3 support. + * aoutx.h: Likewise. + * config.bfd: Likewise. + * configure.ac: Likewise. + * targets.c: Likewise. + * newsos3.c: Delete. + * Makefile.in: Regenerate. + * configure: Regenerate. + * po/SRC-POTFILES.in: Regenerate. + 2018-04-16 Alan Modra * Makefile.am: Remove netware support. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 0ed96c93a0e..88cd960fea3 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -410,7 +410,6 @@ BFD32_BACKENDS = \ mach-o-i386.lo \ mach-o-arm.lo \ mipsbsd.lo \ - newsos3.lo \ ns32knetbsd.lo \ oasys.lo \ pc532-mach.lo \ @@ -596,7 +595,6 @@ BFD32_BACKENDS_CFILES = \ mach-o-i386.c \ mach-o-arm.c \ mipsbsd.c \ - newsos3.c \ ns32knetbsd.c \ oasys.c \ pc532-mach.c \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 91614ce6f10..0a9167c019e 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -744,7 +744,6 @@ BFD32_BACKENDS = \ mach-o-i386.lo \ mach-o-arm.lo \ mipsbsd.lo \ - newsos3.lo \ ns32knetbsd.lo \ oasys.lo \ pc532-mach.lo \ @@ -930,7 +929,6 @@ BFD32_BACKENDS_CFILES = \ mach-o-i386.c \ mach-o-arm.c \ mipsbsd.c \ - newsos3.c \ ns32knetbsd.c \ oasys.c \ pc532-mach.c \ @@ -1579,7 +1577,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mipsbsd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netbsd-core.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newsos3.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ns32knetbsd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oasys.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opncls.Plo@am__quote@ diff --git a/bfd/aoutx.h b/bfd/aoutx.h index 7809facbdf2..fb1ac7db206 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -39,8 +39,7 @@ DESCRIPTION This information is further split out into more specific files for each machine, including @file{sunos.c} for sun3 and sun4, - @file{newsos3.c} for the Sony NEWS, and @file{demo64.c} for a - demonstration of a 64 bit a.out format. + and @file{demo64.c} for a demonstration of a 64 bit a.out format. The base file @file{aoutx.h} defines general mechanisms for reading and writing records to and from disk and various diff --git a/bfd/config.bfd b/bfd/config.bfd index 4f6fb942e6a..02c318863d4 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -110,7 +110,6 @@ case $targ in we32k-*-* | \ w65-*-* | \ *-*-ieee* | \ - *-sony-* | \ *-tandem-* | \ i370-* | \ sh5*-*-* | sh64*-*-* | \ @@ -127,6 +126,7 @@ esac case $targ in *-adobe-* | \ *-go32-rtems* | \ + *-sony-* | \ *-*-netware* | \ *-*-rtemsaout* | \ *-*-rtemscoff* | \ @@ -1797,11 +1797,6 @@ case "${targ}" in targ_defvec=ieee_vec ;; - *-sony-*) - targ_defvec=m68k_aout_newsos3_vec - targ_underscore=yes - ;; - *-tandem-*) targ_defvec=m68k_coff_vec targ_selvecs=ieee_vec diff --git a/bfd/configure b/bfd/configure index 81befe34710..d3d05b4baff 100755 --- a/bfd/configure +++ b/bfd/configure @@ -14454,7 +14454,6 @@ do m68k_aout_hp300hpux_vec) tb="$tb hp300hpux.lo aout32.lo" ;; m68k_aout_linux_vec) tb="$tb m68klinux.lo aout32.lo" ;; m68k_aout_nbsd_vec) tb="$tb m68knetbsd.lo aout32.lo" ;; - m68k_aout_newsos3_vec) tb="$tb newsos3.lo aout32.lo" ;; m68k_coff_vec) tb="$tb coff-m68k.lo $coff" ;; m68k_coff_apollo_vec) tb="$tb coff-apollo.lo $coffgen" ;; m68k_coff_aux_vec) tb="$tb coff-aux.lo coff-m68k.lo $coff" ;; @@ -14892,10 +14891,6 @@ if test "${target}" = "${host}"; then COREFILE=trad-core.lo TRAD_HEADER='"hosts/riscos.h"' ;; - mips-sony-bsd*) - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/news-mips.h"' - ;; m68*-bull*-sysv*) COREFILE=trad-core.lo TRAD_HEADER='"hosts/dpx2.h"' @@ -14913,10 +14908,6 @@ if test "${target}" = "${host}"; then COREFILE=trad-core.lo TRAD_HEADER='"hosts/delta68.h"' ;; - m68*-sony-*) - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/news.h"' - ;; m68*-*-netbsd* | m68*-*-openbsd*) COREFILE=netbsd-core.lo ;; diff --git a/bfd/configure.ac b/bfd/configure.ac index e8250ad4a55..77edd1babe0 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -531,7 +531,6 @@ do m68k_aout_hp300hpux_vec) tb="$tb hp300hpux.lo aout32.lo" ;; m68k_aout_linux_vec) tb="$tb m68klinux.lo aout32.lo" ;; m68k_aout_nbsd_vec) tb="$tb m68knetbsd.lo aout32.lo" ;; - m68k_aout_newsos3_vec) tb="$tb newsos3.lo aout32.lo" ;; m68k_coff_vec) tb="$tb coff-m68k.lo $coff" ;; m68k_coff_apollo_vec) tb="$tb coff-apollo.lo $coffgen" ;; m68k_coff_aux_vec) tb="$tb coff-aux.lo coff-m68k.lo $coff" ;; @@ -978,10 +977,6 @@ changequote([,])dnl COREFILE=trad-core.lo TRAD_HEADER='"hosts/riscos.h"' ;; - mips-sony-bsd*) - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/news-mips.h"' - ;; m68*-bull*-sysv*) COREFILE=trad-core.lo TRAD_HEADER='"hosts/dpx2.h"' @@ -999,10 +994,6 @@ changequote([,])dnl COREFILE=trad-core.lo TRAD_HEADER='"hosts/delta68.h"' ;; - m68*-sony-*) - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/news.h"' - ;; m68*-*-netbsd* | m68*-*-openbsd*) COREFILE=netbsd-core.lo ;; diff --git a/bfd/newsos3.c b/bfd/newsos3.c deleted file mode 100644 index 7ca0ea7274c..00000000000 --- a/bfd/newsos3.c +++ /dev/null @@ -1,43 +0,0 @@ -/* BFD back-end for NewsOS3 (Sony, 68k) binaries. - Copyright (C) 1990-2018 Free Software Foundation, Inc. - - This file is part of BFD, the Binary File Descriptor library. - - This program 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 of the License, or - (at your option) any later version. - - This program 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 this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, - MA 02110-1301, USA. */ - -#define TARGET_PAGE_SIZE 4096 -#define SEGMENT_SIZE TARGET_PAGE_SIZE -#define TEXT_START_ADDR 0 - -/* Do not "beautify" the CONCAT* macro args. Traditional C will not - remove whitespace added here, and thus will fail to concatenate - the tokens. */ -#define MY(OP) CONCAT2 (m68k_aout_newsos3_,OP) -#define TARGETNAME "a.out-newsos3" -#define ENTRY_CAN_BE_ZERO -#define DEFAULT_ARCH bfd_arch_m68k -#define TARGET_IS_BIG_ENDIAN_P -#define N_HEADER_IN_TEXT(x) 0 - -#include "sysdep.h" -#include "bfd.h" -#include "libbfd.h" -#include "aout/aout64.h" -#include "aout/stab_gnu.h" -#include "aout/ar.h" -#include "libaout.h" /* BFD a.out internal data structures */ - -#include "aout-target.h" diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in index 7604f7296f6..76aad8a486e 100644 --- a/bfd/po/SRC-POTFILES.in +++ b/bfd/po/SRC-POTFILES.in @@ -309,7 +309,6 @@ mipsbsd.c mmo.c netbsd-core.c netbsd.h -newsos3.c ns32k.h ns32knetbsd.c oasys.c diff --git a/bfd/targets.c b/bfd/targets.c index c5ebcd6cb33..4951d0245b3 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -710,7 +710,6 @@ extern const bfd_target m68k_aout_hp300bsd_vec; extern const bfd_target m68k_aout_hp300hpux_vec; extern const bfd_target m68k_aout_linux_vec; extern const bfd_target m68k_aout_nbsd_vec; -extern const bfd_target m68k_aout_newsos3_vec; extern const bfd_target m68k_coff_vec; extern const bfd_target m68k_coff_apollo_vec; extern const bfd_target m68k_coff_aux_vec; @@ -1158,7 +1157,6 @@ static const bfd_target * const _bfd_target_vector[] = &m68k_aout_linux_vec, #endif &m68k_aout_nbsd_vec, - &m68k_aout_newsos3_vec, &m68k_coff_vec, #if 0 &m68k_coff_apollo_vec, diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 92db71bc340..a1c1a54cca3 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2018-04-16 Alan Modra + + * testsuite/binutils-all/copy-2.d: Remove newsos3 support. + * testsuite/binutils-all/nm.exp: Likewise. + 2018-04-16 Alan Modra * .gitignore: Remove netware support. diff --git a/binutils/testsuite/binutils-all/copy-2.d b/binutils/testsuite/binutils-all/copy-2.d index 5636ff62c8d..c883904cb23 100644 --- a/binutils/testsuite/binutils-all/copy-2.d +++ b/binutils/testsuite/binutils-all/copy-2.d @@ -3,7 +3,7 @@ #objcopy: --set-section-flags foo=contents,alloc,load,code #name: copy with setting section flags 2 #source: copytest.s -#not-target: *-*-*aout *-*-aix* h8300-*-* hppa*-*-hpux* m68k-*-netbsd m68k-*-openbsd* mips-sony-bsd* mips-*-ultrix* mips-*-osf* mips-*-ecoff* mips-*-irix mips-*-irix[2-4] mips-*-riscos* ns32k-*-netbsd +#not-target: *-*-*aout *-*-aix* h8300-*-* hppa*-*-hpux* m68k-*-netbsd m68k-*-openbsd* mips-*-ultrix* mips-*-osf* mips-*-ecoff* mips-*-irix mips-*-irix[2-4] mips-*-riscos* ns32k-*-netbsd # Note - we use copytest.s and a section named "foo" rather # than .text because for some file formats (eg PE) the .text # section has a fixed set of flags and these cannot be changed. diff --git a/binutils/testsuite/binutils-all/nm.exp b/binutils/testsuite/binutils-all/nm.exp index f966323543a..71f104a91bb 100644 --- a/binutils/testsuite/binutils-all/nm.exp +++ b/binutils/testsuite/binutils-all/nm.exp @@ -46,7 +46,7 @@ if {![binutils_assemble $srcdir/$subdir/bintest.s tmpdir/bintest.o]} then { # stores most symbols twice, which messes up the nm output. setup_xfail "alpha*-*-osf*" setup_xfail "mips*-*-ultrix*" "mips*-*-ecoff*" "mips*-*-irix4*" - setup_xfail "mips*-*-riscos*" "mips*-*-sysv3*" "mips*-sony-bsd*" + setup_xfail "mips*-*-riscos*" "mips*-*-sysv3*" # This test does not work correctly on XCOFF targets, because XCOFF # does not enter static symbols in the symbol table. @@ -104,7 +104,7 @@ if {![binutils_assemble $srcdir/$subdir/bintest.s tmpdir/bintest.o]} then { # stores most symbols twice, which messes up the nm output. setup_xfail "alpha*-*-osf*" setup_xfail "mips*-*-ultrix*" "mips*-*-ecoff*" "mips*-*-irix4*" - setup_xfail "mips*-*-riscos*" "mips*-*-sysv3*" "mips*-sony-bsd*" + setup_xfail "mips*-*-riscos*" "mips*-*-sysv3*" # This test does not work correctly on XCOFF targets, because XCOFF # does not enter static symbols in the symbol table. @@ -161,7 +161,7 @@ if {![binutils_assemble $srcdir/$subdir/$nm_1_src tmpdir/nm-1.o]} then { # stores most symbols twice, which messes up the nm output. setup_xfail "alpha*-*-osf*" setup_xfail "mips*-*-ultrix*" "mips*-*-ecoff*" "mips*-*-irix4*" - setup_xfail "mips*-*-riscos*" "mips*-*-sysv3*" "mips*-sony-bsd*" + setup_xfail "mips*-*-riscos*" "mips*-*-sysv3*" set got [binutils_run $NM "$NMFLAGS --size-sort $tempfile"] diff --git a/include/ChangeLog b/include/ChangeLog index 75e0b9712c9..f6d3b7478ee 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2018-04-16 Alan Modra + + * aout/host.h: Remove newsos3 support. + 2018-04-16 Alan Modra * nlm/ChangeLog-9315: Delete. diff --git a/include/aout/host.h b/include/aout/host.h index 2cbe733735e..6447e021721 100644 --- a/include/aout/host.h +++ b/include/aout/host.h @@ -26,10 +26,6 @@ #define SEGMENT_SIZE page_size #endif -#ifdef sony -#define SEGMENT_SIZE 0x1000 -#endif /* Sony. */ - #ifdef is68k #define SEGMENT_SIZE 0x20000 #endif diff --git a/ld/ChangeLog b/ld/ChangeLog index bb1c44508ad..1438891f376 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2018-04-16 Alan Modra + + * Makefile.am: Remove newsos3 support. + * configure.tgt: Likewise. + * emulparams/news.sh: Delete. + * Makefile.in: Regenerate. + * po/BLD-POTFILES.in: Regenerate. + 2018-04-16 Alan Modra * Makefile.am: Remove netware support. diff --git a/ld/Makefile.am b/ld/Makefile.am index a919831b69f..fa36dd0be7a 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -366,7 +366,6 @@ ALL_EMULATION_SOURCES = \ ends32belf.c \ ends32belf16m.c \ ends32belf_linux.c \ - enews.c \ ens32knbsd.c \ enios2elf.c \ enios2linux.c \ @@ -1610,9 +1609,6 @@ ends32belf_linux.c: $(srcdir)/emulparams/nds32belf_linux.sh \ $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \ $(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS} -enews.c: $(srcdir)/emulparams/news.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} - enios2elf.c: $(srcdir)/emulparams/nios2elf.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/nios2elf.em \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} diff --git a/ld/Makefile.in b/ld/Makefile.in index 3f7ced7d603..37ade866005 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -735,7 +735,6 @@ ALL_EMULATION_SOURCES = \ ends32belf.c \ ends32belf16m.c \ ends32belf_linux.c \ - enews.c \ ens32knbsd.c \ enios2elf.c \ enios2linux.c \ @@ -1398,7 +1397,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ends32elf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ends32elf16m.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ends32elf_linux.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enews.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enios2elf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enios2linux.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ens32knbsd.Po@am__quote@ @@ -3166,9 +3164,6 @@ ends32belf_linux.c: $(srcdir)/emulparams/nds32belf_linux.sh \ $(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \ $(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS} -enews.c: $(srcdir)/emulparams/news.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} - enios2elf.c: $(srcdir)/emulparams/nios2elf.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/nios2elf.em \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} diff --git a/ld/configure.tgt b/ld/configure.tgt index e4b2cb850ee..4665fc085f1 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -436,7 +436,6 @@ m68*-sun-sunos[34]*) targ_emul=sun3 ;; m68*-wrs-vxworks*) targ_emul=sun3 ;; m68*-ericsson-ose) targ_emul=sun3 ;; m68*-apple-aux*) targ_emul=m68kaux ;; -m68k-sony-*) targ_emul=news ;; m68k-hp-bsd*) targ_emul=hp300bsd ;; m68*-motorola-sysv*) targ_emul=delta68 ;; m68*-*-aout) targ_emul=m68kaout ;; diff --git a/ld/emulparams/news.sh b/ld/emulparams/news.sh deleted file mode 100644 index 310ddf9212e..00000000000 --- a/ld/emulparams/news.sh +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_NAME=aout -OUTPUT_FORMAT="a.out-newsos3" -TEXT_START_ADDR=0 -TARGET_PAGE_SIZE=0x1000 -ARCH=m68k diff --git a/ld/po/BLD-POTFILES.in b/ld/po/BLD-POTFILES.in index db4bafa4e31..6adb7074378 100644 --- a/ld/po/BLD-POTFILES.in +++ b/ld/po/BLD-POTFILES.in @@ -284,7 +284,6 @@ ends32belf_linux.c ends32elf.c ends32elf16m.c ends32elf_linux.c -enews.c enios2elf.c enios2linux.c ens32knbsd.c