From a435742a7fb32f6320ce0e6074e2500e28378104 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 16 Jun 2020 12:13:05 +0930 Subject: [PATCH] Really remove tic30-aout support bfd/ * aout-tic30.c: Delete file. * Makefile.am (BFD32_BACKENDS): Remove aout-tic30.lo. (BFD32_BACKENDS_CFILES): Remove aout-tic30.c. * config.bfd (c30-*-*aout*, tic30-*-*aout*): Remove entry. (xc16x-*-elf): Sort properly. * configure.ac: Remove tic30_aout_vec. * targets.c: Likewise. * Makefile.in: Regenerate. * configure: Regenerate. * po/SRC-POTFILES.in: Regenerate. gas/ * config/tc-tic30.h: Remove OBJ_AOUT support. * configure.tgt: Delete tic30-*-*aout* entry. ld/ * emulparams/tic30aout.sh: Delete file. * scripttempl/tic30aout.sc: Delete file. * Makefile.am: Remove etic30aout.c from ALL_EMULATION_SOURCES and delete dependency. * configure.tgt: Delete tic30-*-*aout* entry. * testsuite/ld-scripts/sane1.d: Delete tic30-*-aout mention. * testsuite/ld-scripts/segment-start.d: Likewise. * Makefile.in: Regenerate. * po/BLD-POTFILES.in: Regenerate. --- bfd/ChangeLog | 13 + bfd/Makefile.am | 2 - bfd/Makefile.in | 3 - bfd/aout-tic30.c | 1173 ----------------------- bfd/config.bfd | 10 +- bfd/configure | 1 - bfd/configure.ac | 1 - bfd/po/SRC-POTFILES.in | 1 - bfd/targets.c | 2 - gas/ChangeLog | 5 + gas/config/tc-tic30.h | 4 - gas/configure.tgt | 1 - ld/ChangeLog | 12 + ld/Makefile.am | 2 - ld/Makefile.in | 3 - ld/configure.tgt | 3 - ld/emulparams/tic30aout.sh | 7 - ld/po/BLD-POTFILES.in | 1 - ld/scripttempl/tic30aout.sc | 46 - ld/testsuite/ld-scripts/sane1.d | 4 +- ld/testsuite/ld-scripts/segment-start.d | 2 +- 21 files changed, 37 insertions(+), 1259 deletions(-) delete mode 100644 bfd/aout-tic30.c delete mode 100644 ld/emulparams/tic30aout.sh delete mode 100644 ld/scripttempl/tic30aout.sc diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ecd7f8d53ef..52b2df63649 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,16 @@ +2020-06-16 Alan Modra + + * aout-tic30.c: Delete file. + * Makefile.am (BFD32_BACKENDS): Remove aout-tic30.lo. + (BFD32_BACKENDS_CFILES): Remove aout-tic30.c. + * config.bfd (c30-*-*aout*, tic30-*-*aout*): Remove entry. + (xc16x-*-elf): Sort properly. + * configure.ac: Remove tic30_aout_vec. + * targets.c: Likewise. + * Makefile.in: Regenerate. + * configure: Regenerate. + * po/SRC-POTFILES.in: Regenerate. + 2020-06-15 Max Filippov * elf32-xtensa.c (XSHAL_ABI, XTHAL_ABI_UNDEFINED) diff --git a/bfd/Makefile.am b/bfd/Makefile.am index b6088a3c4a8..c88c4480001 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -262,7 +262,6 @@ ALL_MACHINES_CFILES = \ BFD32_BACKENDS = \ aout-cris.lo \ aout-ns32k.lo \ - aout-tic30.lo \ aout32.lo \ cf-i386lynx.lo \ coff-go32.lo \ @@ -398,7 +397,6 @@ BFD32_BACKENDS = \ BFD32_BACKENDS_CFILES = \ aout-cris.c \ aout-ns32k.c \ - aout-tic30.c \ aout32.c \ cf-i386lynx.c \ coff-go32.c \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index dd3474d92b0..d0d14c6ab32 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -687,7 +687,6 @@ ALL_MACHINES_CFILES = \ BFD32_BACKENDS = \ aout-cris.lo \ aout-ns32k.lo \ - aout-tic30.lo \ aout32.lo \ cf-i386lynx.lo \ coff-go32.lo \ @@ -823,7 +822,6 @@ BFD32_BACKENDS = \ BFD32_BACKENDS_CFILES = \ aout-cris.c \ aout-ns32k.c \ - aout-tic30.c \ aout32.c \ cf-i386lynx.c \ coff-go32.c \ @@ -1295,7 +1293,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aix5ppc-core.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-cris.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-ns32k.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-tic30.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout32.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout64.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/archive.Plo@am__quote@ diff --git a/bfd/aout-tic30.c b/bfd/aout-tic30.c deleted file mode 100644 index 222d1f0e30d..00000000000 --- a/bfd/aout-tic30.c +++ /dev/null @@ -1,1173 +0,0 @@ -/* BFD back-end for TMS320C30 a.out binaries. - Copyright (C) 1998-2020 Free Software Foundation, Inc. - Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au) - - 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 N_HEADER_IN_TEXT(x) 1 -#define TEXT_START_ADDR 1024 -#define TARGET_PAGE_SIZE 128 -#define SEGMENT_SIZE TARGET_PAGE_SIZE -#define DEFAULT_ARCH bfd_arch_tic30 -#define ARCH_SIZE 32 - -/* 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 (tic30_aout_,OP) -#define TARGETNAME "a.out-tic30" -#define NAME(x,y) CONCAT3 (tic30_aout,_32_,y) - -#include "sysdep.h" -#include "bfd.h" -#include "libaout.h" -#include "aout/aout64.h" -#include "aout/stab_gnu.h" -#include "aout/ar.h" - -#define MY_reloc_howto(BFD, REL, IN, EX, PC) tic30_aout_reloc_howto (BFD, REL, & IN, & EX, & PC) - -#define MY_final_link_relocate tic30_aout_final_link_relocate -#define MY_object_p tic30_aout_object_p -#define MY_mkobject NAME (aout,mkobject) -#define MY_write_object_contents tic30_aout_write_object_contents -#define MY_set_sizes tic30_aout_set_sizes - -#ifndef MY_exec_hdr_flags -#define MY_exec_hdr_flags 1 -#endif - -#ifndef MY_backend_data - -#ifndef MY_zmagic_contiguous -#define MY_zmagic_contiguous 0 -#endif -#ifndef MY_text_includes_header -#define MY_text_includes_header 0 -#endif -#ifndef MY_entry_is_text_address -#define MY_entry_is_text_address 0 -#endif -#ifndef MY_exec_header_not_counted -#define MY_exec_header_not_counted 1 -#endif -#ifndef MY_add_dynamic_symbols -#define MY_add_dynamic_symbols 0 -#endif -#ifndef MY_add_one_symbol -#define MY_add_one_symbol 0 -#endif -#ifndef MY_link_dynamic_object -#define MY_link_dynamic_object 0 -#endif -#ifndef MY_write_dynamic_symbol -#define MY_write_dynamic_symbol 0 -#endif -#ifndef MY_check_dynamic_reloc -#define MY_check_dynamic_reloc 0 -#endif -#ifndef MY_finish_dynamic_link -#define MY_finish_dynamic_link 0 -#endif - -static bfd_boolean -tic30_aout_set_sizes (bfd *abfd) -{ - adata (abfd).page_size = TARGET_PAGE_SIZE; - -#ifdef SEGMENT_SIZE - adata (abfd).segment_size = SEGMENT_SIZE; -#else - adata (abfd).segment_size = TARGET_PAGE_SIZE; -#endif - -#ifdef ZMAGIC_DISK_BLOCK_SIZE - adata (abfd).zmagic_disk_block_size = ZMAGIC_DISK_BLOCK_SIZE; -#else - adata (abfd).zmagic_disk_block_size = TARGET_PAGE_SIZE; -#endif - - adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE; - - return TRUE; -} - -static const struct aout_backend_data tic30_aout_backend_data = -{ - MY_zmagic_contiguous, - MY_text_includes_header, - MY_entry_is_text_address, - MY_exec_hdr_flags, - 0, /* Text vma? */ - MY_set_sizes, - MY_exec_header_not_counted, - MY_add_dynamic_symbols, - MY_add_one_symbol, - MY_link_dynamic_object, - MY_write_dynamic_symbol, - MY_check_dynamic_reloc, - MY_finish_dynamic_link -}; -#define MY_backend_data &tic30_aout_backend_data -#endif - -static reloc_howto_type * - tic30_aout_reloc_howto (bfd *, struct reloc_std_external *, int *, int *, int *); -static bfd_reloc_status_type - tic30_aout_final_link_relocate - (reloc_howto_type *, bfd *, asection *, bfd_byte *, bfd_vma, bfd_vma, bfd_vma); - -/* FIXME: This is wrong. aoutx.h should really only be included by - aout32.c. */ - -#include "aoutx.h" - -/* This function is used to work out pc-relative offsets for the - TMS320C30. The data already placed by md_pcrel_from within gas is - useless for a relocation, so we just get the offset value and place - a version of this within the object code. - tic30_aout_final_link_relocate will then calculate the required - relocation to add on to the value in the object code. */ - -static bfd_reloc_status_type -tic30_aout_fix_pcrel_16 (bfd *abfd, - arelent *reloc_entry, - asymbol *symbol ATTRIBUTE_UNUSED, - void * data, - asection *input_section ATTRIBUTE_UNUSED, - bfd *output_bfd ATTRIBUTE_UNUSED, - char **error_message ATTRIBUTE_UNUSED) -{ - bfd_vma relocation = 1; - bfd_byte offset_data = bfd_get_8 (abfd, (bfd_byte *) data + reloc_entry->address - 1); - - /* The byte before the location of the fix contains bits 23-16 of - the pcrel instruction. Bit 21 is set for a delayed instruction - which requires on offset of 3 instead of 1. */ - if (offset_data & 0x20) - relocation -= 3; - else - relocation -= 1; - bfd_put_16 (abfd, relocation, (bfd_byte *) data + reloc_entry->address); - return bfd_reloc_ok; -} - -/* This function is used as a callback for 16-bit relocs. This is - required for relocations between segments. A line in aoutx.h - requires that any relocations for the data section should point to - the end of the aligned text section, plus an offset. By default, - this does not happen, therefore this function takes care of - that. */ - -static bfd_reloc_status_type -tic30_aout_fix_16 (bfd *abfd, - arelent *reloc_entry, - asymbol *symbol, - void * data, - asection *input_section ATTRIBUTE_UNUSED, - bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - bfd_vma relocation; - - /* Make sure that the symbol's section is defined. */ - if (bfd_is_und_section (symbol->section) && (symbol->flags & BSF_WEAK) == 0) - return output_bfd ? bfd_reloc_ok : bfd_reloc_undefined; - /* Get the size of the input section and turn it into the TMS320C30 - 32-bit address format. */ - relocation = (symbol->section->vma >> 2); - relocation += bfd_get_16 (abfd, (bfd_byte *) data + reloc_entry->address); - bfd_put_16 (abfd, relocation, (bfd_byte *) data + reloc_entry->address); - return bfd_reloc_ok; -} - -/* This function does the same thing as tic30_aout_fix_16 except for 32 - bit relocations. */ - -static bfd_reloc_status_type -tic30_aout_fix_32 (bfd *abfd, - arelent *reloc_entry, - asymbol *symbol, - void * data, - asection *input_section ATTRIBUTE_UNUSED, - bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - bfd_vma relocation; - - /* Make sure that the symbol's section is defined. */ - if (bfd_is_und_section (symbol->section) && (symbol->flags & BSF_WEAK) == 0) - return output_bfd ? bfd_reloc_ok : bfd_reloc_undefined; - /* Get the size of the input section and turn it into the TMS320C30 - 32-bit address format. */ - relocation = (symbol->section->vma >> 2); - relocation += bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address); - bfd_put_32 (abfd, relocation, (bfd_byte *) data + reloc_entry->address); - return bfd_reloc_ok; -} - -/* This table lists the relocation types for the TMS320C30. There are - only a few relocations required, and all must be divided by 4 (>> - 2) to get the 32-bit addresses in the format the TMS320C30 likes - it. */ -reloc_howto_type tic30_aout_howto_table[] = -{ - EMPTY_HOWTO (-1), - HOWTO (1, 2, 1, 16, FALSE, 0, 0, tic30_aout_fix_16, - "16", FALSE, 0x0000FFFF, 0x0000FFFF, FALSE), - HOWTO (2, 2, 2, 24, FALSE, 0, complain_overflow_bitfield, NULL, - "24", FALSE, 0x00FFFFFF, 0x00FFFFFF, FALSE), - HOWTO (3, 18, 3, 24, FALSE, 0, complain_overflow_bitfield, NULL, - "LDP", FALSE, 0x00FF0000, 0x000000FF, FALSE), - HOWTO (4, 2, 4, 32, FALSE, 0, complain_overflow_bitfield, tic30_aout_fix_32, - "32", FALSE, 0xFFFFFFFF, 0xFFFFFFFF, FALSE), - HOWTO (5, 2, 1, 16, TRUE, 0, complain_overflow_signed, - tic30_aout_fix_pcrel_16, "PCREL", TRUE, 0x0000FFFF, 0x0000FFFF, TRUE), - EMPTY_HOWTO (-1), - EMPTY_HOWTO (-1), - EMPTY_HOWTO (-1), - EMPTY_HOWTO (-1), - EMPTY_HOWTO (-1) -}; - - -static reloc_howto_type * -tic30_aout_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, - bfd_reloc_code_real_type code) -{ - switch (code) - { - case BFD_RELOC_8: - case BFD_RELOC_TIC30_LDP: - return &tic30_aout_howto_table[3]; - case BFD_RELOC_16: - return &tic30_aout_howto_table[1]; - case BFD_RELOC_24: - return &tic30_aout_howto_table[2]; - case BFD_RELOC_16_PCREL: - return &tic30_aout_howto_table[5]; - case BFD_RELOC_32: - return &tic30_aout_howto_table[4]; - default: - return NULL; - } -} - -static reloc_howto_type * -tic30_aout_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, - const char *r_name) -{ - unsigned int i; - - for (i = 0; - i < (sizeof (tic30_aout_howto_table) - / sizeof (tic30_aout_howto_table[0])); - i++) - if (tic30_aout_howto_table[i].name != NULL - && strcasecmp (tic30_aout_howto_table[i].name, r_name) == 0) - return &tic30_aout_howto_table[i]; - - return NULL; -} - -static reloc_howto_type * -tic30_aout_reloc_howto (bfd *abfd, - struct reloc_std_external *relocs, - int *r_index, - int *r_extern, - int *r_pcrel) -{ - unsigned int r_length; - unsigned int r_pcrel_done; - int howto_index; - - *r_pcrel = 0; - if (bfd_header_big_endian (abfd)) - { - *r_index = ((relocs->r_index[0] << 16) | (relocs->r_index[1] << 8) | relocs->r_index[2]); - *r_extern = (0 != (relocs->r_type[0] & RELOC_STD_BITS_EXTERN_BIG)); - r_pcrel_done = (0 != (relocs->r_type[0] & RELOC_STD_BITS_PCREL_BIG)); - r_length = ((relocs->r_type[0] & RELOC_STD_BITS_LENGTH_BIG) >> RELOC_STD_BITS_LENGTH_SH_BIG); - } - else - { - *r_index = ((relocs->r_index[2] << 16) | (relocs->r_index[1] << 8) | relocs->r_index[0]); - *r_extern = (0 != (relocs->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE)); - r_pcrel_done = (0 != (relocs->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE)); - r_length = ((relocs->r_type[0] & RELOC_STD_BITS_LENGTH_LITTLE) >> RELOC_STD_BITS_LENGTH_SH_LITTLE); - } - howto_index = r_length + 4 * r_pcrel_done; - return tic30_aout_howto_table + howto_index; -} - -/* These macros will get 24-bit values from the bfd definition. - Big-endian only. */ -#define bfd_getb_24(BFD,ADDR) \ - (bfd_get_8 (BFD, ADDR ) << 16) | \ - (bfd_get_8 (BFD, ADDR + 1) << 8) | \ - (bfd_get_8 (BFD, ADDR + 2) ) - -#define bfd_putb_24(BFD,DATA,ADDR) \ - bfd_put_8 (BFD, (bfd_byte) ((DATA >> 16) & 0xFF), ADDR ); \ - bfd_put_8 (BFD, (bfd_byte) ((DATA >> 8) & 0xFF), ADDR + 1); \ - bfd_put_8 (BFD, (bfd_byte) ( DATA & 0xFF), ADDR + 2) - -/* Set parameters about this a.out file that are machine-dependent. - This routine is called from some_aout_object_p just before it returns. */ - -static bfd_cleanup -tic30_aout_callback (bfd *abfd) -{ - struct internal_exec *execp = exec_hdr (abfd); - unsigned int arch_align_power; - unsigned long arch_align; - - /* Calculate the file positions of the parts of a newly read aout header. */ - obj_textsec (abfd)->size = N_TXTSIZE (execp); - - /* The virtual memory addresses of the sections. */ - obj_textsec (abfd)->vma = N_TXTADDR (execp); - obj_datasec (abfd)->vma = N_DATADDR (execp); - obj_bsssec (abfd)->vma = N_BSSADDR (execp); - - obj_textsec (abfd)->lma = obj_textsec (abfd)->vma; - obj_datasec (abfd)->lma = obj_datasec (abfd)->vma; - obj_bsssec (abfd)->lma = obj_bsssec (abfd)->vma; - - /* The file offsets of the sections. */ - obj_textsec (abfd)->filepos = N_TXTOFF (execp); - obj_datasec (abfd)->filepos = N_DATOFF (execp); - - /* The file offsets of the relocation info. */ - obj_textsec (abfd)->rel_filepos = N_TRELOFF (execp); - obj_datasec (abfd)->rel_filepos = N_DRELOFF (execp); - - /* The file offsets of the string table and symbol table. */ - obj_sym_filepos (abfd) = N_SYMOFF (execp); - obj_str_filepos (abfd) = N_STROFF (execp); - - /* Determine the architecture and machine type of the object file. */ -#ifdef SET_ARCH_MACH - SET_ARCH_MACH (abfd, execp); -#else - bfd_default_set_arch_mach (abfd, DEFAULT_ARCH, 0L); -#endif - - /* Now that we know the architecture, set the alignments of the - sections. This is normally done by NAME (aout,new_section_hook), - but when the initial sections were created the architecture had - not yet been set. However, for backward compatibility, we don't - set the alignment power any higher than as required by the size - of the section. */ - arch_align_power = bfd_get_arch_info (abfd)->section_align_power; - arch_align = 1 << arch_align_power; - if ((BFD_ALIGN (obj_textsec (abfd)->size, arch_align) - == obj_textsec (abfd)->size) - && (BFD_ALIGN (obj_datasec (abfd)->size, arch_align) - == obj_datasec (abfd)->size) - && (BFD_ALIGN (obj_bsssec (abfd)->size, arch_align) - == obj_bsssec (abfd)->size)) - { - obj_textsec (abfd)->alignment_power = arch_align_power; - obj_datasec (abfd)->alignment_power = arch_align_power; - obj_bsssec (abfd)->alignment_power = arch_align_power; - } - return _bfd_no_cleanup; -} - -static bfd_reloc_status_type -tic30_aout_relocate_contents (reloc_howto_type *howto, - bfd *input_bfd, - bfd_vma relocation, - bfd_byte *location) -{ - bfd_vma x; - bfd_boolean overflow; - - if (howto->size < 0) - relocation = -relocation; - - switch (howto->size) - { - default: - case 0: - abort (); - break; - case 1: - x = bfd_get_16 (input_bfd, location); - break; - case 2: - x = bfd_getb_24 (input_bfd, location); - break; - case 3: - x = bfd_get_8 (input_bfd, location); - break; - case 4: - x = bfd_get_32 (input_bfd, location); - break; - } - - overflow = FALSE; - - if (howto->complain_on_overflow != complain_overflow_dont) - { - bfd_vma check; - bfd_signed_vma signed_check; - bfd_vma add; - bfd_signed_vma signed_add; - - if (howto->rightshift == 0) - { - check = relocation; - signed_check = (bfd_signed_vma) relocation; - } - else - { - check = relocation >> howto->rightshift; - if ((bfd_signed_vma) relocation >= 0) - signed_check = check; - else - signed_check = (check | ((bfd_vma) - 1 & ~((bfd_vma) - 1 >> howto->rightshift))); - } - add = x & howto->src_mask; - signed_add = add; - if ((add & (((~howto->src_mask) >> 1) & howto->src_mask)) != 0) - signed_add -= (((~howto->src_mask) >> 1) & howto->src_mask) << 1; - if (howto->bitpos == 0) - { - check += add; - signed_check += signed_add; - } - else - { - check += add >> howto->bitpos; - if (signed_add >= 0) - signed_check += add >> howto->bitpos; - else - signed_check += ((add >> howto->bitpos) | ((bfd_vma) - 1 & ~((bfd_vma) - 1 >> howto->bitpos))); - } - switch (howto->complain_on_overflow) - { - case complain_overflow_signed: - { - bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1; - bfd_signed_vma reloc_signed_min = ~reloc_signed_max; - - if (signed_check > reloc_signed_max || signed_check < reloc_signed_min) - overflow = TRUE; - } - break; - case complain_overflow_unsigned: - { - bfd_vma reloc_unsigned_max = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1; - - if (check > reloc_unsigned_max) - overflow = TRUE; - } - break; - case complain_overflow_bitfield: - { - bfd_vma reloc_bits = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1; - - if ((check & ~reloc_bits) != 0 - && (((bfd_vma) signed_check & ~reloc_bits) - != ((bfd_vma) -1 & ~reloc_bits))) - overflow = TRUE; - } - break; - default: - abort (); - } - } - relocation >>= (bfd_vma) howto->rightshift; - relocation <<= (bfd_vma) howto->bitpos; - x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + relocation) & howto->dst_mask)); - switch (howto->size) - { - default: - case 0: - abort (); - break; - case 1: - bfd_put_16 (input_bfd, x, location); - break; - case 2: - bfd_putb_24 (input_bfd, x, location); - break; - case 3: - bfd_put_8 (input_bfd, x, location); - break; - case 4: - bfd_put_32 (input_bfd, x, location); - break; - } - return overflow ? bfd_reloc_overflow : bfd_reloc_ok; -} - -static bfd_reloc_status_type -tic30_aout_final_link_relocate (reloc_howto_type *howto, - bfd *input_bfd, - asection *input_section, - bfd_byte *contents, - bfd_vma address, - bfd_vma value, - bfd_vma addend) -{ - bfd_vma relocation; - - if (address > bfd_get_section_limit (input_bfd, input_section)) - return bfd_reloc_outofrange; - - relocation = value + addend; - if (howto->pc_relative) - { - relocation -= (input_section->output_section->vma + input_section->output_offset); - if (howto->pcrel_offset) - relocation -= address; - } - return tic30_aout_relocate_contents (howto, input_bfd, relocation, - contents + address); -} - -/* Finish up the reading of an a.out file header. */ - -static bfd_cleanup -tic30_aout_object_p (bfd *abfd) -{ - struct external_exec exec_bytes; /* Raw exec header from file. */ - struct internal_exec exec; /* Cleaned-up exec header. */ - bfd_cleanup cleanup; - size_t amt = EXEC_BYTES_SIZE; - - if (bfd_bread (& exec_bytes, amt, abfd) != amt) - { - if (bfd_get_error () != bfd_error_system_call) - bfd_set_error (bfd_error_wrong_format); - return 0; - } - -#ifdef SWAP_MAGIC - exec.a_info = SWAP_MAGIC (exec_bytes.e_info); -#else - exec.a_info = H_GET_32 (abfd, exec_bytes.e_info); -#endif /* SWAP_MAGIC */ - - if (N_BADMAG (&exec)) - return 0; -#ifdef MACHTYPE_OK - if (!(MACHTYPE_OK (N_MACHTYPE (&exec)))) - return 0; -#endif - - NAME (aout, swap_exec_header_in) (abfd, &exec_bytes, &exec); - -#ifdef SWAP_MAGIC - /* Swap_exec_header_in read in a_info with the wrong byte order. */ - exec.a_info = SWAP_MAGIC (exec_bytes.e_info); -#endif - - cleanup = NAME (aout, some_aout_object_p) (abfd, &exec, tic30_aout_callback); - -#ifdef ENTRY_CAN_BE_ZERO - /* The NEWSOS3 entry-point is/was 0, which (amongst other lossage) - means that it isn't obvious if EXEC_P should be set. - All of the following must be true for an executable: - There must be no relocations, the bfd can be neither an - archive nor an archive element, and the file must be executable. */ - - if (exec.a_trsize + exec.a_drsize == 0 - && bfd_get_format (abfd) == bfd_object && abfd->my_archive == NULL) - { - struct stat buf; -#ifndef S_IXUSR -#define S_IXUSR 0100 /* Execute by owner. */ -#endif - if (stat (abfd->filename, &buf) == 0 && (buf.st_mode & S_IXUSR)) - abfd->flags |= EXEC_P; - } -#endif - - return cleanup; -} - -/* Copy private section data. This actually does nothing with the - sections. It copies the subformat field. We copy it here, because - we need to know whether this is a QMAGIC file before we set the - section contents, and copy_private_bfd_data is not called until - after the section contents have been set. */ - -static bfd_boolean -MY_bfd_copy_private_section_data (bfd *ibfd, - asection *isec ATTRIBUTE_UNUSED, - bfd *obfd, - asection *osec ATTRIBUTE_UNUSED) -{ - if (bfd_get_flavour (obfd) == bfd_target_aout_flavour) - obj_aout_subformat (obfd) = obj_aout_subformat (ibfd); - return TRUE; -} - -/* Write an object file. - Section contents have already been written. We write the - file header, symbols, and relocation. */ - -static bfd_boolean -tic30_aout_write_object_contents (bfd *abfd) -{ - struct external_exec exec_bytes; - struct internal_exec *execp = exec_hdr (abfd); - - obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; - - { - if (adata (abfd).magic == undecided_magic) - NAME (aout, adjust_sizes_and_vmas) (abfd); - - execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE; - execp->a_entry = bfd_get_start_address (abfd); - - execp->a_trsize = ((obj_textsec (abfd)->reloc_count) * obj_reloc_entry_size (abfd)); - execp->a_drsize = ((obj_datasec (abfd)->reloc_count) * obj_reloc_entry_size (abfd)); - NAME (aout, swap_exec_header_out) (abfd, execp, &exec_bytes); - - if (adata (abfd).exec_bytes_size > 0) - { - bfd_size_type amt; - - if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) - return FALSE; - amt = adata (abfd).exec_bytes_size; - if (bfd_bwrite (& exec_bytes, amt, abfd) != amt) - return FALSE; - } - - /* Now write out reloc info, followed by syms and strings. */ - if (bfd_get_outsymbols (abfd) != (asymbol **) NULL - && bfd_get_symcount (abfd) != 0) - { - if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (execp)), SEEK_SET) != 0) - return FALSE; - - if (!NAME (aout, write_syms) (abfd)) - return FALSE; - } - - if (bfd_seek (abfd, (file_ptr) (N_TRELOFF (execp)), SEEK_SET) != 0) - return FALSE; - if (!NAME (aout, squirt_out_relocs) (abfd, obj_textsec (abfd))) - return FALSE; - - if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (execp)), SEEK_SET) != 0) - return FALSE; - if (!NAME (aout, squirt_out_relocs) (abfd, obj_datasec (abfd))) - return FALSE; - } - - return TRUE; -} - -#ifndef MY_final_link_callback - -/* Callback for the final_link routine to set the section offsets. */ - -static void -MY_final_link_callback (bfd *abfd, - file_ptr *ptreloff, - file_ptr *pdreloff, - file_ptr *psymoff) -{ - struct internal_exec *execp = exec_hdr (abfd); - - *ptreloff = obj_datasec (abfd)->filepos + execp->a_data; - *pdreloff = *ptreloff + execp->a_trsize; - *psymoff = *pdreloff + execp->a_drsize; -} - -#endif - -#ifndef MY_bfd_final_link - -/* Final link routine. We need to use a call back to get the correct - offsets in the output file. */ - -static bfd_boolean -MY_bfd_final_link (bfd *abfd, struct bfd_link_info *info) -{ - struct internal_exec *execp = exec_hdr (abfd); - asection *objsym_section; - file_ptr pos; - bfd_vma vma = 0; - - /* Set the executable header size to 0, as we don't want one for an - output. FIXME: Really? tic30_aout_object_p doesn't accept such - an executable! */ - adata (abfd).exec_bytes_size = 0; - - pos = adata (abfd).exec_bytes_size; - /* ??? Why are we looking at create_object_symbols_section? */ - objsym_section = info->create_object_symbols_section; - if (objsym_section != NULL) - vma = objsym_section->vma; - - /* Text. */ - if (obj_textsec (abfd) != NULL) - { - pos += vma; - obj_textsec (abfd)->filepos = pos; - obj_textsec (abfd)->vma = vma; - obj_textsec (abfd)->user_set_vma = 1; - execp->a_text = obj_textsec (abfd)->size; - pos += obj_textsec (abfd)->size; - vma += obj_textsec (abfd)->size; - } - - /* Data. */ - if (obj_datasec (abfd) != NULL) - { - if (abfd->flags & D_PAGED) - { - if (objsym_section != NULL - && objsym_section->next != NULL - && objsym_section->next->vma != 0) - obj_datasec (abfd)->vma = objsym_section->next->vma; - else - obj_datasec (abfd)->vma = BFD_ALIGN (vma, adata (abfd).segment_size); - } - else - obj_datasec (abfd)->vma = BFD_ALIGN (vma, 4); - - if (obj_datasec (abfd)->vma < vma) - obj_datasec (abfd)->vma = BFD_ALIGN (vma, 4); - - pos += obj_datasec (abfd)->vma - vma; - obj_datasec (abfd)->filepos = pos; - obj_datasec (abfd)->user_set_vma = 1; - - vma = obj_datasec (abfd)->vma; - if (obj_textsec (abfd) != NULL) - { - execp->a_text = vma - obj_textsec (abfd)->vma; - obj_textsec (abfd)->size = execp->a_text; - } - execp->a_data = obj_datasec (abfd)->size; - vma += obj_datasec (abfd)->size; - } - - /* Since BSS follows data immediately, see if it needs alignment. */ - if (obj_bsssec (abfd) != NULL) - { - int pad; - - pad = align_power (vma, obj_bsssec (abfd)->alignment_power) - vma; - if (obj_datasec (abfd) != NULL) - { - obj_datasec (abfd)->size += pad; - execp->a_data += pad; - } - else if (obj_textsec (abfd) != NULL) - { - obj_textsec (abfd)->size += pad; - execp->a_text += pad; - } - - /* BSS. */ - vma += pad; - obj_bsssec (abfd)->vma = vma; - obj_bsssec (abfd)->user_set_vma = 1; - } - - /* We are fully resized, so don't readjust in final_link. */ - adata (abfd).magic = z_magic; - - return NAME (aout, final_link) (abfd, info, MY_final_link_callback); -} - -#endif - -static enum machine_type -tic30_aout_machine_type (enum bfd_architecture arch, - unsigned long machine ATTRIBUTE_UNUSED, - bfd_boolean *unknown) -{ - enum machine_type arch_flags; - - arch_flags = M_UNKNOWN; - *unknown = TRUE; - - switch (arch) - { - case bfd_arch_tic30: - *unknown = FALSE; - break; - default: - arch_flags = M_UNKNOWN; - } - if (arch_flags != M_UNKNOWN) - *unknown = FALSE; - return arch_flags; -} - -static bfd_boolean -tic30_aout_set_arch_mach (bfd *abfd, - enum bfd_architecture arch, - unsigned long machine) -{ - if (!bfd_default_set_arch_mach (abfd, arch, machine)) - return FALSE; - if (arch != bfd_arch_unknown) - { - bfd_boolean unknown; - tic30_aout_machine_type (arch, machine, &unknown); - if (unknown) - return FALSE; - } - obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; - return (*aout_backend_info (abfd)->set_sizes) (abfd); -} - -/* We assume BFD generic archive files. */ -#ifndef MY_openr_next_archived_file -#define MY_openr_next_archived_file bfd_generic_openr_next_archived_file -#endif -#ifndef MY_get_elt_at_index -#define MY_get_elt_at_index _bfd_generic_get_elt_at_index -#endif -#ifndef MY_generic_stat_arch_elt -#define MY_generic_stat_arch_elt bfd_generic_stat_arch_elt -#endif -#ifndef MY_slurp_armap -#define MY_slurp_armap bfd_slurp_bsd_armap -#endif -#ifndef MY_slurp_extended_name_table -#define MY_slurp_extended_name_table _bfd_slurp_extended_name_table -#endif -#ifndef MY_construct_extended_name_table -#define MY_construct_extended_name_table \ - _bfd_archive_bsd_construct_extended_name_table -#endif -#ifndef MY_write_armap -#define MY_write_armap _bfd_bsd_write_armap -#endif -#ifndef MY_read_ar_hdr -#define MY_read_ar_hdr _bfd_generic_read_ar_hdr -#endif -#ifndef MY_write_ar_hdr -#define MY_write_ar_hdr _bfd_generic_write_ar_hdr -#endif -#ifndef MY_truncate_arname -#define MY_truncate_arname bfd_bsd_truncate_arname -#endif -#ifndef MY_update_armap_timestamp -#define MY_update_armap_timestamp _bfd_archive_bsd_update_armap_timestamp -#endif - -/* No core file defined here -- configure in trad-core.c separately. */ -#ifndef MY_core_file_failing_command -#define MY_core_file_failing_command _bfd_nocore_core_file_failing_command -#endif -#ifndef MY_core_file_failing_signal -#define MY_core_file_failing_signal _bfd_nocore_core_file_failing_signal -#endif -#ifndef MY_core_file_matches_executable_p -#define MY_core_file_matches_executable_p \ - _bfd_nocore_core_file_matches_executable_p -#endif -#ifndef MY_core_file_pid -#define MY_core_file_pid _bfd_nocore_core_file_pid -#endif -#ifndef MY_core_file_p -#define MY_core_file_p _bfd_dummy_target -#endif - -#ifndef MY_bfd_debug_info_start -#define MY_bfd_debug_info_start _bfd_void_bfd -#endif -#ifndef MY_bfd_debug_info_end -#define MY_bfd_debug_info_end _bfd_void_bfd -#endif -#ifndef MY_bfd_debug_info_accumulate -#define MY_bfd_debug_info_accumulate _bfd_void_bfd_asection -#endif - -#ifndef MY_core_file_failing_command -#define MY_core_file_failing_command NAME (aout, core_file_failing_command) -#endif -#ifndef MY_core_file_failing_signal -#define MY_core_file_failing_signal NAME (aout, core_file_failing_signal) -#endif -#ifndef MY_core_file_matches_executable_p -#define MY_core_file_matches_executable_p NAME (aout, core_file_matches_executable_p) -#endif -#ifndef MY_set_section_contents -#define MY_set_section_contents NAME (aout, set_section_contents) -#endif -#ifndef MY_get_section_contents -#define MY_get_section_contents aout_32_get_section_contents -#endif -#ifndef MY_get_section_contents_in_window -#define MY_get_section_contents_in_window _bfd_generic_get_section_contents_in_window -#endif -#ifndef MY_new_section_hook -#define MY_new_section_hook NAME (aout, new_section_hook) -#endif -#ifndef MY_get_symtab_upper_bound -#define MY_get_symtab_upper_bound NAME (aout, get_symtab_upper_bound) -#endif -#ifndef MY_canonicalize_symtab -#define MY_canonicalize_symtab NAME (aout, canonicalize_symtab) -#endif -#ifndef MY_get_reloc_upper_bound -#define MY_get_reloc_upper_bound NAME (aout, get_reloc_upper_bound) -#endif -#ifndef MY_canonicalize_reloc -#define MY_canonicalize_reloc NAME (aout, canonicalize_reloc) -#endif -#ifndef MY_set_reloc -#define MY_set_reloc _bfd_generic_set_reloc -#endif -#ifndef MY_make_empty_symbol -#define MY_make_empty_symbol NAME (aout, make_empty_symbol) -#endif -#ifndef MY_print_symbol -#define MY_print_symbol NAME (aout, print_symbol) -#endif -#ifndef MY_get_symbol_info -#define MY_get_symbol_info NAME (aout, get_symbol_info) -#endif -#ifndef MY_get_symbol_version_string -#define MY_get_symbol_version_string \ - _bfd_nosymbols_get_symbol_version_string -#endif -#ifndef MY_get_lineno -#define MY_get_lineno NAME (aout, get_lineno) -#endif -#ifndef MY_set_arch_mach -#define MY_set_arch_mach tic30_aout_set_arch_mach -#endif -#ifndef MY_find_nearest_line -#define MY_find_nearest_line NAME (aout, find_nearest_line) -#endif -#ifndef MY_find_line -#define MY_find_line _bfd_nosymbols_find_line -#endif -#ifndef MY_find_inliner_info -#define MY_find_inliner_info _bfd_nosymbols_find_inliner_info -#endif -#ifndef MY_sizeof_headers -#define MY_sizeof_headers NAME (aout, sizeof_headers) -#endif -#ifndef MY_bfd_get_relocated_section_contents -#define MY_bfd_get_relocated_section_contents \ - bfd_generic_get_relocated_section_contents -#endif -#ifndef MY_bfd_relax_section -#define MY_bfd_relax_section bfd_generic_relax_section -#endif -#ifndef MY_bfd_gc_sections -#define MY_bfd_gc_sections bfd_generic_gc_sections -#endif -#ifndef MY_bfd_lookup_section_flags -#define MY_bfd_lookup_section_flags bfd_generic_lookup_section_flags -#endif -#ifndef MY_bfd_merge_sections -#define MY_bfd_merge_sections bfd_generic_merge_sections -#endif -#ifndef MY_bfd_is_group_section -#define MY_bfd_is_group_section bfd_generic_is_group_section -#endif -#ifndef MY_bfd_group_name -#define MY_bfd_group_name bfd_generic_group_name -#endif -#ifndef MY_bfd_discard_group -#define MY_bfd_discard_group bfd_generic_discard_group -#endif -#ifndef MY_section_already_linked -#define MY_section_already_linked \ - _bfd_generic_section_already_linked -#endif -#ifndef MY_bfd_define_common_symbol -#define MY_bfd_define_common_symbol bfd_generic_define_common_symbol -#endif -#ifndef MY_bfd_link_hide_symbol -#define MY_bfd_link_hide_symbol _bfd_generic_link_hide_symbol -#endif -#ifndef MY_bfd_define_start_stop -#define MY_bfd_define_start_stop bfd_generic_define_start_stop -#endif -#ifndef MY_bfd_reloc_type_lookup -#define MY_bfd_reloc_type_lookup tic30_aout_reloc_type_lookup -#endif -#ifndef MY_bfd_reloc_name_lookup -#define MY_bfd_reloc_name_lookup tic30_aout_reloc_name_lookup -#endif -#ifndef MY_bfd_make_debug_symbol -#define MY_bfd_make_debug_symbol 0 -#endif -#ifndef MY_read_minisymbols -#define MY_read_minisymbols NAME (aout, read_minisymbols) -#endif -#ifndef MY_minisymbol_to_symbol -#define MY_minisymbol_to_symbol NAME (aout, minisymbol_to_symbol) -#endif -#ifndef MY_bfd_link_hash_table_create -#define MY_bfd_link_hash_table_create NAME (aout, link_hash_table_create) -#endif -#ifndef MY_bfd_link_add_symbols -#define MY_bfd_link_add_symbols NAME (aout, link_add_symbols) -#endif -#ifndef MY_bfd_link_just_syms -#define MY_bfd_link_just_syms _bfd_generic_link_just_syms -#endif -#ifndef MY_bfd_copy_link_hash_symbol_type -#define MY_bfd_copy_link_hash_symbol_type \ - _bfd_generic_copy_link_hash_symbol_type -#endif -#ifndef MY_bfd_link_split_section -#define MY_bfd_link_split_section _bfd_generic_link_split_section -#endif - -#ifndef MY_bfd_link_check_relocs -#define MY_bfd_link_check_relocs _bfd_generic_link_check_relocs -#endif - -#ifndef MY_bfd_copy_private_bfd_data -#define MY_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data -#endif - -#ifndef MY_bfd_merge_private_bfd_data -#define MY_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data -#endif - -#ifndef MY_bfd_copy_private_symbol_data -#define MY_bfd_copy_private_symbol_data _bfd_generic_bfd_copy_private_symbol_data -#endif - -#ifndef MY_bfd_copy_private_header_data -#define MY_bfd_copy_private_header_data _bfd_generic_bfd_copy_private_header_data -#endif - -#ifndef MY_bfd_print_private_bfd_data -#define MY_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data -#endif - -#ifndef MY_bfd_set_private_flags -#define MY_bfd_set_private_flags _bfd_generic_bfd_set_private_flags -#endif - -#ifndef MY_bfd_is_local_label_name -#define MY_bfd_is_local_label_name bfd_generic_is_local_label_name -#endif - -#ifndef MY_bfd_is_target_special_symbol -#define MY_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_false -#endif - -#ifndef MY_bfd_free_cached_info -#define MY_bfd_free_cached_info NAME (aout, bfd_free_cached_info) -#endif - -#ifndef MY_close_and_cleanup -#define MY_close_and_cleanup MY_bfd_free_cached_info -#endif - -#ifndef MY_get_dynamic_symtab_upper_bound -#define MY_get_dynamic_symtab_upper_bound \ - _bfd_nodynamic_get_dynamic_symtab_upper_bound -#endif -#ifndef MY_canonicalize_dynamic_symtab -#define MY_canonicalize_dynamic_symtab \ - _bfd_nodynamic_canonicalize_dynamic_symtab -#endif -#ifndef MY_get_synthetic_symtab -#define MY_get_synthetic_symtab \ - _bfd_nodynamic_get_synthetic_symtab -#endif -#ifndef MY_get_dynamic_reloc_upper_bound -#define MY_get_dynamic_reloc_upper_bound \ - _bfd_nodynamic_get_dynamic_reloc_upper_bound -#endif -#ifndef MY_canonicalize_dynamic_reloc -#define MY_canonicalize_dynamic_reloc \ - _bfd_nodynamic_canonicalize_dynamic_reloc -#endif - -/* Aout symbols normally have leading underscores. */ -#ifndef MY_symbol_leading_char -#define MY_symbol_leading_char '_' -#endif - -/* Aout archives normally use spaces for padding. */ -#ifndef AR_PAD_CHAR -#define AR_PAD_CHAR ' ' -#endif - -#ifndef MY_BFD_TARGET -const bfd_target tic30_aout_vec = -{ - TARGETNAME, /* Name. */ - bfd_target_aout_flavour, - BFD_ENDIAN_BIG, /* Target byte order (big). */ - BFD_ENDIAN_BIG, /* Target headers byte order (big). */ - (HAS_RELOC | /* Object flags. */ - HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED), - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* Section flags. */ - MY_symbol_leading_char, - AR_PAD_CHAR, /* AR_pad_char. */ - 15, /* AR_max_namelen. */ - 0, /* match priority. */ - bfd_getb64, bfd_getb_signed_64, bfd_putb64, - bfd_getb32, bfd_getb_signed_32, bfd_putb32, - bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Data. */ - bfd_getb64, bfd_getb_signed_64, bfd_putb64, - bfd_getb32, bfd_getb_signed_32, bfd_putb32, - bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Headers. */ - { /* bfd_check_format. */ - _bfd_dummy_target, - MY_object_p, - bfd_generic_archive_p, - MY_core_file_p - }, - { /* bfd_set_format. */ - _bfd_bool_bfd_false_error, - MY_mkobject, - _bfd_generic_mkarchive, - _bfd_bool_bfd_false_error - }, - { /* bfd_write_contents. */ - _bfd_bool_bfd_false_error, - MY_write_object_contents, - _bfd_write_archive_contents, - _bfd_bool_bfd_false_error - }, - - BFD_JUMP_TABLE_GENERIC (MY), - BFD_JUMP_TABLE_COPY (MY), - BFD_JUMP_TABLE_CORE (MY), - BFD_JUMP_TABLE_ARCHIVE (MY), - BFD_JUMP_TABLE_SYMBOLS (MY), - BFD_JUMP_TABLE_RELOCS (MY), - BFD_JUMP_TABLE_WRITE (MY), - BFD_JUMP_TABLE_LINK (MY), - BFD_JUMP_TABLE_DYNAMIC (MY), - - NULL, - - MY_backend_data -}; -#endif /* MY_BFD_TARGET */ diff --git a/bfd/config.bfd b/bfd/config.bfd index 231e6f155d5..e19e4b37487 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -414,9 +414,6 @@ case "${targ}" in targ_underscore=yes ;; - c30-*-*aout* | tic30-*-*aout*) - targ_defvec=tic30_aout_vec - ;; c30-*-*coff* | tic30-*-*coff*) targ_defvec=tic30_coff_vec ;; @@ -1388,6 +1385,10 @@ case "${targ}" in targ_selvecs="wasm_vec" ;; + xc16x-*-elf) + targ_defvec=xc16x_elf32_vec + ;; + xgate-*-*) targ_defvec=xgate_elf32_vec targ_selvecs="xgate_elf32_vec" @@ -1401,9 +1402,6 @@ case "${targ}" in targ_defvec=xtensa_elf32_le_vec targ_selvecs=xtensa_elf32_be_vec ;; - xc16x-*-elf) - targ_defvec=xc16x_elf32_vec - ;; z80-*-coff) targ_defvec=z80_coff_vec diff --git a/bfd/configure b/bfd/configure index 59b867bbbf5..492cbc338ad 100755 --- a/bfd/configure +++ b/bfd/configure @@ -14904,7 +14904,6 @@ do sparc_elf64_sol2_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;; spu_elf32_vec) tb="$tb elf32-spu.lo elf32.lo $elf" ;; sym_vec) tb="$tb xsym.lo" ;; - tic30_aout_vec) tb="$tb aout-tic30.lo" ;; tic30_coff_vec) tb="$tb coff-tic30.lo $coffgen" ;; tic4x_coff0_vec) tb="$tb coff-tic4x.lo $coffgen" ;; tic4x_coff0_beh_vec) tb="$tb coff-tic4x.lo $coffgen" ;; diff --git a/bfd/configure.ac b/bfd/configure.ac index 0528e54c3b0..755633bdd9c 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -640,7 +640,6 @@ do sparc_elf64_sol2_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;; spu_elf32_vec) tb="$tb elf32-spu.lo elf32.lo $elf" ;; sym_vec) tb="$tb xsym.lo" ;; - tic30_aout_vec) tb="$tb aout-tic30.lo" ;; tic30_coff_vec) tb="$tb coff-tic30.lo $coffgen" ;; tic4x_coff0_vec) tb="$tb coff-tic4x.lo $coffgen" ;; tic4x_coff0_beh_vec) tb="$tb coff-tic4x.lo $coffgen" ;; diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in index 2d0051498c3..1e12399903d 100644 --- a/bfd/po/SRC-POTFILES.in +++ b/bfd/po/SRC-POTFILES.in @@ -3,7 +3,6 @@ aix5ppc-core.c aout-cris.c aout-ns32k.c aout-target.h -aout-tic30.c aout32.c aout64.c aoutx.h diff --git a/bfd/targets.c b/bfd/targets.c index e5fc71a206a..d95c0aaf3c3 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -883,7 +883,6 @@ extern const bfd_target sparc_elf64_fbsd_vec; extern const bfd_target sparc_elf64_sol2_vec; extern const bfd_target spu_elf32_vec; extern const bfd_target sym_vec; -extern const bfd_target tic30_aout_vec; extern const bfd_target tic30_coff_vec; extern const bfd_target tic4x_coff0_vec; extern const bfd_target tic4x_coff0_beh_vec; @@ -1301,7 +1300,6 @@ static const bfd_target * const _bfd_target_vector[] = &sym_vec, - &tic30_aout_vec, &tic30_coff_vec, &tic54x_coff0_beh_vec, &tic54x_coff0_vec, diff --git a/gas/ChangeLog b/gas/ChangeLog index b19576d027a..ef4eb8fec33 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2020-06-16 Alan Modra + + * config/tc-tic30.h: Remove OBJ_AOUT support. + * configure.tgt: Delete tic30-*-*aout* entry. + 2020-06-15 Max Filippov * config/tc-xtensa.c (XTHAL_ABI_WINDOWED, XTHAL_ABI_CALL0): New diff --git a/gas/config/tc-tic30.h b/gas/config/tc-tic30.h index 0f255ce0c58..879408e4cf2 100644 --- a/gas/config/tc-tic30.h +++ b/gas/config/tc-tic30.h @@ -24,10 +24,6 @@ #define TC_TIC30 1 -#ifdef OBJ_AOUT -#define TARGET_FORMAT "a.out-tic30" -#endif - #define TARGET_ARCH bfd_arch_tic30 #define TARGET_BYTES_BIG_ENDIAN 1 #define WORKING_DOT_WORD diff --git a/gas/configure.tgt b/gas/configure.tgt index 37224c5144b..6316593ebd6 100644 --- a/gas/configure.tgt +++ b/gas/configure.tgt @@ -397,7 +397,6 @@ case ${generic_target} in spu-*-elf) fmt=elf ;; - tic30-*-*aout*) fmt=aout bfd_gas=yes ;; tic30-*-*coff*) fmt=coff bfd_gas=yes ;; tic4x-*-* | c4x-*-*) fmt=coff bfd_gas=yes ;; tic54x-*-* | c54x*-*-*) fmt=coff bfd_gas=yes need_libm=yes;; diff --git a/ld/ChangeLog b/ld/ChangeLog index 73a99a061e7..7d19ced3b68 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,15 @@ +2020-06-16 Alan Modra + + * emulparams/tic30aout.sh: Delete file. + * scripttempl/tic30aout.sc: Delete file. + * Makefile.am: Remove etic30aout.c from ALL_EMULATION_SOURCES and + delete dependency. + * configure.tgt: Delete tic30-*-*aout* entry. + * testsuite/ld-scripts/sane1.d: Delete tic30-*-aout mention. + * testsuite/ld-scripts/segment-start.d: Likewise. + * Makefile.in: Regenerate. + * po/BLD-POTFILES.in: Regenerate. + 2020-06-15 Max Filippov * emultempl/xtensaelf.em (XSHAL_ABI): Remove macro definition. diff --git a/ld/Makefile.am b/ld/Makefile.am index e3ef6865c00..ffff427bfbf 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -374,7 +374,6 @@ ALL_EMULATION_SOURCES = \ eshlelf_nto.c \ eshlelf_vxworks.c \ eshpe.c \ - etic30aout.c \ etic30coff.c \ etic3xcoff.c \ etic3xcoff_onchip.c \ @@ -864,7 +863,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS) @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eshlelf_nto.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eshlelf_vxworks.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eshpe.Pc@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic30aout.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic30coff.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic3xcoff.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic3xcoff_onchip.Pc@am__quote@ diff --git a/ld/Makefile.in b/ld/Makefile.in index 2376bfcd8e2..99b66589d46 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -864,7 +864,6 @@ ALL_EMULATION_SOURCES = \ eshlelf_nto.c \ eshlelf_vxworks.c \ eshpe.c \ - etic30aout.c \ etic30coff.c \ etic3xcoff.c \ etic3xcoff_onchip.c \ @@ -1485,7 +1484,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eshlelf_nto.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eshlelf_vxworks.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eshpe.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic30aout.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic30coff.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic3xcoff.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic3xcoff_onchip.Po@am__quote@ @@ -2470,7 +2468,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS) @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eshlelf_nto.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eshlelf_vxworks.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eshpe.Pc@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic30aout.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic30coff.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic3xcoff.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic3xcoff_onchip.Pc@am__quote@ diff --git a/ld/configure.tgt b/ld/configure.tgt index c166da885b6..950fa321e28 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -881,9 +881,6 @@ sparc*-*-*) targ_emul=elf32_sparc ;; spu-*-elf*) targ_emul=elf32_spu ;; -tic30-*-*aout*) targ_emul=tic30aout - targ_extra_ofiles= - ;; tic30-*-*coff*) targ_emul=tic30coff targ_extra_ofiles= ;; diff --git a/ld/emulparams/tic30aout.sh b/ld/emulparams/tic30aout.sh deleted file mode 100644 index 2a4c13f598f..00000000000 --- a/ld/emulparams/tic30aout.sh +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_NAME=tic30aout -OUTPUT_FORMAT="a.out-tic30" -OUTPUT_ARCH="tms320c30" -TEXT_START_ADDR=0x0 -TARGET_PAGE_SIZE=128 -ARCH=tms320c30 -BIG=1 diff --git a/ld/po/BLD-POTFILES.in b/ld/po/BLD-POTFILES.in index 7c5f12e2ace..699d84ddd4e 100644 --- a/ld/po/BLD-POTFILES.in +++ b/ld/po/BLD-POTFILES.in @@ -287,7 +287,6 @@ eshlelf_nbsd.c eshlelf_nto.c eshlelf_vxworks.c eshpe.c -etic30aout.c etic30coff.c etic3xcoff.c etic3xcoff_onchip.c diff --git a/ld/scripttempl/tic30aout.sc b/ld/scripttempl/tic30aout.sc deleted file mode 100644 index f9c25c93abf..00000000000 --- a/ld/scripttempl/tic30aout.sc +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2014-2020 Free Software Foundation, Inc. -# -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. - -cat <