From 9398b997a02799c3387709acdd83b3fcb8e270e2 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Thu, 21 Jul 2005 13:23:37 +0000 Subject: [PATCH] bfd/ * Makefile.am (BFD32_BACKENDS): Remove cf-m68klynx.lo. (BFD32_BACKENDS): Likewise, remove m68klynx.lo. (BFD32_BACKENDS_CFILES): Remove cf-m68klynx.c, m68klynx.c. (cf-m68klynx.lo, m68klynx.lo): Remove targets. * Makefile.in: Regenerate. * cf-m68klynx.c: Remove. * m68klynx.c: Likewise. * configure.in (m68klynx_aout_vec): Remove vector. (m68klynx_coff_vec): Likewise. * configure: Regenerate. * targets.c (m68klynx_aout_vec): Remove extern. (m68klynx_coff_vec): Likewise. (_bfd_target_vector): Remove m68klynx_{aout,coff}_vec. * po/SRC-POTFILES.in: Remove cf-m68klynx.c, m68klynx.c. gas/ * config/tc-m68k.h: Remove TE_LYNX conditional code. --- bfd/ChangeLog | 17 +++++++++++++++ bfd/Makefile.am | 12 ----------- bfd/Makefile.in | 12 ----------- bfd/cf-m68klynx.c | 28 ------------------------- bfd/config.bfd | 4 ---- bfd/configure | 2 -- bfd/configure.in | 2 -- bfd/m68klynx.c | 57 -------------------------------------------------- bfd/po/SRC-POTFILES.in | 2 -- bfd/targets.c | 4 ---- gas/ChangeLog | 4 ++++ gas/config/tc-m68k.h | 3 --- 12 files changed, 21 insertions(+), 126 deletions(-) delete mode 100644 bfd/cf-m68klynx.c delete mode 100644 bfd/m68klynx.c diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b7397de30..4df5dbc79 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,20 @@ +2005-07-21 Ben Elliston + + * Makefile.am (BFD32_BACKENDS): Remove cf-m68klynx.lo. + (BFD32_BACKENDS): Likewise, remove m68klynx.lo. + (BFD32_BACKENDS_CFILES): Remove cf-m68klynx.c, m68klynx.c. + (cf-m68klynx.lo, m68klynx.lo): Remove targets. + * Makefile.in: Regenerate. + * cf-m68klynx.c: Remove. + * m68klynx.c: Likewise. + * configure.in (m68klynx_aout_vec): Remove vector. + (m68klynx_coff_vec): Likewise. + * configure: Regenerate. + * targets.c (m68klynx_aout_vec): Remove extern. + (m68klynx_coff_vec): Likewise. + (_bfd_target_vector): Remove m68klynx_{aout,coff}_vec. + * po/SRC-POTFILES.in: Remove cf-m68klynx.c, m68klynx.c. + 2005-07-20 Kazuhiro Inaoka * elf32-m32r.c (m32r_elf_howto_table): Support R_M32R_REL32. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index b38686f13..c038e86c9 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -187,7 +187,6 @@ BFD32_BACKENDS = \ armnetbsd.lo \ bout.lo \ cf-i386lynx.lo \ - cf-m68klynx.lo \ cf-sparclynx.lo \ coff-a29k.lo \ coff-apollo.lo \ @@ -296,7 +295,6 @@ BFD32_BACKENDS = \ ieee.lo \ m68k4knetbsd.lo \ m68klinux.lo \ - m68klynx.lo \ m68knetbsd.lo \ m88kmach3.lo \ m88kopenbsd.lo \ @@ -359,7 +357,6 @@ BFD32_BACKENDS_CFILES = \ armnetbsd.c \ bout.c \ cf-i386lynx.c \ - cf-m68klynx.c \ cf-sparclynx.c \ coff-a29k.c \ coff-apollo.c \ @@ -468,7 +465,6 @@ BFD32_BACKENDS_CFILES = \ ieee.c \ m68k4knetbsd.c \ m68klinux.c \ - m68klynx.c \ m68knetbsd.c \ m88kmach3.c \ m88kopenbsd.c \ @@ -1074,10 +1070,6 @@ cf-i386lynx.lo: cf-i386lynx.c $(INCDIR)/filenames.h \ coff-i386.c $(INCDIR)/hashtab.h $(INCDIR)/coff/i386.h \ $(INCDIR)/coff/external.h $(INCDIR)/coff/internal.h \ libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -cf-m68klynx.lo: cf-m68klynx.c coff-m68k.c $(INCDIR)/filenames.h \ - $(INCDIR)/hashtab.h $(INCDIR)/coff/m68k.h $(INCDIR)/coff/external.h \ - $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ - coffcode.h coffswap.h cf-sparclynx.lo: cf-sparclynx.c coff-sparc.c $(INCDIR)/filenames.h \ $(INCDIR)/hashtab.h $(INCDIR)/coff/sparc.h $(INCDIR)/coff/external.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ @@ -1512,10 +1504,6 @@ m68k4knetbsd.lo: m68k4knetbsd.c netbsd.h $(INCDIR)/filenames.h \ m68klinux.lo: m68klinux.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ $(INCDIR)/aout/ar.h libaout.h $(INCDIR)/bfdlink.h aout-target.h -m68klynx.lo: m68klynx.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ - libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \ - aout-target.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ - $(INCDIR)/aout/ar.h m68knetbsd.lo: m68knetbsd.c netbsd.h $(INCDIR)/filenames.h \ $(INCDIR)/hashtab.h libaout.h $(INCDIR)/bfdlink.h aout-target.h \ $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 94a4a3b3c..5d8043c16 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -425,7 +425,6 @@ BFD32_BACKENDS = \ armnetbsd.lo \ bout.lo \ cf-i386lynx.lo \ - cf-m68klynx.lo \ cf-sparclynx.lo \ coff-a29k.lo \ coff-apollo.lo \ @@ -534,7 +533,6 @@ BFD32_BACKENDS = \ ieee.lo \ m68k4knetbsd.lo \ m68klinux.lo \ - m68klynx.lo \ m68knetbsd.lo \ m88kmach3.lo \ m88kopenbsd.lo \ @@ -597,7 +595,6 @@ BFD32_BACKENDS_CFILES = \ armnetbsd.c \ bout.c \ cf-i386lynx.c \ - cf-m68klynx.c \ cf-sparclynx.c \ coff-a29k.c \ coff-apollo.c \ @@ -706,7 +703,6 @@ BFD32_BACKENDS_CFILES = \ ieee.c \ m68k4knetbsd.c \ m68klinux.c \ - m68klynx.c \ m68knetbsd.c \ m88kmach3.c \ m88kopenbsd.c \ @@ -1641,10 +1637,6 @@ cf-i386lynx.lo: cf-i386lynx.c $(INCDIR)/filenames.h \ coff-i386.c $(INCDIR)/hashtab.h $(INCDIR)/coff/i386.h \ $(INCDIR)/coff/external.h $(INCDIR)/coff/internal.h \ libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h -cf-m68klynx.lo: cf-m68klynx.c coff-m68k.c $(INCDIR)/filenames.h \ - $(INCDIR)/hashtab.h $(INCDIR)/coff/m68k.h $(INCDIR)/coff/external.h \ - $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ - coffcode.h coffswap.h cf-sparclynx.lo: cf-sparclynx.c coff-sparc.c $(INCDIR)/filenames.h \ $(INCDIR)/hashtab.h $(INCDIR)/coff/sparc.h $(INCDIR)/coff/external.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ @@ -2079,10 +2071,6 @@ m68k4knetbsd.lo: m68k4knetbsd.c netbsd.h $(INCDIR)/filenames.h \ m68klinux.lo: m68klinux.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ $(INCDIR)/aout/ar.h libaout.h $(INCDIR)/bfdlink.h aout-target.h -m68klynx.lo: m68klynx.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ - libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \ - aout-target.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ - $(INCDIR)/aout/ar.h m68knetbsd.lo: m68knetbsd.c netbsd.h $(INCDIR)/filenames.h \ $(INCDIR)/hashtab.h libaout.h $(INCDIR)/bfdlink.h aout-target.h \ $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ diff --git a/bfd/cf-m68klynx.c b/bfd/cf-m68klynx.c deleted file mode 100644 index ef7dd08fd..000000000 --- a/bfd/cf-m68klynx.c +++ /dev/null @@ -1,28 +0,0 @@ -/* BFD back-end for Motorola M68K COFF LynxOS files. - Copyright 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. - Written by Cygnus Support. - -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 2 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_SYM m68klynx_coff_vec -#define TARGET_NAME "coff-m68k-lynx" -#define LYNXOS -#define COFF_LONG_FILENAMES -#define STATIC_RELOCS -#define COFF_COMMON_ADDEND - -#include "coff-m68k.c" diff --git a/bfd/config.bfd b/bfd/config.bfd index ba7676e30..97ae09e73 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -750,10 +750,6 @@ case "${targ}" in # targ_selvecs=m68kmach3_vec # targ_cflags=-DSTAT_FOR_EXEC ;; - m68*-*-lynxos*) - targ_defvec=m68klynx_coff_vec - targ_selvecs=m68klynx_aout_vec - ;; m68*-hp*-netbsd*) targ_defvec=m68k4knetbsd_vec targ_selvecs="m68knetbsd_vec hp300bsd_vec sunos_big_vec" diff --git a/bfd/configure b/bfd/configure index dc3ab6e00..c5296ad1c 100755 --- a/bfd/configure +++ b/bfd/configure @@ -13121,8 +13121,6 @@ do m68kcoff_vec) tb="$tb coff-m68k.lo cofflink.lo" ;; m68kcoffun_vec) tb="$tb coff-u68k.lo coff-m68k.lo cofflink.lo" ;; m68klinux_vec) tb="$tb m68klinux.lo aout32.lo" ;; - m68klynx_aout_vec) tb="$tb m68klynx.lo lynx-core.lo aout32.lo" ;; - m68klynx_coff_vec) tb="$tb cf-m68klynx.lo coff-m68k.lo cofflink.lo lynx-core.lo" ;; m68knetbsd_vec) tb="$tb m68knetbsd.lo aout32.lo" ;; m68ksysvcoff_vec) tb="$tb coff-svm68k.lo cofflink.lo" ;; m88kbcs_vec) tb="$tb coff-m88k.lo" ;; diff --git a/bfd/configure.in b/bfd/configure.in index 8853151c4..15d9798d7 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -742,8 +742,6 @@ do m68kcoff_vec) tb="$tb coff-m68k.lo cofflink.lo" ;; m68kcoffun_vec) tb="$tb coff-u68k.lo coff-m68k.lo cofflink.lo" ;; m68klinux_vec) tb="$tb m68klinux.lo aout32.lo" ;; - m68klynx_aout_vec) tb="$tb m68klynx.lo lynx-core.lo aout32.lo" ;; - m68klynx_coff_vec) tb="$tb cf-m68klynx.lo coff-m68k.lo cofflink.lo lynx-core.lo" ;; m68knetbsd_vec) tb="$tb m68knetbsd.lo aout32.lo" ;; m68ksysvcoff_vec) tb="$tb coff-svm68k.lo cofflink.lo" ;; m88kbcs_vec) tb="$tb coff-m88k.lo" ;; diff --git a/bfd/m68klynx.c b/bfd/m68klynx.c deleted file mode 100644 index d519a31bb..000000000 --- a/bfd/m68klynx.c +++ /dev/null @@ -1,57 +0,0 @@ -/* BFD back-end for m68k binaries under LynxOS. - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001, 2002, 2003 - 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 2 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 N_SHARED_LIB(x) 0 - -#define TEXT_START_ADDR 0 -#define TARGET_PAGE_SIZE 4096 -#define SEGMENT_SIZE TARGET_PAGE_SIZE -#define DEFAULT_ARCH bfd_arch_m68k - -/* 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 (m68klynx_aout_,OP) -#define TARGETNAME "a.out-m68k-lynx" - -#include "bfd.h" -#include "sysdep.h" -#include "libbfd.h" - -#include "libaout.h" -#include "aout/aout64.h" - -#define TARGET_IS_BIG_ENDIAN_P - -#ifdef LYNX_CORE - -char *lynx_core_file_failing_command(); -int lynx_core_file_failing_signal(); -bfd_boolean lynx_core_file_matches_executable_p(); -const bfd_target *lynx_core_file_p(); - -#define MY_core_file_failing_command lynx_core_file_failing_command -#define MY_core_file_failing_signal lynx_core_file_failing_signal -#define MY_core_file_matches_executable_p lynx_core_file_matches_executable_p -#define MY_core_file_p lynx_core_file_p - -#endif /* LYNX_CORE */ - -#include "aout-target.h" diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in index 6b85bca78..dc3dc3844 100644 --- a/bfd/po/SRC-POTFILES.in +++ b/bfd/po/SRC-POTFILES.in @@ -23,7 +23,6 @@ binary.c bout.c cache.c cf-i386lynx.c -cf-m68klynx.c cf-sparclynx.c cisco-core.c coff64-rs6000.c @@ -240,7 +239,6 @@ linker.c lynx-core.c m68k4knetbsd.c m68klinux.c -m68klynx.c m68knetbsd.c m88kmach3.c m88kopenbsd.c diff --git a/bfd/targets.c b/bfd/targets.c index 355ac6ac2..33951865b 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -698,8 +698,6 @@ extern const bfd_target m68kaux_coff_vec; extern const bfd_target m68kcoff_vec; extern const bfd_target m68kcoffun_vec; extern const bfd_target m68klinux_vec; -extern const bfd_target m68klynx_aout_vec; -extern const bfd_target m68klynx_coff_vec; extern const bfd_target m68knetbsd_vec; extern const bfd_target m68ksysvcoff_vec; extern const bfd_target m88kbcs_vec; @@ -1035,8 +1033,6 @@ static const bfd_target * const _bfd_target_vector[] = { which kind of a.out file it is. */ &m68klinux_vec, #endif - &m68klynx_aout_vec, - &m68klynx_coff_vec, &m68knetbsd_vec, &m68ksysvcoff_vec, &m88kbcs_vec, diff --git a/gas/ChangeLog b/gas/ChangeLog index 453ae6fdc..53b6d27b7 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2005-07-21 Ben Elliston + + * config/tc-m68k.h: Remove TE_LYNX conditional code. + 2005-07-21 Paul Brook * config/tc-arm.c (encode_thumb32_addr_mode): Don't set diff --git a/gas/config/tc-m68k.h b/gas/config/tc-m68k.h index f5de3acf5..7f4659276 100644 --- a/gas/config/tc-m68k.h +++ b/gas/config/tc-m68k.h @@ -51,9 +51,6 @@ struct fix; #undef OBJ_COFF_OMIT_OPTIONAL_HEADER #endif -#ifdef TE_LYNX -#define TARGET_FORMAT "coff-m68k-lynx" -#endif #ifdef TE_AUX #define TARGET_FORMAT "coff-m68k-aux" #endif -- 2.11.4.GIT