From 1594e052d4fec8690b6bfabd369bc030135eb91a Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 7 Jul 2018 21:23:53 +0930 Subject: [PATCH] xgate cleanup elf32-xgate.c contains many functions that are only stubs and elf32-xgate.h contains unused declarations. While this might be reasonable for the initial commit of a port with subsequent work fleshing out the stubs, xgate has only had two minor target specific patches since the initial commit over six years ago. The rest of the changes have been general maintenance work applied to all ELF targets, and some of this work could have been avoided if the stubs hadn't been there. So this patch removes all the stubs. I've kept the functionality of the old elf32_xgate_add_symbol_hook, implemented in elf32_xgate_backend_symbol_processing. Presumably, that's to set the symbol st_target_internal flag for use in elf32-m68hc1x.c:elf32_m68hc11_relocate_section. The empty elf32_xgate_relocate_section meant that xgate had no linker. Or at least, no linker relocation processing. Deleting the elf_backend_relocate_section define means the target will now use the generic linker reloc processing. How good that is will depend on the accuracy of the reloc howtos.. I haven't updated the ld testsuite to xfail tests expected to fail for generic elf targets. bfd/ * elf32-xgate.h: Delete. * elf32-xgate.c: Delete unnecessary forward declarations, add two that are now needed. (xgate_elf_bfd_link_hash_table_create) (xgate_elf_bfd_link_hash_table_free) (xgate_elf_set_mach_from_flags, struct xgate_scan_param) (stub_hash_newfunc, elf32_xgate_add_symbol_hook) (elf32_xgate_setup_section_lists, elf32_xgate_size_stubs) (elf32_xgate_build_stubs, elf32_xgate_check_relocs) (elf32_xgate_relocate_section, _bfd_xgate_elf_set_private_flags) (elf32_xgate_post_process_headers): Delete. (elf32_xgate_backend_symbol_processing): New function. (xgate_elf_ignore_reloc, xgate_elf_special_reloc) (_bfd_xgate_elf_print_private_bfd_data): Make static. (ELF_TARGET_ID, elf_info_to_howto, elf_backend_check_relocs) (elf_backend_relocate_section, elf_backend_object_p) (elf_backend_final_write_processing, elf_backend_can_gc_sections) (elf_backend_post_process_headers, elf_backend_add_symbol_hook) (bfd_elf32_bfd_link_hash_table_create) (bfd_elf32_bfd_set_private_flags) (xgate_stub_hash_lookup): Don't define. (elf_backend_symbol_processing): Define. * elf-bfd.h (elf_target_id): Delete XGATE_ELF_DATA. ld/ * emulparams/xgateelf.sh (TEMPLATE_NAME) Set to generic. (EXTRA_EM_FILE): Set to genelf. --- bfd/ChangeLog | 26 +++++ bfd/elf-bfd.h | 1 - bfd/elf32-xgate.c | 229 +++----------------------------------- bfd/elf32-xgate.h | 142 ----------------------- ld/ChangeLog | 5 + ld/emulparams/xgateelf.sh | 4 +- 6 files changed, 48 insertions(+), 359 deletions(-) delete mode 100644 bfd/elf32-xgate.h diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 7e8cf8caf98..b0671b3ccbb 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,29 @@ +2018-07-10 Alan Modra + + * elf32-xgate.h: Delete. + * elf32-xgate.c: Delete unnecessary forward declarations, add two + that are now needed. + (xgate_elf_bfd_link_hash_table_create) + (xgate_elf_bfd_link_hash_table_free) + (xgate_elf_set_mach_from_flags, struct xgate_scan_param) + (stub_hash_newfunc, elf32_xgate_add_symbol_hook) + (elf32_xgate_setup_section_lists, elf32_xgate_size_stubs) + (elf32_xgate_build_stubs, elf32_xgate_check_relocs) + (elf32_xgate_relocate_section, _bfd_xgate_elf_set_private_flags) + (elf32_xgate_post_process_headers): Delete. + (elf32_xgate_backend_symbol_processing): New function. + (xgate_elf_ignore_reloc, xgate_elf_special_reloc) + (_bfd_xgate_elf_print_private_bfd_data): Make static. + (ELF_TARGET_ID, elf_info_to_howto, elf_backend_check_relocs) + (elf_backend_relocate_section, elf_backend_object_p) + (elf_backend_final_write_processing, elf_backend_can_gc_sections) + (elf_backend_post_process_headers, elf_backend_add_symbol_hook) + (bfd_elf32_bfd_link_hash_table_create) + (bfd_elf32_bfd_set_private_flags) + (xgate_stub_hash_lookup): Don't define. + (elf_backend_symbol_processing): Define. + * elf-bfd.h (elf_target_id): Delete XGATE_ELF_DATA. + 2018-07-09 Maciej W. Rozycki * elfxx-mips.c (_bfd_mips_elf_adjust_dynamic_symbol): Don't set diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index 903dd9a4fa8..9453c324aed 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -515,7 +515,6 @@ enum elf_target_id TIC6X_ELF_DATA, X86_64_ELF_DATA, XTENSA_ELF_DATA, - XGATE_ELF_DATA, TILEGX_ELF_DATA, TILEPRO_ELF_DATA, RISCV_ELF_DATA, diff --git a/bfd/elf32-xgate.c b/bfd/elf32-xgate.c index a3675260f50..9866864a58f 100644 --- a/bfd/elf32-xgate.c +++ b/bfd/elf32-xgate.c @@ -24,25 +24,15 @@ #include "bfdlink.h" #include "libbfd.h" #include "elf-bfd.h" -#include "elf32-xgate.h" #include "elf/xgate.h" #include "opcode/xgate.h" #include "libiberty.h" -/* Relocation functions. */ -static reloc_howto_type * -bfd_elf32_bfd_reloc_type_lookup (bfd *, bfd_reloc_code_real_type); -static reloc_howto_type * -bfd_elf32_bfd_reloc_name_lookup (bfd *, const char *); -static bfd_boolean -xgate_info_to_howto_rel (bfd *, arelent *, Elf_Internal_Rela *); -static bfd_boolean -xgate_elf_set_mach_from_flags (bfd *); -static struct bfd_hash_entry * -stub_hash_newfunc (struct bfd_hash_entry *, struct bfd_hash_table *, - const char *); -static struct bfd_link_hash_table* -xgate_elf_bfd_link_hash_table_create (bfd *); +/* Forward declarations. */ +static bfd_reloc_status_type xgate_elf_ignore_reloc + (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); +static bfd_reloc_status_type xgate_elf_special_reloc + (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); /* Use REL instead of RELA to save space */ #define USE_REL 1 @@ -434,66 +424,6 @@ xgate_info_to_howto_rel (bfd *abfd, return TRUE; } -/* Destroy an XGATE ELF linker hash table. */ - -static void -xgate_elf_bfd_link_hash_table_free (bfd *obfd) -{ - struct xgate_elf_link_hash_table *ret = - (struct xgate_elf_link_hash_table *) obfd->link.hash; - - bfd_hash_table_free (ret->stub_hash_table); - free (ret->stub_hash_table); - _bfd_elf_link_hash_table_free (obfd); -} - -/* Create an XGATE ELF linker hash table. */ - -static struct bfd_link_hash_table* -xgate_elf_bfd_link_hash_table_create (bfd *abfd) -{ - struct xgate_elf_link_hash_table *ret; - bfd_size_type amt = sizeof(struct xgate_elf_link_hash_table); - - ret = (struct xgate_elf_link_hash_table *) bfd_zmalloc (amt); - if (ret == (struct xgate_elf_link_hash_table *) NULL) - return NULL; - - if (!_bfd_elf_link_hash_table_init (&ret->root, abfd, - _bfd_elf_link_hash_newfunc, sizeof(struct elf_link_hash_entry), - XGATE_ELF_DATA)) - { - free (ret); - return NULL; - } - - /* Init the stub hash table too. */ - amt = sizeof(struct bfd_hash_table); - ret->stub_hash_table = (struct bfd_hash_table*) bfd_zmalloc (amt); - if (ret->stub_hash_table == NULL) - { - _bfd_elf_link_hash_table_free (abfd); - return NULL; - } - - if (!bfd_hash_table_init (ret->stub_hash_table, stub_hash_newfunc, - sizeof(struct elf32_xgate_stub_hash_entry))) - { - free (ret->stub_hash_table); - _bfd_elf_link_hash_table_free (abfd); - return NULL; - } - ret->root.root.hash_table_free = xgate_elf_bfd_link_hash_table_free; - - return &ret->root.root; -} - -static bfd_boolean -xgate_elf_set_mach_from_flags (bfd *abfd ATTRIBUTE_UNUSED) -{ - return TRUE; -} - /* Specific sections: - The .page0 is a data section that is mapped in [0x0000..0x00FF]. Page0 accesses are faster on the M68HC12. @@ -511,91 +441,20 @@ static const struct bfd_elf_special_section elf32_xgate_special_sections[] = { NULL, 0, 0, 0, 0 } }; -struct xgate_scan_param -{ - struct xgate_page_info* pinfo; - bfd_boolean use_memory_banks; -}; - -/* Assorted hash table functions. */ +/* Hook called when reading symbols. */ -/* Initialize an entry in the stub hash table. */ - -static struct bfd_hash_entry * -stub_hash_newfunc (struct bfd_hash_entry *entry, - struct bfd_hash_table *table ATTRIBUTE_UNUSED, - const char *string ATTRIBUTE_UNUSED) -{ - return entry; -} - -/* Hook called by the linker routine which adds symbols from an object - file. */ - -bfd_boolean -elf32_xgate_add_symbol_hook (bfd *abfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info ATTRIBUTE_UNUSED, - Elf_Internal_Sym *sym, - const char **namep ATTRIBUTE_UNUSED, - flagword *flagsp ATTRIBUTE_UNUSED, - asection **secp ATTRIBUTE_UNUSED, - bfd_vma *valp ATTRIBUTE_UNUSED) -{ - /* For some reason the st_target_internal value is not retained - after xgate_frob_symbol is called, hence this temp hack. */ - sym->st_target_internal = 1; - return TRUE; -} - -/* External entry points for sizing and building linker stubs. */ - -/* Set up various things so that we can make a list of input sections - for each output section included in the link. Returns -1 on error, - 0 when no stubs will be needed, and 1 on success. */ - -int -elf32_xgate_setup_section_lists (bfd *output_bfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info ATTRIBUTE_UNUSED) -{ - return 1; -} - -/* Determine and set the size of the stub section for a final link. - The basic idea here is to examine all the relocations looking for - PC-relative calls to a target that is unreachable with any "9-bit PC-REL" - instruction. */ - -bfd_boolean -elf32_xgate_size_stubs (bfd *output_bfd ATTRIBUTE_UNUSED, - bfd *stub_bfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info ATTRIBUTE_UNUSED, - asection * (*add_stub_section) (const char*, asection*) ATTRIBUTE_UNUSED) -{ - return FALSE; -} - -/* Build all the stubs associated with the current output file. The - stubs are kept in a hash table attached to the main linker hash - table. This function is called via xgateelf_finish in the - linker. */ - -bfd_boolean -elf32_xgate_build_stubs (bfd *abfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info ATTRIBUTE_UNUSED) -{ - return TRUE; -} - -void -xgate_elf_get_bank_parameters (struct bfd_link_info *info ATTRIBUTE_UNUSED) +static void +elf32_xgate_backend_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED, + asymbol *sym) { - return; + /* Mark xgate symbols. */ + ((elf_symbol_type *) sym)->internal_elf_sym.st_target_internal = 1; } /* This function is used for relocs which are only used for relaxing, which the linker should otherwise ignore. */ -bfd_reloc_status_type +static bfd_reloc_status_type xgate_elf_ignore_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry, asymbol *symbol ATTRIBUTE_UNUSED, @@ -609,7 +468,7 @@ xgate_elf_ignore_reloc (bfd *abfd ATTRIBUTE_UNUSED, return bfd_reloc_ok; } -bfd_reloc_status_type +static bfd_reloc_status_type xgate_elf_special_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry ATTRIBUTE_UNUSED, asymbol *symbol ATTRIBUTE_UNUSED, @@ -621,44 +480,7 @@ xgate_elf_special_reloc (bfd *abfd ATTRIBUTE_UNUSED, abort (); } -/* Look through the relocs for a section during the first phase. - Since we don't do .gots or .plts, we just need to consider the - virtual table relocs for gc. */ - -bfd_boolean -elf32_xgate_check_relocs (bfd *abfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info ATTRIBUTE_UNUSED, - asection *sec ATTRIBUTE_UNUSED, - const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED) -{ - return TRUE; -} - -/* Relocate a XGATE/S12x ELF section. */ - -bfd_boolean -elf32_xgate_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info ATTRIBUTE_UNUSED, - bfd *input_bfd ATTRIBUTE_UNUSED, - asection *input_section ATTRIBUTE_UNUSED, - bfd_byte *contents ATTRIBUTE_UNUSED, - Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED, - Elf_Internal_Sym *local_syms ATTRIBUTE_UNUSED, - asection **local_sections ATTRIBUTE_UNUSED) -{ - return TRUE; -} - -/* Set and control ELF flags in ELF header. */ - -bfd_boolean -_bfd_xgate_elf_set_private_flags (bfd *abfd ATTRIBUTE_UNUSED, - flagword flags ATTRIBUTE_UNUSED) -{ - return TRUE; -} - -bfd_boolean +static bfd_boolean _bfd_xgate_elf_print_private_bfd_data (bfd *abfd, void *ptr) { FILE *file = (FILE *) ptr; @@ -689,38 +511,17 @@ _bfd_xgate_elf_print_private_bfd_data (bfd *abfd, void *ptr) return TRUE; } -void -elf32_xgate_post_process_headers (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *link_info ATTRIBUTE_UNUSED) -{ - -} - #define ELF_ARCH bfd_arch_xgate #define ELF_MACHINE_CODE EM_XGATE -#define ELF_TARGET_ID XGATE_ELF_DATA #define ELF_MAXPAGESIZE 0x1000 #define TARGET_BIG_SYM xgate_elf32_vec #define TARGET_BIG_NAME "elf32-xgate" -#define elf_info_to_howto NULL #define elf_info_to_howto_rel xgate_info_to_howto_rel -#define elf_backend_check_relocs elf32_xgate_check_relocs -#define elf_backend_relocate_section elf32_xgate_relocate_section -#define elf_backend_object_p xgate_elf_set_mach_from_flags -#define elf_backend_final_write_processing NULL -#define elf_backend_can_gc_sections 1 #define elf_backend_special_sections elf32_xgate_special_sections -#define elf_backend_post_process_headers elf32_xgate_post_process_headers -#define elf_backend_add_symbol_hook elf32_xgate_add_symbol_hook - -#define bfd_elf32_bfd_link_hash_table_create xgate_elf_bfd_link_hash_table_create -#define bfd_elf32_bfd_set_private_flags _bfd_xgate_elf_set_private_flags +#define elf_backend_symbol_processing elf32_xgate_backend_symbol_processing #define bfd_elf32_bfd_print_private_bfd_data _bfd_xgate_elf_print_private_bfd_data -#define xgate_stub_hash_lookup(table, string, create, copy) \ - ((struct elf32_xgate_stub_hash_entry *) \ - bfd_hash_lookup ((table), (string), (create), (copy))) - #include "elf32-target.h" diff --git a/bfd/elf32-xgate.h b/bfd/elf32-xgate.h deleted file mode 100644 index 99ab9a4935d..00000000000 --- a/bfd/elf32-xgate.h +++ /dev/null @@ -1,142 +0,0 @@ -/* Freescale XGATE-specific support for 32-bit ELF - Copyright (C) 2012-2018 Free Software Foundation, Inc. - - Contributed by Sean Keys (skeys@ipdatasys.com) - (Heavily copied from the HC11 port by Stephane Carrez (stcarrez@nerim.fr)) - - 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. */ - -#ifndef _ELF32_XGATE_H -#define _ELF32_XGATE_H - -#include "elf-bfd.h" -#include "bfdlink.h" -#include "elf/xgate.h" - -/* Set and control ELF flags in ELF header. */ -extern bfd_boolean _bfd_xgate_elf_set_private_flags (bfd*,flagword); -extern bfd_boolean _bfd_xgate_elf_print_private_bfd_data (bfd*, void*); - -struct elf32_xgate_stub_hash_entry -{ - /* Base hash table entry structure. */ - struct bfd_hash_entry root; - - /* The stub section. */ - asection *stub_sec; - - /* Offset within stub_sec of the beginning of this stub. */ - bfd_vma stub_offset; - - /* Given the symbol's value and its section we can determine its final - value when building the stubs (so the stub knows where to jump. */ - bfd_vma target_value; - asection *target_section; -}; - -struct xgate_page_info -{ - bfd_vma bank_virtual; - bfd_vma bank_physical; - bfd_vma bank_physical_end; - bfd_vma bank_mask; - bfd_vma bank_size; - int bank_shift; - int bank_param_initialized; - bfd_vma trampoline_addr; -}; - -struct xgate_elf_link_hash_table -{ - struct elf_link_hash_table root; - struct xgate_page_info pinfo; - - /* The stub hash table. */ - struct bfd_hash_table* stub_hash_table; - - /* Linker stub bfd. */ - bfd *stub_bfd; - - asection* stub_section; - asection* tramp_section; - - /* Linker call-backs. */ - asection * (*add_stub_section) (const char *, asection *); - - /* Assorted information used by elf32_hppa_size_stubs. */ - unsigned int bfd_count; - int top_index; - asection ** input_list; - - /* Small local sym cache. */ - struct sym_cache sym_cache; - - bfd_boolean (*size_one_stub) (struct bfd_hash_entry*, void*); - bfd_boolean (*build_one_stub) (struct bfd_hash_entry*, void*); -}; - -/* Get the XGate ELF linker hash table from a link_info structure. */ - -#define xgate_elf_hash_table(p) \ - ((struct xgate_elf_link_hash_table *) ((p)->hash)) - -/* Create a XGATE ELF linker hash table. */ - -extern struct xgate_elf_link_hash_table* xgate_elf_hash_table_create - (bfd *); - -extern void xgate_elf_get_bank_parameters (struct bfd_link_info *); - -/* Return 1 if the address is in banked memory. - This can be applied to a virtual address and to a physical address. */ -extern int xgate_addr_is_banked (struct xgate_page_info *, bfd_vma); - -/* Return the physical address seen by the processor, taking - into account banked memory. */ -extern bfd_vma xgate_phys_addr (struct xgate_page_info *, bfd_vma); - -/* Return the page number corresponding to an address in banked memory. */ -extern bfd_vma xgate_phys_page (struct xgate_page_info *, bfd_vma); - -bfd_reloc_status_type xgate_elf_ignore_reloc - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -bfd_reloc_status_type xgate_elf_special_reloc - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); - -bfd_boolean elf32_xgate_check_relocs - (bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *); -bfd_boolean elf32_xgate_relocate_section - (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, - Elf_Internal_Rela *, Elf_Internal_Sym *, asection **); - -bfd_boolean elf32_xgate_add_symbol_hook - (bfd *, struct bfd_link_info *, Elf_Internal_Sym *, const char **, - flagword *, asection **, bfd_vma *); - -/* Tweak the OSABI field of the elf header. */ -extern void elf32_xgate_post_process_headers (bfd *, struct bfd_link_info *); - -int elf32_xgate_setup_section_lists (bfd *, struct bfd_link_info *); - -bfd_boolean elf32_xgate_size_stubs - (bfd *, bfd *, struct bfd_link_info *, - asection * (*) (const char *, asection *)); - -bfd_boolean elf32_xgate_build_stubs (bfd * abfd, struct bfd_link_info *); - -#endif /* _ELF32_XGATE_H */ diff --git a/ld/ChangeLog b/ld/ChangeLog index c69964be3a4..7b1ed2d8978 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2018-07-10 Alan Modra + + * emulparams/xgateelf.sh (TEMPLATE_NAME) Set to generic. + (EXTRA_EM_FILE): Set to genelf. + 2018-07-10 Alan Modra * testsuite/ld-elf/attributes.d: Use xfail rather than notarget. diff --git a/ld/emulparams/xgateelf.sh b/ld/emulparams/xgateelf.sh index 1f9253e8055..fa2e60ae1c6 100644 --- a/ld/emulparams/xgateelf.sh +++ b/ld/emulparams/xgateelf.sh @@ -1,4 +1,6 @@ MACHINE= +TEMPLATE_NAME=generic +EXTRA_EM_FILE=genelf SCRIPT_NAME=elfxgate OUTPUT_FORMAT="elf32-xgate" ROM_START_ADDR=0x08000 @@ -14,5 +16,3 @@ ARCH=xgate MAXPAGESIZE=32 EMBEDDED=yes GENERIC_BOARD=no -TEMPLATE_NAME=elf32 -EXTRA_EM_FILE= -- 2.30.2