From c2bf1eecf99abc4d546bb52a008a25e64a29d85e Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 16 Apr 2018 15:23:38 +0930 Subject: Remove m88k support include/ * coff/internal.h: Remove m88k support. * coff/m88k.h: Delete. * opcode/m88k.h: Delete. bfd/ * Makefile.am: Remove m88k support. * aoutx.h: Likewise. * archures.c: Likewise. * coffcode.h: Likewise. * coffswap.h: Likewise. * config.bfd: Likewise. * configure.ac: Likewise. * cpu-ns32k.c: Likewise. * elf32-nds32.c: Likewise. * mach-o.c: Likewise. * netbsd-core.c: Likewise. * reloc.c: Likewise. * targets.c: Likewise. * coff-m88k.c: Delete. * cpu-m88k.c: Delete. * elf32-m88k.c: Delete. * hosts/m88kmach3.h: Delete. * m88kmach3.c: Delete. * m88kopenbsd.c: Delete. * Makefile.in: Regenerate. * bfd-in2.h: Regenerate. * configure: Regenerate. * po/SRC-POTFILES.in: Regenerate. opcodes/ * Makefile.am: Remove m88k support. * configure.ac: Likewise. * disassemble.c: Likewise. * disassemble.h: Likewise. * m88k-dis.c: Delete. * Makefile.in: Regenerate. * configure: Regenerate. * po/POTFILES.in: Regenerate. binutils/ * MAINTAINERS (Mark Kettenis): Move to past maintainers. * testsuite/binutils-all/objdump.exp: Remove m88k support. gas/ * configure.ac: Remove m88k support. * config.in: Regenerate. * configure: Regenerate. ld/ * Makefile.am: Remove m88k support. * configure.host: Likewise. * configure.tgt: Likewise. * testsuite/ld-elf/sec-to-seg.exp: Likewise. * emulparams/m88kbcs.sh: Delete. * scripttempl/m88kbcs.sc: Delete. * Makefile.in: Regenerate. * po/BLD-POTFILES.in: Regenerate. --- bfd/ChangeLog | 26 +++++ bfd/Makefile.am | 10 -- bfd/Makefile.in | 15 --- bfd/aoutx.h | 4 - bfd/archures.c | 3 - bfd/bfd-in2.h | 3 +- bfd/coff-m88k.c | 291 ------------------------------------------------- bfd/coffcode.h | 33 ++---- bfd/coffswap.h | 5 - bfd/config.bfd | 20 +--- bfd/configure | 16 --- bfd/configure.ac | 16 --- bfd/cpu-m88k.c | 41 ------- bfd/cpu-ns32k.c | 11 +- bfd/elf32-m88k.c | 38 ------- bfd/elf32-nds32.c | 7 +- bfd/hosts/m88kmach3.h | 30 ----- bfd/m88kmach3.c | 41 ------- bfd/m88kopenbsd.c | 34 ------ bfd/mach-o.c | 5 - bfd/netbsd-core.c | 4 - bfd/po/SRC-POTFILES.in | 5 - bfd/reloc.c | 20 ++-- bfd/targets.c | 9 -- 24 files changed, 49 insertions(+), 638 deletions(-) delete mode 100644 bfd/coff-m88k.c delete mode 100644 bfd/cpu-m88k.c delete mode 100644 bfd/elf32-m88k.c delete mode 100644 bfd/hosts/m88kmach3.h delete mode 100644 bfd/m88kmach3.c delete mode 100644 bfd/m88kopenbsd.c (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index def5b5a..9746112 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,31 @@ 2018-04-16 Alan Modra + * Makefile.am: Remove m88k support. + * aoutx.h: Likewise. + * archures.c: Likewise. + * coffcode.h: Likewise. + * coffswap.h: Likewise. + * config.bfd: Likewise. + * configure.ac: Likewise. + * cpu-ns32k.c: Likewise. + * elf32-nds32.c: Likewise. + * mach-o.c: Likewise. + * netbsd-core.c: Likewise. + * reloc.c: Likewise. + * targets.c: Likewise. + * coff-m88k.c: Delete. + * cpu-m88k.c: Delete. + * elf32-m88k.c: Delete. + * hosts/m88kmach3.h: Delete. + * m88kmach3.c: Delete. + * m88kopenbsd.c: Delete. + * Makefile.in: Regenerate. + * bfd-in2.h: Regenerate. + * configure: Regenerate. + * po/SRC-POTFILES.in: Regenerate. + +2018-04-16 Alan Modra + * Makefile.am: Remove i370 support. * archures.c: Likewise. * config.bfd: Likewise. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 9e583df..b9dfa98 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -125,7 +125,6 @@ ALL_MACHINES = \ cpu-m9s12x.lo \ cpu-m9s12xg.lo \ cpu-m68k.lo \ - cpu-m88k.lo \ cpu-mcore.lo \ cpu-mep.lo \ cpu-metag.lo \ @@ -211,7 +210,6 @@ ALL_MACHINES_CFILES = \ cpu-m9s12x.c \ cpu-m9s12xg.c \ cpu-m68k.c \ - cpu-m88k.c \ cpu-mcore.c \ cpu-mep.c \ cpu-metag.c \ @@ -279,7 +277,6 @@ BFD32_BACKENDS = \ coff-go32.lo \ coff-i386.lo \ coff-m68k.lo \ - coff-m88k.lo \ coff-mips.lo \ coff-rs6000.lo \ coff-sh.lo \ @@ -341,7 +338,6 @@ BFD32_BACKENDS = \ elf32-m68hc12.lo \ elf32-m68hc1x.lo \ elf32-m68k.lo \ - elf32-m88k.lo \ elf32-mcore.lo \ elf32-mep.lo \ elf32-metag.lo \ @@ -396,8 +392,6 @@ BFD32_BACKENDS = \ m68k4knetbsd.lo \ m68klinux.lo \ m68knetbsd.lo \ - m88kmach3.lo \ - m88kopenbsd.lo \ mach-o.lo \ mach-o-i386.lo \ mach-o-arm.lo \ @@ -460,7 +454,6 @@ BFD32_BACKENDS_CFILES = \ coff-go32.c \ coff-i386.c \ coff-m68k.c \ - coff-m88k.c \ coff-mips.c \ coff-rs6000.c \ coff-sh.c \ @@ -522,7 +515,6 @@ BFD32_BACKENDS_CFILES = \ elf32-m68hc12.c \ elf32-m68hc1x.c \ elf32-m68k.c \ - elf32-m88k.c \ elf32-mcore.c \ elf32-mep.c \ elf32-metag.c \ @@ -577,8 +569,6 @@ BFD32_BACKENDS_CFILES = \ m68k4knetbsd.c \ m68klinux.c \ m68knetbsd.c \ - m88kmach3.c \ - m88kopenbsd.c \ mach-o.c \ mach-o-i386.c \ mach-o-arm.c \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 6e89ed8..05ee2aa 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -458,7 +458,6 @@ ALL_MACHINES = \ cpu-m9s12x.lo \ cpu-m9s12xg.lo \ cpu-m68k.lo \ - cpu-m88k.lo \ cpu-mcore.lo \ cpu-mep.lo \ cpu-metag.lo \ @@ -544,7 +543,6 @@ ALL_MACHINES_CFILES = \ cpu-m9s12x.c \ cpu-m9s12xg.c \ cpu-m68k.c \ - cpu-m88k.c \ cpu-mcore.c \ cpu-mep.c \ cpu-metag.c \ @@ -613,7 +611,6 @@ BFD32_BACKENDS = \ coff-go32.lo \ coff-i386.lo \ coff-m68k.lo \ - coff-m88k.lo \ coff-mips.lo \ coff-rs6000.lo \ coff-sh.lo \ @@ -675,7 +672,6 @@ BFD32_BACKENDS = \ elf32-m68hc12.lo \ elf32-m68hc1x.lo \ elf32-m68k.lo \ - elf32-m88k.lo \ elf32-mcore.lo \ elf32-mep.lo \ elf32-metag.lo \ @@ -730,8 +726,6 @@ BFD32_BACKENDS = \ m68k4knetbsd.lo \ m68klinux.lo \ m68knetbsd.lo \ - m88kmach3.lo \ - m88kopenbsd.lo \ mach-o.lo \ mach-o-i386.lo \ mach-o-arm.lo \ @@ -794,7 +788,6 @@ BFD32_BACKENDS_CFILES = \ coff-go32.c \ coff-i386.c \ coff-m68k.c \ - coff-m88k.c \ coff-mips.c \ coff-rs6000.c \ coff-sh.c \ @@ -856,7 +849,6 @@ BFD32_BACKENDS_CFILES = \ elf32-m68hc12.c \ elf32-m68hc1x.c \ elf32-m68k.c \ - elf32-m88k.c \ elf32-mcore.c \ elf32-mep.c \ elf32-metag.c \ @@ -911,8 +903,6 @@ BFD32_BACKENDS_CFILES = \ m68k4knetbsd.c \ m68klinux.c \ m68knetbsd.c \ - m88kmach3.c \ - m88kopenbsd.c \ mach-o.c \ mach-o-i386.c \ mach-o-arm.c \ @@ -1306,7 +1296,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-go32.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-i386.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-m68k.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-m88k.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-mips.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-rs6000.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-sh.Plo@am__quote@ @@ -1362,7 +1351,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m68hc11.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m68hc12.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m68k.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m88k.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m9s12x.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m9s12xg.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-mcore.Plo@am__quote@ @@ -1458,7 +1446,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-m68hc12.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-m68hc1x.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-m68k.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-m88k.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-mcore.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-mep.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-metag.Plo@am__quote@ @@ -1548,8 +1535,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k4knetbsd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68klinux.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68knetbsd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m88kmach3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m88kopenbsd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mach-o-aarch64.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mach-o-arm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mach-o-i386.Plo@am__quote@ diff --git a/bfd/aoutx.h b/bfd/aoutx.h index fb1ac7d..c430593 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -840,10 +840,6 @@ NAME (aout, machine_type) (enum bfd_architecture arch, arch_flags = M_CRIS; break; - case bfd_arch_m88k: - *unknown = FALSE; - break; - default: arch_flags = M_UNKNOWN; } diff --git a/bfd/archures.c b/bfd/archures.c index fce2f4b..083d684 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -220,7 +220,6 @@ DESCRIPTION . bfd_arch_we32k, {* AT&T WE32xxx. *} . bfd_arch_romp, {* IBM ROMP PC/RT. *} . bfd_arch_convex, {* Convex. *} -. bfd_arch_m88k, {* Motorola 88xxx. *} . bfd_arch_m98k, {* Motorola 98xxx. *} . bfd_arch_pyramid, {* Pyramid Technology. *} . bfd_arch_h8300, {* Renesas H8/300 (formerly Hitachi H8/300). *} @@ -592,7 +591,6 @@ extern const bfd_arch_info_type bfd_m68hc12_arch; extern const bfd_arch_info_type bfd_m9s12x_arch; extern const bfd_arch_info_type bfd_m9s12xg_arch; extern const bfd_arch_info_type bfd_m68k_arch; -extern const bfd_arch_info_type bfd_m88k_arch; extern const bfd_arch_info_type bfd_mcore_arch; extern const bfd_arch_info_type bfd_mep_arch; extern const bfd_arch_info_type bfd_metag_arch; @@ -683,7 +681,6 @@ static const bfd_arch_info_type * const bfd_archures_list[] = &bfd_m9s12x_arch, &bfd_m9s12xg_arch, &bfd_m68k_arch, - &bfd_m88k_arch, &bfd_mcore_arch, &bfd_mep_arch, &bfd_metag_arch, diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 3cb11ff..aa804d7 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -2095,7 +2095,6 @@ enum bfd_architecture bfd_arch_we32k, /* AT&T WE32xxx. */ bfd_arch_romp, /* IBM ROMP PC/RT. */ bfd_arch_convex, /* Convex. */ - bfd_arch_m88k, /* Motorola 88xxx. */ bfd_arch_m98k, /* Motorola 98xxx. */ bfd_arch_pyramid, /* Pyramid Technology. */ bfd_arch_h8300, /* Renesas H8/300 (formerly Hitachi H8/300). */ @@ -2609,7 +2608,7 @@ struct reloc_howto_struct slot of the instruction, so that a PC relative relocation can be made just by adding in an ordinary offset (e.g., sun3 a.out). Some formats leave the displacement part of an instruction - empty (e.g., m88k bcs); this flag signals the fact. */ + empty (e.g., ELF); this flag signals the fact. */ bfd_boolean pcrel_offset; }; diff --git a/bfd/coff-m88k.c b/bfd/coff-m88k.c deleted file mode 100644 index 93a2d48..0000000 --- a/bfd/coff-m88k.c +++ /dev/null @@ -1,291 +0,0 @@ -/* BFD back-end for Motorola 88000 COFF "Binary Compatibility Standard" files. - Copyright (C) 1990-2018 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 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 M88 1 /* Customize various include files */ -#include "sysdep.h" -#include "bfd.h" -#include "libbfd.h" -#include "coff/m88k.h" -#include "coff/internal.h" -#include "libcoff.h" - -static bfd_reloc_status_type m88k_special_reloc - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); - -#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3) - -#define GET_SCNHDR_NRELOC H_GET_32 -#define GET_SCNHDR_NLNNO H_GET_32 - -/* On coff-m88k, local labels start with '@'. */ - -#define coff_bfd_is_local_label_name m88k_is_local_label_name - -static bfd_boolean -m88k_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, const char *name) -{ - return name[0] == '@'; -} - -static bfd_reloc_status_type -m88k_special_reloc (bfd *abfd, - arelent *reloc_entry, - asymbol *symbol, - void * data, - asection *input_section, - bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - reloc_howto_type *howto = reloc_entry->howto; - - switch (howto->type) - { - case R_HVRT16: - case R_LVRT16: - if (output_bfd != (bfd *) NULL) - { - /* This is a partial relocation, and we want to apply the - relocation to the reloc entry rather than the raw data. - Modify the reloc inplace to reflect what we now know. */ - - reloc_entry->address += input_section->output_offset; - } - else - { - bfd_vma output_base = 0; - bfd_vma addr = reloc_entry->address; - bfd_vma x; - asection *reloc_target_output_section; - long relocation = 0; - - if (! bfd_reloc_offset_in_range (howto, abfd, input_section, - reloc_entry->address - * bfd_octets_per_byte (abfd))) - return bfd_reloc_outofrange; - - x = bfd_get_16 (abfd, (bfd_byte *) data + addr); - - /* Work out which section the relocation is targeted at and the - initial relocation command value. */ - - /* Get symbol value. (Common symbols are special.) */ - if (bfd_is_com_section (symbol->section)) - relocation = 0; - else - relocation = symbol->value; - - reloc_target_output_section = symbol->section->output_section; - - /* Convert input-section-relative symbol value to absolute. */ - if (output_bfd) - output_base = 0; - else - output_base = reloc_target_output_section->vma; - - relocation += output_base + symbol->section->output_offset; - - /* Add in supplied addend. */ - relocation += ((reloc_entry->addend << howto->bitsize) + x); - - reloc_entry->addend = 0; - - relocation >>= (bfd_vma) howto->rightshift; - - /* Shift everything up to where it's going to be used */ - - relocation <<= (bfd_vma) howto->bitpos; - - if (relocation) - bfd_put_16 (abfd, (bfd_vma) relocation, - (unsigned char *) data + addr); - } - - /* If we are not producing relocatable output, return an error if - the symbol is not defined. */ - if (bfd_is_und_section (symbol->section) && output_bfd == (bfd *) NULL) - return bfd_reloc_undefined; - - return bfd_reloc_ok; - - default: - if (output_bfd != (bfd *) NULL) - { - /* This is a partial relocation, and we want to apply the - relocation to the reloc entry rather than the raw data. - Modify the reloc inplace to reflect what we now know. */ - - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - break; - } - - if (output_bfd == (bfd *) NULL) - return bfd_reloc_continue; - - return bfd_reloc_ok; -} - -static reloc_howto_type howto_table[] = -{ - HOWTO (R_PCR16L, /* type */ - 02, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ - 16, /* bitsize */ - TRUE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_signed, /* complain_on_overflow */ - m88k_special_reloc, /* special_function */ - "PCR16L", /* name */ - FALSE, /* partial_inplace */ - 0x0000ffff, /* src_mask */ - 0x0000ffff, /* dst_mask */ - TRUE), /* pcrel_offset */ - - HOWTO (R_PCR26L, /* type */ - 02, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 26, /* bitsize */ - TRUE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_signed, /* complain_on_overflow */ - m88k_special_reloc, /* special_function */ - "PCR26L", /* name */ - FALSE, /* partial_inplace */ - 0x03ffffff, /* src_mask */ - 0x03ffffff, /* dst_mask */ - TRUE), /* pcrel_offset */ - - HOWTO (R_VRT16, /* type */ - 00, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ - 16, /* bitsize */ - FALSE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_bitfield, /* complain_on_overflow */ - m88k_special_reloc, /* special_function */ - "VRT16", /* name */ - FALSE, /* partial_inplace */ - 0x0000ffff, /* src_mask */ - 0x0000ffff, /* dst_mask */ - TRUE), /* pcrel_offset */ - - HOWTO (R_HVRT16, /* type */ - 16, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ - 16, /* bitsize */ - FALSE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_dont, /* complain_on_overflow */ - m88k_special_reloc, /* special_function */ - "HVRT16", /* name */ - FALSE, /* partial_inplace */ - 0x0000ffff, /* src_mask */ - 0x0000ffff, /* dst_mask */ - TRUE), /* pcrel_offset */ - - HOWTO (R_LVRT16, /* type */ - 00, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ - 16, /* bitsize */ - FALSE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_dont, /* complain_on_overflow */ - m88k_special_reloc, /* special_function */ - "LVRT16", /* name */ - FALSE, /* partial_inplace */ - 0x0000ffff, /* src_mask */ - 0x0000ffff, /* dst_mask */ - TRUE), /* pcrel_offset */ - - HOWTO (R_VRT32, /* type */ - 00, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - FALSE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_bitfield, /* complain_on_overflow */ - m88k_special_reloc, /* special_function */ - "VRT32", /* name */ - FALSE, /* partial_inplace */ - 0xffffffff, /* src_mask */ - 0xffffffff, /* dst_mask */ - TRUE), /* pcrel_offset */ -}; - -/* Code to turn an external r_type into a pointer to an entry in the - above howto table. */ -static void -rtype2howto (arelent *cache_ptr, struct internal_reloc *dst) -{ - if (dst->r_type >= R_PCR16L && dst->r_type <= R_VRT32) - { - cache_ptr->howto = howto_table + dst->r_type - R_PCR16L; - } - else - { - BFD_ASSERT (0); - } -} - -#define RTYPE2HOWTO(cache_ptr, dst) rtype2howto (cache_ptr, dst) - -/* Code to swap in the reloc offset */ -#define SWAP_IN_RELOC_OFFSET H_GET_16 -#define SWAP_OUT_RELOC_OFFSET H_PUT_16 - -#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \ - reloc_processing(relent, reloc, symbols, abfd, section) - -static void -reloc_processing (arelent *relent, - struct internal_reloc *reloc, - asymbol **symbols, - bfd *abfd, - asection *section) -{ - relent->address = reloc->r_vaddr; - rtype2howto (relent, reloc); - - if (((int) reloc->r_symndx) > 0) - { - relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx]; - } - else - { - relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; - } - - relent->addend = reloc->r_offset; - relent->address -= section->vma; -} - -#define BADMAG(x) MC88BADMAG(x) - -#ifndef bfd_pe_print_pdata -#define bfd_pe_print_pdata NULL -#endif - -#include "coffcode.h" - -#undef coff_write_armap - -CREATE_BIG_COFF_TARGET_VEC (m88k_coff_bcs_vec, "coff-m88kbcs", 0, 0, '_', NULL, COFF_SWAP_TABLE) diff --git a/bfd/coffcode.h b/bfd/coffcode.h index 311e8cd..7ec9567 100644 --- a/bfd/coffcode.h +++ b/bfd/coffcode.h @@ -32,12 +32,12 @@ SECTION Coff in all its varieties is implemented with a few common files and a number of implementation specific files. For - example, The 88k bcs coff format is implemented in the file - @file{coff-m88k.c}. This file @code{#include}s - @file{coff/m88k.h} which defines the external structure of the - coff format for the 88k, and @file{coff/internal.h} which - defines the internal structure. @file{coff-m88k.c} also - defines the relocations used by the 88k format + example, the i386 coff format is implemented in the file + @file{coff-i386.c}. This file @code{#include}s + @file{coff/i386.h} which defines the external structure of the + coff format for the i386, and @file{coff/internal.h} which + defines the internal structure. @file{coff-i386.c} also + defines the relocations used by the i386 coff format @xref{Relocations}. SUBSECTION @@ -2161,14 +2161,6 @@ coff_set_arch_mach_hook (bfd *abfd, void * filehdr) machine = bfd_mach_m68020; break; #endif -#ifdef MC88MAGIC - case MC88MAGIC: - case MC88DMAGIC: - case MC88OMAGIC: - arch = bfd_arch_m88k; - machine = 88100; - break; -#endif #ifdef Z80MAGIC case Z80MAGIC: arch = bfd_arch_z80; @@ -2831,12 +2823,6 @@ coff_set_flags (bfd * abfd, return TRUE; #endif -#ifdef MC88MAGIC - case bfd_arch_m88k: - *magicp = MC88OMAGIC; - return TRUE; -#endif - #ifdef SH_ARCH_MAGIC_BIG case bfd_arch_sh: #ifdef COFF_IMAGE_WITH_PE @@ -3907,10 +3893,6 @@ coff_write_object_contents (bfd * abfd) internal_a.magic = TIC80_ARCH_MAGIC; #define __A_MAGIC_SET__ #endif /* TIC80 */ -#if M88 -#define __A_MAGIC_SET__ - internal_a.magic = PAGEMAGICBCS; -#endif /* M88 */ #if APOLLO_M68 #define __A_MAGIC_SET__ @@ -5027,8 +5009,7 @@ SUBSUBSECTION o The reloc index is turned into a pointer to a howto structure, in a back end specific way. For instance, the 386 uses the @code{r_type} to directly produce an index - into a howto table vector; the 88k subtracts a number from the - @code{r_type} field and creates an addend field. + into a howto table vector. */ #ifndef CALC_ADDEND diff --git a/bfd/coffswap.h b/bfd/coffswap.h index 5fec8bf..844d601 100644 --- a/bfd/coffswap.h +++ b/bfd/coffswap.h @@ -783,10 +783,6 @@ coff_swap_scnhdr_out (bfd * abfd, void * in, void * out) PUT_SCNHDR_RELPTR (abfd, scnhdr_int->s_relptr, scnhdr_ext->s_relptr); PUT_SCNHDR_LNNOPTR (abfd, scnhdr_int->s_lnnoptr, scnhdr_ext->s_lnnoptr); PUT_SCNHDR_FLAGS (abfd, scnhdr_int->s_flags, scnhdr_ext->s_flags); -#if defined(M88) - H_PUT_32 (abfd, scnhdr_int->s_nlnno, scnhdr_ext->s_nlnno); - H_PUT_32 (abfd, scnhdr_int->s_nreloc, scnhdr_ext->s_nreloc); -#else if (scnhdr_int->s_nlnno <= MAX_SCNHDR_NLNNO) PUT_SCNHDR_NLNNO (abfd, scnhdr_int->s_nlnno, scnhdr_ext->s_nlnno); else @@ -817,7 +813,6 @@ coff_swap_scnhdr_out (bfd * abfd, void * in, void * out) PUT_SCNHDR_NRELOC (abfd, 0xffff, scnhdr_ext->s_nreloc); ret = 0; } -#endif #ifdef COFF_ADJUST_SCNHDR_OUT_POST COFF_ADJUST_SCNHDR_OUT_POST (abfd, in, out); diff --git a/bfd/config.bfd b/bfd/config.bfd index 47ddb4c..5ff00a2 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -87,7 +87,6 @@ case $targ in m68*-*-bsd* | m68*-*-vsta* | \ m68*-ericsson-* | \ m68*-*-psos* | \ - m88*-*-* | \ mips*-big-* | \ mips*-dec-* | mips*el-*-ecoff* | \ mips*-*-ecoff* | \ @@ -139,6 +138,7 @@ case $targ in m68*-apollo-* | \ m68*-apple-aux* | \ m68*-bull-sysv* | \ + m88*-*-* | \ maxq-*-coff | \ mips*el-*-rtems* | \ sparc-*-lynxos* | \ @@ -174,7 +174,6 @@ lm32) targ_archs=bfd_lm32_arch ;; m6811*|m68hc11*) targ_archs="bfd_m68hc11_arch bfd_m68hc12_arch bfd_m9s12x_arch bfd_m9s12xg_arch" ;; m6812*|m68hc12*) targ_archs="bfd_m68hc12_arch bfd_m68hc11_arch bfd_m9s12x_arch bfd_m9s12xg_arch" ;; m68*) targ_archs=bfd_m68k_arch ;; -m88*) targ_archs=bfd_m88k_arch ;; microblaze*) targ_archs=bfd_microblaze_arch ;; mips*) targ_archs=bfd_mips_arch ;; nds32*) targ_archs=bfd_nds32_arch ;; @@ -988,23 +987,6 @@ case "${targ}" in targ_underscore=yes ;; - m88*-harris-cxux* | m88*-*-dgux* | m88*-*-sysv4*) - targ_defvec=m88k_elf32_vec - targ_selvecs=m88k_coff_bcs_vec - ;; - m88*-*-mach3*) - targ_defvec=m88k_aout_mach3_vec - targ_cflags=-DSTAT_FOR_EXEC - ;; - m88*-*-openbsd*) - targ_defvec=m88k_aout_obsd_vec - targ_underscore=yes - ;; - m88*-*-*) - targ_defvec=m88k_coff_bcs_vec - targ_underscore=yes - ;; - mcore-*-elf) targ_defvec=mcore_elf32_be_vec targ_selvecs="mcore_elf32_be_vec mcore_elf32_le_vec" diff --git a/bfd/configure b/bfd/configure index 1947228..8b40c1d 100755 --- a/bfd/configure +++ b/bfd/configure @@ -14457,10 +14457,6 @@ do m68k_coff_un_vec) tb="$tb coff-u68k.lo coff-m68k.lo $coff" ;; m68k_elf32_vec) tb="$tb elf32-m68k.lo elf32.lo $elf" ;; m68k_versados_vec) tb="$tb versados.lo" ;; - m88k_aout_mach3_vec) tb="$tb m88kmach3.lo aout32.lo" ;; - m88k_aout_obsd_vec) tb="$tb m88kopenbsd.lo aout32.lo" ;; - m88k_coff_bcs_vec) tb="$tb coff-m88k.lo $coffgen" ;; - m88k_elf32_vec) tb="$tb elf32-m88k.lo elf32.lo $elf" ;; mach_o_be_vec) tb="$tb mach-o.lo dwarf2.lo" ;; mach_o_le_vec) tb="$tb mach-o.lo dwarf2.lo" ;; mach_o_fat_vec) tb="$tb mach-o.lo dwarf2.lo" ;; @@ -14906,18 +14902,6 @@ if test "${target}" = "${host}"; then COREFILE=trad-core.lo TRAD_HEADER='"hosts/m68kaux.h"' ;; - m88*-*-sysv4*) - ;; - m88*-motorola-sysv*) - COREFILE=ptrace-core.lo - ;; - m88*-*-mach3*) - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/m88kmach3.h"' - ;; - m88*-*-openbsd*) - COREFILE=netbsd-core.lo - ;; ns32k-pc532-mach) COREFILE=trad-core.lo TRAD_HEADER='"hosts/pc532mach.h"' diff --git a/bfd/configure.ac b/bfd/configure.ac index 6ccd582..de836c9 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -534,10 +534,6 @@ do m68k_coff_un_vec) tb="$tb coff-u68k.lo coff-m68k.lo $coff" ;; m68k_elf32_vec) tb="$tb elf32-m68k.lo elf32.lo $elf" ;; m68k_versados_vec) tb="$tb versados.lo" ;; - m88k_aout_mach3_vec) tb="$tb m88kmach3.lo aout32.lo" ;; - m88k_aout_obsd_vec) tb="$tb m88kopenbsd.lo aout32.lo" ;; - m88k_coff_bcs_vec) tb="$tb coff-m88k.lo $coffgen" ;; - m88k_elf32_vec) tb="$tb elf32-m88k.lo elf32.lo $elf" ;; mach_o_be_vec) tb="$tb mach-o.lo dwarf2.lo" ;; mach_o_le_vec) tb="$tb mach-o.lo dwarf2.lo" ;; mach_o_fat_vec) tb="$tb mach-o.lo dwarf2.lo" ;; @@ -992,18 +988,6 @@ changequote([,])dnl COREFILE=trad-core.lo TRAD_HEADER='"hosts/m68kaux.h"' ;; - m88*-*-sysv4*) - ;; - m88*-motorola-sysv*) - COREFILE=ptrace-core.lo - ;; - m88*-*-mach3*) - COREFILE=trad-core.lo - TRAD_HEADER='"hosts/m88kmach3.h"' - ;; - m88*-*-openbsd*) - COREFILE=netbsd-core.lo - ;; ns32k-pc532-mach) COREFILE=trad-core.lo TRAD_HEADER='"hosts/pc532mach.h"' diff --git a/bfd/cpu-m88k.c b/bfd/cpu-m88k.c deleted file mode 100644 index 840efb3..0000000 --- a/bfd/cpu-m88k.c +++ /dev/null @@ -1,41 +0,0 @@ -/* bfd back-end for m88k support - Copyright (C) 1990-2018 Free Software Foundation, Inc. - Written by Steve Chamberlain of 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 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. */ - -#include "sysdep.h" -#include "bfd.h" -#include "libbfd.h" - -const bfd_arch_info_type bfd_m88k_arch = - { - 32, /* 32 bits in a word */ - 32, /* 32 bits in an address */ - 8, /* 8 bits in a byte */ - bfd_arch_m88k, - 88100, /* only 1 machine */ - "m88k", - "m88k:88100", - 3, - TRUE, /* the one and only */ - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - 0, - }; diff --git a/bfd/cpu-ns32k.c b/bfd/cpu-ns32k.c index cbd62d3..2eef0ba 100644 --- a/bfd/cpu-ns32k.c +++ b/bfd/cpu-ns32k.c @@ -220,8 +220,8 @@ do_ns32k_reloc (bfd * abfd, the addend to be the negative of the position of the location within the section; for example, i386-aout does this. For i386-aout, pcrel_offset is FALSE. Some other targets do not - include the position of the location; for example, m88kbcs, - or ELF. For those targets, pcrel_offset is TRUE. + include the position of the location; for example, ELF. + For those targets, pcrel_offset is TRUE. If we are producing relocatable output, then we must ensure that this reloc will be correctly computed when the final @@ -793,12 +793,7 @@ _bfd_ns32k_final_link_relocate (reloc_howto_type *howto, /* If the relocation is PC relative, we want to set RELOCATION to the distance between the symbol (currently in RELOCATION) and the - location we are relocating. Some targets (e.g., i386-aout) - arrange for the contents of the section to be the negative of the - offset of the location within the section; for such targets - pcrel_offset is FALSE. Other targets (e.g., m88kbcs or ELF) - simply leave the contents of the section as zero; for such - targets pcrel_offset is TRUE. If pcrel_offset is FALSE we do not + location we are relocating. If pcrel_offset is FALSE we do not need to subtract out the offset of the location within the section (which is just ADDRESS). */ if (howto->pc_relative) diff --git a/bfd/elf32-m88k.c b/bfd/elf32-m88k.c deleted file mode 100644 index 36aacdc..0000000 --- a/bfd/elf32-m88k.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Motorola 88k-specific support for 32-bit ELF - Copyright (C) 1993-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. */ - -#include "sysdep.h" -#include "bfd.h" -#include "libbfd.h" -#include "elf-bfd.h" - -/* This does not include any relocations, but should be good enough - for GDB. */ - -#define TARGET_BIG_SYM m88k_elf32_vec -#define TARGET_BIG_NAME "elf32-m88k" -#define ELF_ARCH bfd_arch_m88k -#define ELF_MACHINE_CODE EM_88K -#define ELF_MAXPAGESIZE 1 /* FIXME: This number is wrong, It should be the page size in bytes. */ -#define bfd_elf32_bfd_reloc_type_lookup bfd_default_reloc_type_lookup -#define bfd_elf32_bfd_reloc_name_lookup _bfd_norelocs_bfd_reloc_name_lookup -#define elf_info_to_howto _bfd_elf_no_info_to_howto - -#include "elf32-target.h" diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c index 449e834..61f4800 100644 --- a/bfd/elf32-nds32.c +++ b/bfd/elf32-nds32.c @@ -4234,12 +4234,7 @@ nds32_elf_final_link_relocate (reloc_howto_type *howto, bfd *input_bfd, /* If the relocation is PC relative, we want to set RELOCATION to the distance between the symbol (currently in RELOCATION) and the - location we are relocating. Some targets (e.g., i386-aout) - arrange for the contents of the section to be the negative of the - offset of the location within the section; for such targets - pcrel_offset is FALSE. Other targets (e.g., m88kbcs or ELF) - simply leave the contents of the section as zero; for such - targets pcrel_offset is TRUE. If pcrel_offset is FALSE we do not + location we are relocating. If pcrel_offset is FALSE we do not need to subtract out the offset of the location within the section (which is just ADDRESS). */ if (howto->pc_relative) diff --git a/bfd/hosts/m88kmach3.h b/bfd/hosts/m88kmach3.h deleted file mode 100644 index 7e22cc5..0000000 --- a/bfd/hosts/m88kmach3.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 2007-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. */ - -#include -#include - -#undef UPAGES -#define UPAGES 3 - -#define HOST_PAGE_SIZE NBPG -#define HOST_SEGMENT_SIZE NBPG -#define HOST_MACHINE_ARCH bfd_arch_m88k -#define HOST_TEXT_START_ADDR USRTEXT -#define HOST_STACK_END_ADDR USRSTACK diff --git a/bfd/m88kmach3.c b/bfd/m88kmach3.c deleted file mode 100644 index f0c656f..0000000 --- a/bfd/m88kmach3.c +++ /dev/null @@ -1,41 +0,0 @@ -/* BFD back-end for Motorola m88k a.out (Mach 3) 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*2) -#define SEGMENT_SIZE 0x20000 -#define TEXT_START_ADDR 0 -#define N_HEADER_IN_TEXT(x) 1 /* (N_MAGIG(x) == ZMAGIC) */ - -#define N_TXTSIZE(x) ((x)->a_text) - -#include "sysdep.h" -#include "bfd.h" -#include "libbfd.h" -#include "libaout.h" - -#define DEFAULT_ARCH bfd_arch_m88k - -/* 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 (m88k_aout_mach3_,OP) -#define TARGETNAME "a.out-m88k-mach3" - -#include "aout-target.h" diff --git a/bfd/m88kopenbsd.c b/bfd/m88kopenbsd.c deleted file mode 100644 index ffc00c3..0000000 --- a/bfd/m88kopenbsd.c +++ /dev/null @@ -1,34 +0,0 @@ -/* BFD back-end for OpenBSD/m88k a.out binaries. - Copyright (C) 2004-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_IS_BIG_ENDIAN_P - -#define TARGET_PAGE_SIZE 4096 - -#define DEFAULT_ARCH bfd_arch_m88k -#define DEFAULT_MID M_88K_OPENBSD - -/* 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 (m88k_aout_obsd_,OP) -#define TARGETNAME "a.out-m88k-openbsd" - -#include "netbsd.h" diff --git a/bfd/mach-o.c b/bfd/mach-o.c index ded60cf..cfae354 100644 --- a/bfd/mach-o.c +++ b/bfd/mach-o.c @@ -1040,9 +1040,6 @@ bfd_mach_o_convert_architecture (bfd_mach_o_cpu_type mtype, break; } break; - case BFD_MACH_O_CPU_TYPE_MC88000: - *type = bfd_arch_m88k; - break; case BFD_MACH_O_CPU_TYPE_SPARC: *type = bfd_arch_sparc; *subtype = bfd_mach_sparc; @@ -5435,8 +5432,6 @@ bfd_mach_o_stack_addr (enum bfd_mach_o_cpu_type type) { case BFD_MACH_O_CPU_TYPE_MC680x0: return 0x04000000; - case BFD_MACH_O_CPU_TYPE_MC88000: - return 0xffffe000; case BFD_MACH_O_CPU_TYPE_POWERPC: return 0xc0000000; case BFD_MACH_O_CPU_TYPE_I386: diff --git a/bfd/netbsd-core.c b/bfd/netbsd-core.c index da8a14c..7da9824 100644 --- a/bfd/netbsd-core.c +++ b/bfd/netbsd-core.c @@ -198,10 +198,6 @@ netbsd_core_file_p (bfd *abfd) bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0); break; - case M_88K_OPENBSD: - bfd_default_set_arch_mach (abfd, bfd_arch_m88k, 0); - break; - case M_HPPA_OPENBSD: bfd_default_set_arch_mach (abfd, bfd_arch_hppa, bfd_mach_hppa11); break; diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in index 6c6a6d5..89c519d 100644 --- a/bfd/po/SRC-POTFILES.in +++ b/bfd/po/SRC-POTFILES.in @@ -31,7 +31,6 @@ coff-bfd.c coff-go32.c coff-i386.c coff-m68k.c -coff-m88k.c coff-mips.c coff-rs6000.c coff-sh.c @@ -89,7 +88,6 @@ cpu-m32r.c cpu-m68hc11.c cpu-m68hc12.c cpu-m68k.c -cpu-m88k.c cpu-m9s12x.c cpu-m9s12xg.c cpu-mcore.c @@ -188,7 +186,6 @@ elf32-m68hc11.c elf32-m68hc12.c elf32-m68hc1x.c elf32-m68k.c -elf32-m88k.c elf32-mcore.c elf32-mep.c elf32-metag.c @@ -289,8 +286,6 @@ lynx-core.c m68k4knetbsd.c m68klinux.c m68knetbsd.c -m88kmach3.c -m88kopenbsd.c mach-o-aarch64.c mach-o-arm.c mach-o-i386.c diff --git a/bfd/reloc.c b/bfd/reloc.c index 9da9128..9d86dee 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -361,7 +361,7 @@ CODE_FRAGMENT . slot of the instruction, so that a PC relative relocation can . be made just by adding in an ordinary offset (e.g., sun3 a.out). . Some formats leave the displacement part of an instruction -. empty (e.g., m88k bcs); this flag signals the fact. *} +. empty (e.g., ELF); this flag signals the fact. *} . bfd_boolean pcrel_offset; .}; . @@ -704,8 +704,8 @@ bfd_perform_relocation (bfd *abfd, the addend to be the negative of the position of the location within the section; for example, i386-aout does this. For i386-aout, pcrel_offset is FALSE. Some other targets do not - include the position of the location; for example, m88kbcs, - or ELF. For those targets, pcrel_offset is TRUE. + include the position of the location; for example, ELF. + For those targets, pcrel_offset is TRUE. If we are producing relocatable output, then we must ensure that this reloc will be correctly computed when the final @@ -1095,8 +1095,8 @@ bfd_install_relocation (bfd *abfd, the addend to be the negative of the position of the location within the section; for example, i386-aout does this. For i386-aout, pcrel_offset is FALSE. Some other targets do not - include the position of the location; for example, m88kbcs, - or ELF. For those targets, pcrel_offset is TRUE. + include the position of the location; for example, ELF. + For those targets, pcrel_offset is TRUE. If we are producing relocatable output, then we must ensure that this reloc will be correctly computed when the final @@ -1405,11 +1405,11 @@ _bfd_final_link_relocate (reloc_howto_type *howto, location we are relocating. Some targets (e.g., i386-aout) arrange for the contents of the section to be the negative of the offset of the location within the section; for such targets - pcrel_offset is FALSE. Other targets (e.g., m88kbcs or ELF) - simply leave the contents of the section as zero; for such - targets pcrel_offset is TRUE. If pcrel_offset is FALSE we do not - need to subtract out the offset of the location within the - section (which is just ADDRESS). */ + pcrel_offset is FALSE. Other targets (e.g., ELF) simply leave + the contents of the section as zero; for such targets + pcrel_offset is TRUE. If pcrel_offset is FALSE we do not need to + subtract out the offset of the location within the section (which + is just ADDRESS). */ if (howto->pc_relative) { relocation -= (input_section->output_section->vma diff --git a/bfd/targets.c b/bfd/targets.c index b505c97..549ef89 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -712,10 +712,6 @@ extern const bfd_target m68k_coff_sysv_vec; extern const bfd_target m68k_coff_un_vec; extern const bfd_target m68k_elf32_vec; extern const bfd_target m68k_versados_vec; -extern const bfd_target m88k_aout_mach3_vec; -extern const bfd_target m88k_aout_obsd_vec; -extern const bfd_target m88k_coff_bcs_vec; -extern const bfd_target m88k_elf32_vec; extern const bfd_target mach_o_be_vec; extern const bfd_target mach_o_le_vec; extern const bfd_target mach_o_fat_vec; @@ -1156,11 +1152,6 @@ static const bfd_target * const _bfd_target_vector[] = &m68k_elf32_vec, &m68k_versados_vec, - &m88k_aout_mach3_vec, - &m88k_aout_obsd_vec, - &m88k_coff_bcs_vec, - &m88k_elf32_vec, - &mach_o_be_vec, &mach_o_le_vec, &mach_o_fat_vec, -- cgit v1.1