diff options
| author | Ian Lance Taylor <ian@airs.com> | 1994-10-17 18:27:40 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1994-10-17 18:27:40 +0000 |
| commit | 24f13b03316bafcc34781122bdc371c06e5224c7 (patch) | |
| tree | b0c224ccb45a561cbd60c3532d4a2517569775b4 /bfd | |
| parent | 5e643795a3cad22ba84a0b0a93b72061d6fc64c3 (diff) | |
| download | gdb-24f13b03316bafcc34781122bdc371c06e5224c7.zip gdb-24f13b03316bafcc34781122bdc371c06e5224c7.tar.gz gdb-24f13b03316bafcc34781122bdc371c06e5224c7.tar.bz2 | |
* elfcode.h (elf_swap_shdr_in): Use rawdata, not bfd_section.
Clear contents field.
(bfd_section_from_shdr): In SHT_STRTAB case, check bfd_section,
not rawdata. Don't set rawdata if e_shstrndx. Use bfd_section
rather than rawdata in commented out code. In SHT_REL[A] case,
don't bother to check elf_section_data of section returned by
section_from_elf_index.
(elf_fake_sections): Set bfd_section, not rawdata. Don't set
size.
(elf_map_symbols): Don't set elf_num_section_syms. Don't create
section symbols that already exist.
(assign_file_position_for_section): Use bfd_section, not rawdata.
(section_from_elf_index): Just check bfd_section field.
(elf_section_from_bfd_section): Likewise.
(elf_debug_section): Don't print rawdata, contents, or size.
(elf_link_add_object_symbols): Don't error out if
section_from_elf_index returns NULL.
(elf_bfd_final_link): Check return value from
section_from_elf_index against NULL, not bfd_is_abs_section.
(elf_link_input_bfd): Don't check section_from_elf_index return
value.
* libelf.h (struct elf_obj_tdata): Remove num_section_syms field.
(elf_num_section_syms): Don't define.
* elf.c (elf_get_str_section): Store section contents in contents
field rather than rawdata field.
(elf_string_from_elf_section): Likewise.
(_bfd_elf_make_section_from_shdr): Store BFD section pointer in
bfd_section field rather than rawdata field.
* elf32-hppa.c (elf32_hppa_read_symext_info): Use bfd_section
rather than rawdata.
(elf32_hppa_size_stubs): Likewise.
* elf32-mips.c (mips_elf_final_write_processing): Use bfd_section
rathern than rawdata.
(mips_elf_section_from_shdr): Likewise.
(mips_elf_section_processing): Likewise.
(mips_elf_section_from_bfd_section): Remove rawdata check.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 37 | ||||
| -rw-r--r-- | bfd/elf32-hppa.c | 3939 | ||||
| -rw-r--r-- | bfd/elf32-mips.c | 37 | ||||
| -rw-r--r-- | bfd/elfcode.h | 193 | ||||
| -rw-r--r-- | bfd/libelf.h | 2 |
5 files changed, 2116 insertions, 2092 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 0e705e6..dd1b230 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,42 @@ Mon Oct 17 11:38:16 1994 Ian Lance Taylor <ian@sanguine.cygnus.com> + * elfcode.h (elf_swap_shdr_in): Use rawdata, not bfd_section. + Clear contents field. + (bfd_section_from_shdr): In SHT_STRTAB case, check bfd_section, + not rawdata. Don't set rawdata if e_shstrndx. Use bfd_section + rather than rawdata in commented out code. In SHT_REL[A] case, + don't bother to check elf_section_data of section returned by + section_from_elf_index. + (elf_fake_sections): Set bfd_section, not rawdata. Don't set + size. + (elf_map_symbols): Don't set elf_num_section_syms. Don't create + section symbols that already exist. + (assign_file_position_for_section): Use bfd_section, not rawdata. + (section_from_elf_index): Just check bfd_section field. + (elf_section_from_bfd_section): Likewise. + (elf_debug_section): Don't print rawdata, contents, or size. + (elf_link_add_object_symbols): Don't error out if + section_from_elf_index returns NULL. + (elf_bfd_final_link): Check return value from + section_from_elf_index against NULL, not bfd_is_abs_section. + (elf_link_input_bfd): Don't check section_from_elf_index return + value. + * libelf.h (struct elf_obj_tdata): Remove num_section_syms field. + (elf_num_section_syms): Don't define. + * elf.c (elf_get_str_section): Store section contents in contents + field rather than rawdata field. + (elf_string_from_elf_section): Likewise. + (_bfd_elf_make_section_from_shdr): Store BFD section pointer in + bfd_section field rather than rawdata field. + * elf32-hppa.c (elf32_hppa_read_symext_info): Use bfd_section + rather than rawdata. + (elf32_hppa_size_stubs): Likewise. + * elf32-mips.c (mips_elf_final_write_processing): Use bfd_section + rathern than rawdata. + (mips_elf_section_from_shdr): Likewise. + (mips_elf_section_processing): Likewise. + (mips_elf_section_from_bfd_section): Remove rawdata check. + * srec.c (pass_over): Set the start address for S7, S8 or S9. Fri Oct 14 19:15:46 1994 Ken Raeburn <raeburn@cujo.cygnus.com> diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c index 407971f..fb112b3 100644 --- a/bfd/elf32-hppa.c +++ b/bfd/elf32-hppa.c @@ -25,257 +25,270 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "bfd.h" #include "sysdep.h" +#include "bfdlink.h" #include "libbfd.h" #include "obstack.h" -#include "bfdlink.h" #include "libelf.h" -/* Note there isn't much error handling code in here yet. Unexpected - conditions are handled by just calling abort. FIXME damnit! */ - -/* ELF32/HPPA relocation support - This file contains ELF32/HPPA relocation support as specified - in the Stratus FTX/Golf Object File Format (SED-1762) dated - November 19, 1992. */ +/* HPPA symbol table extension entry types */ +enum elf32_hppa_symextn_types +{ + PARISC_SXT_NULL, + PARISC_SXT_SYMNDX, + PARISC_SXT_ARG_RELOC, +}; -#include "elf32-hppa.h" -#include "aout/aout64.h" -#include "hppa_stubs.h" +/* These macros compose and decompose the value of a symextn entry: -/* The basic stub types supported. If/when shared libraries are - implemented some form of IMPORT and EXPORT stubs will be needed. */ -typedef enum + entry_type = ELF32_PARISC_SX_TYPE(word); + entry_value = ELF32_PARISC_SX_VAL(word); + word = ELF32_PARISC_SX_WORD(type,val); */ + +#define ELF32_PARISC_SX_TYPE(p) ((p) >> 24) +#define ELF32_PARISC_SX_VAL(p) ((p) & 0xFFFFFF) +#define ELF32_PARISC_SX_WORD(type,val) (((type) << 24) + (val & 0xFFFFFF)) + +/* The following was added facilitate implementation of the .hppa_symextn + section. This section is built after the symbol table is built in the + elf_write_object_contents routine (called from bfd_close). It is built + so late because it requires information that is not known until + the symbol and string table sections have been allocated, and + the symbol table has been built. */ + +#define SYMEXTN_SECTION_NAME ".PARISC.symext" + +/* FIXME. Are these external? (For example used by GAS?). If so the + names need to change to avoid namespace pollution, if not they should + be moved into elf32-hppa.c. */ +typedef unsigned long symext_entryS; +struct symext_chain + { + symext_entryS entry; + struct symext_chain *next; + }; + +typedef struct symext_chain symext_chainS; + +/* We use three different hash tables to hold information for + linking PA ELF objects. + + The first is the elf32_hppa_link_hash_table which is derived + from the standard ELF linker hash table. We use this as a place to + attach other hash tables and static information. + + The second is the stub hash table which is derived from the + base BFD hash table. The stub hash table holds the information + necessary to build the linker stubs during a link. + + The last hash table keeps track of argument location information needed + to build hash tables. Each function with nonzero argument location + bits will have an entry in this table. */ + +/* Hash table for linker stubs. */ + +struct elf32_hppa_stub_hash_entry +{ + /* Base hash table entry structure, we can get the name of the stub + (and thus know exactly what actions it performs) from the base + hash table entry. */ + struct bfd_hash_entry root; + + /* Offset of the beginning of this stub. */ + bfd_vma 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. */ + symvalue target_value; + asection *target_section; +}; + +struct elf32_hppa_stub_hash_table +{ + /* The hash table itself. */ + struct bfd_hash_table root; + + /* The stub BFD. */ + bfd *stub_bfd; + + /* Where to place the next stub. */ + bfd_byte *location; + + /* Current offset in the stub section. */ + unsigned int offset; + +}; + +/* Hash table for argument location information. */ + +struct elf32_hppa_args_hash_entry { - HPPA_STUB_ILLEGAL, - HPPA_STUB_ARG_RELOC, - HPPA_STUB_LONG_CALL, -} hppa_stub_type; + /* Base hash table entry structure. */ + struct bfd_hash_entry root; + + /* The argument location bits for this entry. */ + int arg_bits; +}; -/* This is a list of all the stubs for a particular BFD. */ +struct elf32_hppa_args_hash_table +{ + /* The hash table itself. */ + struct bfd_hash_table root; +}; -typedef struct elf32_hppa_stub_name_list_struct +struct elf32_hppa_link_hash_entry { - /* The symbol associated with this stub. */ - asymbol *sym; - /* Pointer to chain of all stub chains. */ - struct elf32_hppa_stub_description_struct *stub_desc; - /* Pointer to the stub contents (eg instructions). */ - int *stub_secp; - /* Size of this stub? (in what units? FIXME). */ - unsigned size; - /* Pointer to the next stub entry in the chain. */ - struct elf32_hppa_stub_name_list_struct *next; -} elf32_hppa_stub_name_list; - -/* This is a linked list in which each entry describes all the - linker stubs for a particular bfd. */ - -typedef struct elf32_hppa_stub_description_struct + struct elf_link_hash_entry root; +}; + +struct elf32_hppa_link_hash_table { - /* The next group of stubs. */ - struct elf32_hppa_stub_description_struct *next; - /* Used to identify this group of stubs as belonging - to a particular bfd. */ - bfd *this_bfd; - /* FIXME: The stub section for this group of stubs? Is - this redundant with stub_listP->sym->section? */ - asection *stub_sec; - /* FIXME: what the hell is this? */ - unsigned relocs_allocated_cnt; - /* The current real size of the stubs (in bytes?). */ - unsigned real_size; - /* How much space we have allocated for stubs (in bytes?). */ - unsigned allocated_size; - /* Pointer to the first available space for new stubs. */ - int *stub_secp; - /* Pointer to the beginning of the stubs. FIXME: Why an int * - above and a char * here? */ - char *stub_contents; - /* The list of stubs for this bfd. */ - elf32_hppa_stub_name_list *stub_listP; - /* I guess we just carry this around for fun. */ - struct bfd_link_info *link_info; -} elf32_hppa_stub_description; + /* The main hash table. */ + struct elf_link_hash_table root; + + /* The stub hash table. */ + struct elf32_hppa_stub_hash_table *stub_hash_table; + + /* The argument relocation bits hash table. */ + struct elf32_hppa_args_hash_table *args_hash_table; + + /* A count of the number of output symbols. */ + unsigned int output_symbol_count; + + /* Stuff so we can handle DP relative relocations. */ + long global_value; + int global_sym_defined; +}; + +typedef unsigned int symextn_entry; /* FIXME. */ #define ARGUMENTS 0 #define RETURN_VALUE 1 -/* The various argument relocations that may be performed. - Note GRX,GRY really means ARGX,ARGY. */ +/* The various argument relocations that may be performed. */ typedef enum { /* No relocation. */ - NO_ARG_RELOC, - /* Relocate 32 bits from general to FP register. */ - R_TO_FR, - /* Relocate 64 bits from arg0,arg1 to FParg1. */ - R01_TO_FR, - /* Relocate 64 bits from arg2,arg3 to FParg3. */ - R23_TO_FR, - /* Relocate 32 bits from FP to general register. */ - FR_TO_R, - /* Relocate 64 bits from FParg1 to arg0,arg1. */ - FR_TO_R01, - /* Relocate 64 bits from FParg3 to arg2,arg3. */ - FR_TO_R23, - /* Death. */ - ARG_RELOC_ERR, + NO, + /* Relocate 32 bits from GR to FP register. */ + GF, + /* Relocate 64 bits from a GR pair to FP pair. */ + GD, + /* Relocate 32 bits from FP to GR. */ + FG, + /* Relocate 64 bits from FP pair to GR pair. */ + DG, } arg_reloc_type; -/* Where (what register type) is an argument comming from? */ -typedef enum -{ - /* Not in a register. */ - AR_NO, - /* In a general argument register. */ - AR_GR, - /* In right half of a FP argument register. */ - AR_FR, - /* In upper (left) half of a FP argument register. */ - AR_FU, - /* In general argument register pair 0 (arg0, arg1). */ - AR_DBL01, - /* In general argument register pair 1 (arg2, arg3). */ - AR_DBL23, -} arg_location; - /* What is being relocated (eg which argument or the return value). */ typedef enum { - ARG0, ARG1, ARG2, ARG3, RETVAL, + ARG0, ARG1, ARG2, ARG3, RET, } arg_reloc_location; -/* Horizontal represents callee's argument location information, vertical - represents caller's argument location information. Value at a particular - X, Y location represents what (if any) argument relocation needs to - be performed to make caller and callee agree. */ -static CONST arg_reloc_type mismatches[6][6] = -{ - {NO_ARG_RELOC, NO_ARG_RELOC, NO_ARG_RELOC, NO_ARG_RELOC, - NO_ARG_RELOC, NO_ARG_RELOC}, - {NO_ARG_RELOC, NO_ARG_RELOC, R_TO_FR, ARG_RELOC_ERR, - R01_TO_FR, ARG_RELOC_ERR}, - {NO_ARG_RELOC, FR_TO_R, NO_ARG_RELOC, ARG_RELOC_ERR, - ARG_RELOC_ERR, ARG_RELOC_ERR}, - {ARG_RELOC_ERR, ARG_RELOC_ERR, ARG_RELOC_ERR, ARG_RELOC_ERR, - ARG_RELOC_ERR, ARG_RELOC_ERR}, - {NO_ARG_RELOC, FR_TO_R01, NO_ARG_RELOC, ARG_RELOC_ERR, - NO_ARG_RELOC, ARG_RELOC_ERR}, - {NO_ARG_RELOC, FR_TO_R23, NO_ARG_RELOC, ARG_RELOC_ERR, - ARG_RELOC_ERR, NO_ARG_RELOC}, -}; -/* Likewise for the return value. */ -static CONST arg_reloc_type retval_mismatches[6][6] = -{ - {NO_ARG_RELOC, NO_ARG_RELOC, NO_ARG_RELOC, NO_ARG_RELOC, - NO_ARG_RELOC, NO_ARG_RELOC}, - {NO_ARG_RELOC, NO_ARG_RELOC, FR_TO_R, ARG_RELOC_ERR, - FR_TO_R01, ARG_RELOC_ERR}, - {NO_ARG_RELOC, R_TO_FR, NO_ARG_RELOC, ARG_RELOC_ERR, - ARG_RELOC_ERR, ARG_RELOC_ERR}, - {ARG_RELOC_ERR, ARG_RELOC_ERR, ARG_RELOC_ERR, ARG_RELOC_ERR, - ARG_RELOC_ERR, ARG_RELOC_ERR}, - {NO_ARG_RELOC, R01_TO_FR, NO_ARG_RELOC, ARG_RELOC_ERR, - NO_ARG_RELOC, ARG_RELOC_ERR}, - {NO_ARG_RELOC, R23_TO_FR, NO_ARG_RELOC, ARG_RELOC_ERR, - ARG_RELOC_ERR, NO_ARG_RELOC}, -}; +/* ELF32/HPPA relocation support -/* Used for index mapping in symbol-extension sections. */ -struct elf32_hppa_symextn_map_struct -{ - int old_index; - bfd *bfd; - asymbol *sym; - int new_index; -}; + This file contains ELF32/HPPA relocation support as specified + in the Stratus FTX/Golf Object File Format (SED-1762) dated + February 1994. */ + +#include "elf32-hppa.h" +#include "hppa_stubs.h" static bfd_reloc_status_type hppa_elf_reloc PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); -static unsigned long hppa_elf_relocate_insn +static unsigned long hppa_elf_relocate_insn PARAMS ((bfd *, asection *, unsigned long, unsigned long, long, long, unsigned long, unsigned long, unsigned long)); -static long get_symbol_value PARAMS ((asymbol *)); - static bfd_reloc_status_type hppa_elf_reloc PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd*, char **)); static CONST reloc_howto_type * elf_hppa_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_real_type)); -static symext_entryS elf32_hppa_get_sym_extn PARAMS ((bfd *, asymbol *, int)); - -static elf32_hppa_stub_description * find_stubs PARAMS ((bfd *, asection *)); - -static elf32_hppa_stub_description * new_stub - PARAMS ((bfd *, asection *, struct bfd_link_info *)); - -static arg_reloc_type type_of_mismatch PARAMS ((int, int, int)); +static boolean elf32_hppa_set_section_contents + PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type)); -static elf32_hppa_stub_name_list * find_stub_by_name - PARAMS ((bfd *, asection *, char *)); +static void elf_info_to_howto + PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *)); -static elf32_hppa_stub_name_list * add_stub_by_name - PARAMS ((bfd *, asection *, asymbol *, struct bfd_link_info *)); +static boolean elf32_hppa_backend_symbol_table_processing + PARAMS ((bfd *, elf_symbol_type *, int)); -static void hppa_elf_stub_finish PARAMS ((bfd *)); +static void elf32_hppa_backend_begin_write_processing + PARAMS ((bfd *, struct bfd_link_info *)); -static void hppa_elf_stub_reloc - PARAMS ((elf32_hppa_stub_description *, bfd *, asymbol **, int, - elf32_hppa_reloc_type)); +static void elf32_hppa_backend_final_write_processing + PARAMS ((bfd *, boolean)); -static int hppa_elf_arg_reloc_needed_p - PARAMS ((bfd *, arelent *, arg_reloc_type [5], symext_entryS)); +static void add_entry_to_symext_chain + PARAMS ((bfd *, unsigned int, unsigned int, symext_chainS **, + symext_chainS **)); -static asymbol * hppa_elf_build_linker_stub - PARAMS ((bfd *, bfd *, struct bfd_link_info *, arelent *, - arg_reloc_type [5], int, unsigned *, hppa_stub_type)); +static void +elf_hppa_tc_make_sections PARAMS ((bfd *, symext_chainS *)); -static void hppa_elf_create_stub_sec - PARAMS ((bfd *, bfd *, asection **, struct bfd_link_info *)); +static boolean hppa_elf_is_local_label PARAMS ((bfd *, asymbol *)); -static int hppa_elf_long_branch_needed_p - PARAMS ((bfd *, asection *, arelent *, asymbol *, unsigned)); +static boolean elf32_hppa_add_symbol_hook + PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *, + const char **, flagword *, asection **, bfd_vma *)); -static boolean hppa_elf_set_section_contents - PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type)); +static bfd_reloc_status_type elf32_hppa_bfd_final_link_relocate + PARAMS ((const reloc_howto_type *, bfd *, bfd *, asection *, + bfd_byte *, bfd_vma, bfd_vma, bfd_vma, struct bfd_link_info *, + asection *, const char *, int)); -static void elf_info_to_howto - PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *)); +static struct bfd_link_hash_table *elf32_hppa_link_hash_table_create + PARAMS ((bfd *)); -static void elf32_hppa_backend_symbol_processing PARAMS ((bfd *, asymbol *)); +static struct bfd_hash_entry * +elf32_hppa_stub_hash_newfunc + PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *)); -static boolean elf32_hppa_backend_section_processing - PARAMS ((bfd *, Elf32_Internal_Shdr *)); +static struct bfd_hash_entry * +elf32_hppa_args_hash_newfunc + PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *)); -static boolean elf32_hppa_backend_symbol_table_processing - PARAMS ((bfd *, elf_symbol_type *, int)); +static boolean +elf32_hppa_relocate_section + PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, + bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **, + char *)); -static boolean elf32_hppa_backend_section_from_shdr - PARAMS ((bfd *, Elf32_Internal_Shdr *, char *)); +static boolean +elf32_hppa_stub_hash_table_init + PARAMS ((struct elf32_hppa_stub_hash_table *, bfd *, + struct bfd_hash_entry *(*) PARAMS ((struct bfd_hash_entry *, + struct bfd_hash_table *, + const char *)))); -static boolean elf32_hppa_backend_fake_sections - PARAMS ((bfd *, Elf_Internal_Shdr *, asection *)); +static boolean +elf32_hppa_build_one_stub PARAMS ((struct bfd_hash_entry *, PTR)); -static boolean elf32_hppa_backend_section_from_bfd_section - PARAMS ((bfd *, Elf32_Internal_Shdr *, asection *, int *)); +static boolean +elf32_hppa_read_symext_info + PARAMS ((bfd *, Elf_Internal_Shdr *, struct elf32_hppa_args_hash_table *, + Elf_Internal_Sym *, boolean, boolean)); -static void elf32_hppa_backend_begin_write_processing PARAMS ((bfd *)); +static unsigned int elf32_hppa_size_of_stub + PARAMS ((unsigned int, unsigned int, bfd_vma, bfd_vma, const char *)); -static void elf32_hppa_backend_final_write_processing PARAMS ((bfd *)); +static boolean elf32_hppa_arg_reloc_needed + PARAMS ((unsigned int, unsigned int, arg_reloc_type [])); -static void add_entry_to_symext_chain - PARAMS ((bfd *, elf_symbol_type *, int, symext_chainS **, symext_chainS **)); +static void elf32_hppa_name_of_stub + PARAMS ((unsigned int, unsigned int, bfd_vma, bfd_vma, char *)); -static void -elf_hppa_tc_make_sections PARAMS ((bfd *, symext_chainS *)); +static boolean elf32_hppa_size_symext PARAMS ((struct bfd_hash_entry *, PTR)); -static boolean hppa_elf_is_local_label PARAMS ((bfd *, asymbol *)); +static boolean elf32_hppa_link_output_symbol_hook + PARAMS ((bfd *, struct bfd_link_info *, const char *, + Elf_Internal_Sym *, asection *)); /* ELF/PA relocation howto entries. */ @@ -438,29 +451,231 @@ static reloc_howto_type elf_hppa_howto_table[ELF_HOWTO_TABLE_SIZE] = {R_PARISC_GLOB_DAT, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_GLOB_DAT"}, {R_PARISC_JMP_SLOT, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_JMP_SLOT"}, {R_PARISC_RELATIVE, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_RELATIVE"}, - {R_PARISC_STUB_CALL_17, 0, 0, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_STUB_CALL_17"}, {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont, NULL, "R_PARISC_UNIMPLEMENTED"}, }; +/* Where (what register type) is an argument comming from? */ +typedef enum +{ + AR_NO, + AR_GR, + AR_FR, + AR_FU, + AR_FPDBL1, + AR_FPDBL2, +} arg_location; + +/* Horizontal represents the callee's argument location information, + vertical represents caller's argument location information. Value at a + particular X,Y location represents what (if any) argument relocation + needs to be performed to make caller and callee agree. */ + +static CONST arg_reloc_type arg_mismatches[6][6] = +{ + {NO, NO, NO, NO, NO, NO}, + {NO, NO, GF, NO, GD, NO}, + {NO, FG, NO, NO, NO, NO}, + {NO, NO, NO, NO, NO, NO}, + {NO, DG, NO, NO, NO, NO}, + {NO, DG, NO, NO, NO, NO}, +}; + +/* Likewise, but reversed for the return value. */ +static CONST arg_reloc_type ret_mismatches[6][6] = +{ + {NO, NO, NO, NO, NO, NO}, + {NO, NO, FG, NO, DG, NO}, + {NO, GF, NO, NO, NO, NO}, + {NO, NO, NO, NO, NO, NO}, + {NO, GD, NO, NO, NO, NO}, + {NO, GD, NO, NO, NO, NO}, +}; + +/* Misc static crud for symbol extension records. */ static symext_chainS *symext_rootP; static symext_chainS *symext_lastP; static int symext_chain_size; -static long global_value; -static long GOT_value; -static asymbol *global_symbol; -static int global_sym_defined; + +/* FIXME: We should be able to try this static variable! */ static symext_entryS *symextn_contents; -static elf32_hppa_stub_description *elf_hppa_stub_rootP; -static boolean stubs_finished = false; -static struct elf32_hppa_symextn_map_struct *elf32_hppa_symextn_map; -static int elf32_hppa_symextn_map_size; -static char *linker_stubs = NULL; -static int linker_stubs_size = 0; -static int linker_stubs_max_size = 0; -#define STUB_ALLOC_INCR 100 -#define STUB_SYM_BUFFER_INC 5 + +/* For linker stub hash tables. */ +#define elf32_hppa_stub_hash_lookup(table, string, create, copy) \ + ((struct elf32_hppa_stub_hash_entry *) \ + bfd_hash_lookup (&(table)->root, (string), (create), (copy))) + +#define elf32_hppa_stub_hash_traverse(table, func, info) \ + (bfd_hash_traverse \ + (&(table)->root, \ + (boolean (*) PARAMS ((struct bfd_hash_entry *, PTR))) (func), \ + (info))) + +/* For linker args hash tables. */ +#define elf32_hppa_args_hash_lookup(table, string, create, copy) \ + ((struct elf32_hppa_args_hash_entry *) \ + bfd_hash_lookup (&(table)->root, (string), (create), (copy))) + +#define elf32_hppa_args_hash_traverse(table, func, info) \ + (bfd_hash_traverse \ + (&(table)->root, \ + (boolean (*) PARAMS ((struct bfd_hash_entry *, PTR))) (func), \ + (info))) + +#define elf32_hppa_args_hash_table_init(table, newfunc) \ + (bfd_hash_table_init \ + (&(table)->root, \ + (struct bfd_hash_entry *(*) PARAMS ((struct bfd_hash_entry *, \ + struct bfd_hash_table *, \ + const char *))) (newfunc))) + +/* For HPPA linker hash table. */ + +#define elf32_hppa_link_hash_lookup(table, string, create, copy, follow)\ + ((struct elf32_hppa_link_hash_entry *) \ + elf_link_hash_lookup (&(table)->root, (string), (create), \ + (copy), (follow))) + +#define elf32_hppa_link_hash_traverse(table, func, info) \ + (elf_link_hash_traverse \ + (&(table)->root, \ + (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \ + (info))) + +/* Get the PA ELF linker hash table from a link_info structure. */ + +#define elf32_hppa_hash_table(p) \ + ((struct elf32_hppa_link_hash_table *) ((p)->hash)) + + +/* Extract specific argument location bits for WHICH from + the full argument location in AR. */ +#define EXTRACT_ARBITS(ar, which) ((ar) >> (8 - ((which) * 2))) & 3 + +/* Assorted hash table functions. */ + +/* Initialize an entry in the stub hash table. */ + +static struct bfd_hash_entry * +elf32_hppa_stub_hash_newfunc (entry, table, string) + struct bfd_hash_entry *entry; + struct bfd_hash_table *table; + const char *string; +{ + struct elf32_hppa_stub_hash_entry *ret; + + ret = (struct elf32_hppa_stub_hash_entry *) entry; + + /* Allocate the structure if it has not already been allocated by a + subclass. */ + if (ret == NULL) + ret = ((struct elf32_hppa_stub_hash_entry *) + bfd_hash_allocate (table, + sizeof (struct elf32_hppa_stub_hash_entry))); + if (ret == NULL) + { + bfd_set_error (bfd_error_no_memory); + return NULL; + } + + /* Call the allocation method of the superclass. */ + ret = ((struct elf32_hppa_stub_hash_entry *) + bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string)); + + if (ret) + { + /* Initialize the local fields. */ + ret->offset = 0; + ret->target_value = 0; + ret->target_section = NULL; + } + + return (struct bfd_hash_entry *) ret; +} + +/* Initialize a stub hash table. */ + +static boolean +elf32_hppa_stub_hash_table_init (table, stub_bfd, newfunc) + struct elf32_hppa_stub_hash_table *table; + bfd *stub_bfd; + struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *, + struct bfd_hash_table *, + const char *)); +{ + table->offset = 0; + table->location = 0; + table->stub_bfd = stub_bfd; + return (bfd_hash_table_init (&table->root, newfunc)); +} + +/* Initialize an entry in the argument location hash table. */ + +static struct bfd_hash_entry * +elf32_hppa_args_hash_newfunc (entry, table, string) + struct bfd_hash_entry *entry; + struct bfd_hash_table *table; + const char *string; +{ + struct elf32_hppa_args_hash_entry *ret; + + ret = (struct elf32_hppa_args_hash_entry *) entry; + + /* Allocate the structure if it has not already been allocated by a + subclass. */ + if (ret == NULL) + ret = ((struct elf32_hppa_args_hash_entry *) + bfd_hash_allocate (table, + sizeof (struct elf32_hppa_args_hash_entry))); + if (ret == NULL) + { + bfd_set_error (bfd_error_no_memory); + return NULL; + } + + /* Call the allocation method of the superclass. */ + ret = ((struct elf32_hppa_args_hash_entry *) + bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string)); + + /* Initialize the local fields. */ + if (ret) + ret->arg_bits = 0; + + return (struct bfd_hash_entry *) ret; +} + +/* Create the derived linker hash table. The PA ELF port uses the derived + hash table to keep information specific to the PA ELF linker (without + using static variables). */ + +static struct bfd_link_hash_table * +elf32_hppa_link_hash_table_create (abfd) + bfd *abfd; +{ + struct elf32_hppa_link_hash_table *ret; + + ret = ((struct elf32_hppa_link_hash_table *) + bfd_alloc (abfd, sizeof (struct elf32_hppa_link_hash_table))); + if (ret == NULL) + { + bfd_set_error (bfd_error_no_memory); + return NULL; + } + if (!_bfd_elf_link_hash_table_init (&ret->root, abfd, + _bfd_elf_link_hash_newfunc)) + { + bfd_release (abfd, ret); + return NULL; + } + ret->stub_hash_table = NULL; + ret->args_hash_table = NULL; + ret->output_symbol_count = 0; + ret->global_value = 0; + ret->global_sym_defined = 0; + + return &ret->root.root; +} /* Relocate the given INSN given the various input parameters. @@ -481,7 +696,6 @@ hppa_elf_relocate_insn (abfd, input_sect, insn, address, sym_value, { unsigned char opcode = get_opcode (insn); long constant_value; - unsigned arg_reloc; switch (opcode) { @@ -511,8 +725,6 @@ hppa_elf_relocate_insn (abfd, input_sect, insn, address, sym_value, case BL: case BE: case BLE: - arg_reloc = HPPA_R_ARG_RELOC (r_addend); - /* XXX computing constant_value is not needed??? */ constant_value = assemble_17 ((insn & 0x001f0000) >> 16, (insn & 0x00001ffc) >> 2, @@ -546,18 +758,175 @@ hppa_elf_relocate_insn (abfd, input_sect, insn, address, sym_value, } } -/* Return the relocated value of the given symbol. */ +/* Relocate an HPPA ELF section. */ -static long -get_symbol_value (symbol) - asymbol *symbol; +static boolean +elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section, + contents, relocs, local_syms, local_sections, + output_names) + bfd *output_bfd; + struct bfd_link_info *info; + bfd *input_bfd; + asection *input_section; + bfd_byte *contents; + Elf_Internal_Rela *relocs; + Elf_Internal_Sym *local_syms; + asection **local_sections; + char *output_names; { - if (symbol == NULL - || symbol->section == &bfd_com_section) - return 0; - else - return symbol->value + symbol->section->output_section->vma - + symbol->section->output_offset; + Elf_Internal_Shdr *symtab_hdr; + Elf_Internal_Rela *rel; + Elf_Internal_Rela *relend; + + symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; + + rel = relocs; + relend = relocs + input_section->reloc_count; + for (; rel < relend; rel++) + { + int r_type; + const reloc_howto_type *howto; + long r_symndx; + struct elf_link_hash_entry *h; + Elf_Internal_Sym *sym; + asection *sym_sec; + bfd_vma relocation; + bfd_reloc_status_type r; + const char *sym_name; + + r_type = ELF32_R_TYPE (rel->r_info); + if (r_type < 0 || r_type >= (int) R_PARISC_UNIMPLEMENTED) + { + bfd_set_error (bfd_error_bad_value); + return false; + } + howto = elf_hppa_howto_table + r_type; + + r_symndx = ELF32_R_SYM (rel->r_info); + + if (info->relocateable) + { + /* This is a relocateable link. We don't have to change + anything, unless the reloc is against a section symbol, + in which case we have to adjust according to where the + section symbol winds up in the output section. */ + if (r_symndx < symtab_hdr->sh_info) + { + sym = local_syms + r_symndx; + if (ELF_ST_TYPE (sym->st_info) == STT_SECTION) + { + sym_sec = local_sections[r_symndx]; + rel->r_addend += sym_sec->output_offset; + } + } + + continue; + } + + /* This is a final link. */ + h = NULL; + sym = NULL; + sym_sec = NULL; + if (r_symndx < symtab_hdr->sh_info) + { + sym = local_syms + r_symndx; + sym_sec = local_sections[r_symndx]; + relocation = ((ELF_ST_TYPE (sym->st_info) == STT_SECTION + ? 0 : sym->st_value) + + sym_sec->output_offset + + sym_sec->output_section->vma); + } + else + { + long indx; + + indx = r_symndx - symtab_hdr->sh_info; + h = elf_sym_hashes (input_bfd)[indx]; + if (h->root.type == bfd_link_hash_defined) + { + sym_sec = h->root.u.def.section; + relocation = (h->root.u.def.value + + sym_sec->output_offset + + sym_sec->output_section->vma); + } + else if (h->root.type == bfd_link_hash_weak) + relocation = 0; + else + { + if (!((*info->callbacks->undefined_symbol) + (info, h->root.root.string, input_bfd, + input_section, rel->r_offset))) + return false; + relocation = 0; + } + } + + if (h != NULL) + sym_name = h->root.root.string; + else + { + sym_name = output_names + sym->st_name; + if (sym_name == NULL) + return false; + if (*sym_name == '\0') + sym_name = bfd_section_name (input_bfd, sym_sec); + } + + /* If args_hash_table is NULL, then we have encountered some + kind of link error (ex. undefined symbols). Do not try to + apply any relocations, continue the loop so we can notify + the user of several errors in a single attempted link. */ + if (elf32_hppa_hash_table (info)->args_hash_table == NULL) + continue; + + r = elf32_hppa_bfd_final_link_relocate (howto, input_bfd, output_bfd, + input_section, contents, + rel->r_offset, relocation, + rel->r_addend, info, sym_sec, + sym_name, h == NULL); + + if (r != bfd_reloc_ok) + { + switch (r) + { + case bfd_reloc_dangerous: + { + /* We use this return value to indicate that we performed + a "dangerous" relocation. This doesn't mean we did + the wrong thing, it just means there may be some cleanup + that needs to be done here. + + In particular we had to swap the last call insn and its + delay slot. If the delay slot insn needed a relocation, + then we'll need to adjust the next relocation entry's + offset to account for the fact that the insn moved. + + This hair wouldn't be necessary if we inserted stubs + between procedures and used a "bl" to get to the stub. */ + if (rel != relend) + { + Elf_Internal_Rela *next_rel = rel + 1; + + if (rel->r_offset + 4 == next_rel->r_offset) + next_rel->r_offset -= 4; + } + break; + } + default: + case bfd_reloc_outofrange: + case bfd_reloc_overflow: + { + if (!((*info->callbacks->reloc_overflow) + (info, sym_name, howto->name, (bfd_vma) 0, + input_bfd, input_section, rel->r_offset))) + return false; + } + break; + } + } + } + + return true; } /* Return one (or more) BFD relocations which implement the base @@ -576,12 +945,14 @@ hppa_elf_gen_reloc_type (abfd, base_type, format, field) /* Allocate slots for the BFD relocation. */ final_types = (elf32_hppa_reloc_type **) bfd_alloc_by_size_t (abfd, sizeof (elf32_hppa_reloc_type *) * 2); - BFD_ASSERT (final_types != 0); /* FIXME */ + if (final_types == NULL) + return NULL; /* Allocate space for the relocation itself. */ finaltype = (elf32_hppa_reloc_type *) bfd_alloc_by_size_t (abfd, sizeof (elf32_hppa_reloc_type)); - BFD_ASSERT (finaltype != 0); /* FIXME */ + if (finaltype == NULL) + return NULL; /* Some reasonable defaults. */ final_types[0] = finaltype; @@ -597,6 +968,7 @@ hppa_elf_gen_reloc_type (abfd, base_type, format, field) switch (base_type) { case R_HPPA: + case R_HPPA_ABS_CALL: switch (format) { case 14: @@ -616,8 +988,7 @@ hppa_elf_gen_reloc_type (abfd, base_type, format, field) final_type = R_PARISC_PLABEL14R; break; default: - abort (); - break; + return NULL; } break; @@ -632,8 +1003,7 @@ hppa_elf_gen_reloc_type (abfd, base_type, format, field) final_type = R_PARISC_DIR17R; break; default: - abort (); - break; + return NULL; } break; @@ -651,8 +1021,7 @@ hppa_elf_gen_reloc_type (abfd, base_type, format, field) final_type = R_PARISC_PLABEL21L; break; default: - abort (); - break; + return NULL; } break; @@ -666,14 +1035,12 @@ hppa_elf_gen_reloc_type (abfd, base_type, format, field) final_type = R_PARISC_PLABEL32; break; default: - abort (); - break; + return NULL; } break; default: - abort (); - break; + return NULL; } break; @@ -692,8 +1059,7 @@ hppa_elf_gen_reloc_type (abfd, base_type, format, field) final_type = R_PARISC_DPREL14F; break; default: - abort (); - break; + return NULL; } break; @@ -705,14 +1071,12 @@ hppa_elf_gen_reloc_type (abfd, base_type, format, field) final_type = R_PARISC_DPREL21L; break; default: - abort (); - break; + return NULL; } break; default: - abort (); - break; + return NULL; } break; @@ -731,8 +1095,7 @@ hppa_elf_gen_reloc_type (abfd, base_type, format, field) final_type = R_PARISC_PCREL14F; break; default: - abort (); - break; + return NULL; } break; @@ -747,8 +1110,7 @@ hppa_elf_gen_reloc_type (abfd, base_type, format, field) final_type = R_PARISC_PCREL17F; break; default: - abort (); - break; + return NULL; } break; @@ -760,20 +1122,17 @@ hppa_elf_gen_reloc_type (abfd, base_type, format, field) final_type = R_PARISC_PCREL21L; break; default: - abort (); - break; + return NULL; } break; default: - abort (); - break; + return NULL; } break; default: - abort (); - break; + return NULL; } return final_types; @@ -781,8 +1140,41 @@ hppa_elf_gen_reloc_type (abfd, base_type, format, field) #undef final_type +/* Set the contents of a particular section at a particular location. */ -/* Actually perform a relocation. */ +static boolean +elf32_hppa_set_section_contents (abfd, section, location, offset, count) + bfd *abfd; + sec_ptr section; + PTR location; + file_ptr offset; + bfd_size_type count; +{ + /* Ignore write requests for the symbol extension section until we've + had the chance to rebuild it ourselves. */ + if (!strcmp (section->name, ".PARISC.symextn") && !symext_chain_size) + return true; + else + return bfd_elf32_set_section_contents (abfd, section, location, + offset, count); +} + +/* Translate from an elf into field into a howto relocation pointer. */ + +static void +elf_info_to_howto (abfd, cache_ptr, dst) + bfd *abfd; + arelent *cache_ptr; + Elf32_Internal_Rela *dst; +{ + BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_PARISC_UNIMPLEMENTED); + cache_ptr->howto = &elf_hppa_howto_table[ELF32_R_TYPE (dst->r_info)]; +} + + +/* Actually perform a relocation. NOTE this is (mostly) superceeded + by elf32_hppa_bfd_final_link_relocate which is called by the new + fast linker. */ static bfd_reloc_status_type hppa_elf_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd, @@ -795,17 +1187,8 @@ hppa_elf_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd, bfd *output_bfd; char **error_message; { - unsigned long insn; - long sym_value = 0; - unsigned long addr = reloc_entry->address; - bfd_byte *hit_data = addr + (bfd_byte *) data; - unsigned long r_type = reloc_entry->howto->type; - unsigned long r_field = e_fsel; - boolean r_pcrel = reloc_entry->howto->pc_relative; - unsigned r_format = reloc_entry->howto->bitsize; - long r_addend = reloc_entry->addend; - - /* If only performing a partial link, get out early. */ + /* It is no longer valid to call hppa_elf_reloc when creating + a final executable. */ if (output_bfd) { reloc_entry->address += input_section->output_offset; @@ -817,36 +1200,63 @@ hppa_elf_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd, reloc_entry->addend += symbol_in->section->output_offset; return bfd_reloc_ok; } + else + { + *error_message = (char *) "Unsupported call to hppa_elf_reloc"; + return bfd_reloc_notsupported; + } +} - /* If performing final link and the symbol we're relocating against - is undefined, then return an error. */ - if (symbol_in && symbol_in->section == &bfd_und_section) - return bfd_reloc_undefined; +/* Actually perform a relocation as part of a final link. This can get + rather hairy when linker stubs are needed. */ - /* Get the final relocated value. */ - sym_value = get_symbol_value (symbol_in); +static bfd_reloc_status_type +elf32_hppa_bfd_final_link_relocate (howto, input_bfd, output_bfd, + input_section, contents, offset, value, + addend, info, sym_sec, sym_name, is_local) + const reloc_howto_type *howto; + bfd *input_bfd; + bfd *output_bfd; + asection *input_section; + bfd_byte *contents; + bfd_vma offset; + bfd_vma value; + bfd_vma addend; + struct bfd_link_info *info; + asection *sym_sec; + const char *sym_name; + int is_local; +{ + unsigned long insn; + unsigned long r_type = howto->type; + unsigned long r_format = howto->bitsize; + unsigned long r_field = e_fsel; + bfd_byte *hit_data = contents + offset + input_section->vma; + boolean r_pcrel = howto->pc_relative; - /* Compute the value of $global$. - FIXME: None of this should be necessary. $global$ is just a - marker and shouldn't really figure into these computations. + insn = bfd_get_32 (input_bfd, hit_data); - Once that's fixed we'll need to teach this backend to change - DP-relative relocations involving symbols in the text section - to be simple absolute relocations. */ - if (!global_sym_defined) + /* Make sure we have a value for $global$. FIXME isn't this effectively + just like the gp pointer on MIPS? Can we use those routines for this + purpose? */ + if (!elf32_hppa_hash_table (info)->global_sym_defined) { - if (global_symbol) - { - global_value = (global_symbol->value - + global_symbol->section->output_section->vma - + global_symbol->section->output_offset); - GOT_value = global_value; - global_sym_defined++; - } - } + struct elf_link_hash_entry *h; + asection *sec; + + h = elf_link_hash_lookup (elf_hash_table (info), "$global$", false, + false, false); - /* Get the instruction word. */ - insn = bfd_get_32 (abfd, hit_data); + /* If there isn't a $global$, then we're in deep trouble. */ + if (h == NULL) + return bfd_reloc_notsupported; + + sec = h->root.u.def.section; + elf32_hppa_hash_table (info)->global_value = (h->root.u.def.value + + sec->vma + + sec->output_offset); + elf32_hppa_hash_table (info)->global_sym_defined = 1; + } switch (r_type) { @@ -855,214 +1265,259 @@ hppa_elf_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd, case R_PARISC_DIR32: case R_PARISC_DIR17F: - case R_PARISC_PCREL17F: case R_PARISC_PCREL17C: - case R_PARISC_PLABEL32: - case R_PARISC_PCREL14F: r_field = e_fsel; goto do_basic_type_1; case R_PARISC_DIR21L: case R_PARISC_PCREL21L: - case R_PARISC_PLABEL21L: r_field = e_lrsel; goto do_basic_type_1; case R_PARISC_DIR17R: case R_PARISC_PCREL17R: case R_PARISC_DIR14R: case R_PARISC_PCREL14R: - case R_PARISC_PLABEL14R: r_field = e_rrsel; goto do_basic_type_1; + /* For all the DP relative relocations, we need to examine the symbol's + section. If it's a code section, then "data pointer relative" makes + no sense. In that case we don't adjust the "value", and for 21 bit + addil instructions, we change the source addend register from %dp to + %r0. */ case R_PARISC_DPREL21L: r_field = e_lrsel; - sym_value -= GOT_value; + if (sym_sec->flags & SEC_CODE) + insn &= ~0x03e00000; + else + value -= elf32_hppa_hash_table (info)->global_value; goto do_basic_type_1; case R_PARISC_DPREL14R: r_field = e_rrsel; - sym_value -= GOT_value; + if ((sym_sec->flags & SEC_CODE) == 0) + value -= elf32_hppa_hash_table (info)->global_value; goto do_basic_type_1; case R_PARISC_DPREL14F: r_field = e_fsel; - sym_value -= GOT_value; + if ((sym_sec->flags & SEC_CODE) == 0) + value -= elf32_hppa_hash_table (info)->global_value; goto do_basic_type_1; + /* These cases are separate as they may involve a lot more work + to deal with linker stubs. */ + case R_PARISC_PLABEL32: + case R_PARISC_PLABEL21L: + case R_PARISC_PLABEL14R: + case R_PARISC_PCREL17F: + { + bfd_vma location; + unsigned int len, caller_args, callee_args; + arg_reloc_type arg_reloc_types[5]; + struct elf32_hppa_args_hash_table *args_hash_table; + struct elf32_hppa_args_hash_entry *args_hash; + char *new_name, *stub_name; + + /* Get the field selector right. We'll need it in a minute. */ + if (r_type == R_PARISC_PCREL17F + || r_type == R_PARISC_PLABEL32) + r_field = e_fsel; + else if (r_type == R_PARISC_PLABEL21L) + r_field = e_lrsel; + else if (r_type == R_PARISC_PLABEL14R) + r_field = e_rrsel; + + /* Find out where we are and where we're going. */ + location = (offset + + input_section->output_offset + + input_section->output_section->vma); + + /* Now look for the argument relocation bits associated with the + target. */ + len = strlen (sym_name) + 1; + if (is_local) + len += 9; + new_name = malloc (len); + if (!new_name) + { + bfd_set_error (bfd_error_no_memory); + return bfd_reloc_notsupported; + } + strcpy (new_name, sym_name); -do_basic_type_1: - insn = hppa_elf_relocate_insn (abfd, input_section, insn, addr, - sym_value, r_addend, r_format, - r_field, r_pcrel); - break; + /* Local symbols have unique IDs. */ + if (is_local) + sprintf (new_name + len - 10, "_%08x", (int)sym_sec); + args_hash_table = elf32_hppa_hash_table (info)->args_hash_table; - /* This is a linker internal relocation. */ - case R_PARISC_STUB_CALL_17: - /* This relocation is for a branch to a long branch stub. - Change instruction to a BLE,N. It may also be necessary - to interchange the branch and its delay slot. - The original instruction stream is - - bl <foo>,r ; call foo using register r as - ; the return pointer - XXX ; delay slot instruction - - The new instruction stream will be: - - XXX ; delay slot instruction - ble <foo_stub> ; call the long call stub for foo - ; using r31 as the return pointer - - This braindamage is necessary because the compiler may put - an instruction which uses %r31 in the delay slot of the original - call. By changing the call instruction from a "bl" to a "ble" - %r31 gets clobbered before the delay slot executes. This - also means the stub has to play funny games to make sure - we return to the instruction just after the BLE rather than - two instructions after the BLE. - - We do not interchange the branch and delay slot if the delay - slot was already nullified, or if the instruction in the delay - slot modifies the return pointer to avoid an unconditional - jump after the call returns (GCC optimization). - - None of this horseshit would be necessary if we put the - stubs between functions and just redirected the "bl" to - the stub. Live and learn. */ - - /* Is this instruction nullified? (does this ever happen?) */ - if (insn & 2) - { - insn = BLE_N_XXX_0_0; - bfd_put_32 (abfd, insn, hit_data); - r_type = R_PARISC_DIR17F; - r_pcrel = 0; - insn = hppa_elf_relocate_insn (abfd, input_section, insn, - addr, sym_value, r_addend, - r_format, r_field, r_pcrel); - } - else - { - /* So much for the trivial case... */ - unsigned long old_delay_slot_insn = bfd_get_32 (abfd, hit_data + 4); - unsigned rtn_reg = (insn & 0x03e00000) >> 21; + args_hash = elf32_hppa_args_hash_lookup (args_hash_table, + new_name, false, false); + if (args_hash == NULL) + callee_args = 0; + else + callee_args = args_hash->arg_bits; - if (get_opcode (old_delay_slot_insn) == LDO) - { - unsigned ldo_src_reg = (old_delay_slot_insn & 0x03e00000) >> 21; - unsigned ldo_target_reg = (old_delay_slot_insn & 0x001f0000) >> 16; + /* If this is a CALL relocation, then get the caller's bits + from the addend. Else use the magic 0x155 value for PLABELS. - /* If the target of the LDO is the same as the return - register then there is no reordering. We can leave the - instuction as a non-nullified BLE in this case. + Also we don't care about the destination (value) for PLABELS. */ + if (r_type == R_PARISC_PCREL17F) + caller_args = HPPA_R_ARG_RELOC (addend); + else + { + caller_args = 0x155; + location = value; + } - FIXME: This test looks wrong. If we had a ble using - ldo_target_reg as the *source* we'd fuck this up. */ - if (ldo_target_reg == rtn_reg) - { - unsigned long new_delay_slot_insn = old_delay_slot_insn; - - BFD_ASSERT (ldo_src_reg == ldo_target_reg); - new_delay_slot_insn &= 0xfc00ffff; - new_delay_slot_insn |= ((31 << 21) | (31 << 16)); - bfd_put_32 (abfd, new_delay_slot_insn, hit_data + 4); - insn = BLE_XXX_0_0; - r_type = R_PARISC_DIR17F; - r_pcrel = 0; - insn = hppa_elf_relocate_insn (abfd, input_section, insn, - addr, sym_value, r_addend, - r_format, r_field, r_pcrel); - bfd_put_32 (abfd, insn, hit_data); - return bfd_reloc_ok; + /* Any kind of linker stub needed? */ + if (((int)(value - location) > 0x3ffff) + || ((int)(value - location) < (int)0xfffc0000) + || elf32_hppa_arg_reloc_needed (caller_args, callee_args, + arg_reloc_types)) + { + struct elf32_hppa_stub_hash_table *stub_hash_table; + struct elf32_hppa_stub_hash_entry *stub_hash; + asection *stub_section; + + /* Build a name for the stub. */ + + len = strlen (new_name); + len += 23; + stub_name = malloc (len); + if (!stub_name) + { + bfd_set_error (bfd_error_no_memory); + return bfd_reloc_notsupported; + } + elf32_hppa_name_of_stub (caller_args, callee_args, + location, value, stub_name); + strcat (stub_name, new_name); + free (new_name); + + stub_hash_table = elf32_hppa_hash_table (info)->stub_hash_table; + + stub_hash + = elf32_hppa_stub_hash_lookup (stub_hash_table, stub_name, + false, false); + + /* We're done with that name. */ + free (stub_name); + + /* The stub BFD only has one section. */ + stub_section = stub_hash_table->stub_bfd->sections; + + if (stub_hash != NULL) + { + + if (r_type == R_PARISC_PCREL17F) + { + unsigned long delay_insn; + unsigned int opcode, rtn_reg, ldo_target_reg, ldo_src_reg; + + /* We'll need to peek at the next insn. */ + delay_insn = bfd_get_32 (input_bfd, hit_data + 4); + opcode = get_opcode (delay_insn); + + /* We also need to know the return register for this + call. */ + rtn_reg = (insn & 0x03e00000) >> 21; + + ldo_src_reg = (delay_insn & 0x03e00000) >> 21; + ldo_target_reg = (delay_insn & 0x001f0000) >> 16; + + /* Munge up the value and other parameters for + hppa_elf_relocate_insn. */ + + value = (stub_hash->offset + + stub_section->output_offset + + stub_section->output_section->vma); + + r_format = 17; + r_field = e_fsel; + r_pcrel = 0; + addend = 0; + + /* We need to peek at the delay insn and determine if + we'll need to swap the branch and its delay insn. */ + if ((insn & 2) + || (opcode == LDO + && ldo_target_reg == rtn_reg) + || (delay_insn == 0x08000240)) + { + /* No need to swap the branch and its delay slot, but + we do need to make sure to jump past the return + pointer update in the stub. */ + value += 4; + + /* If the delay insn does a return pointer adjustment, + then we have to make sure it stays valid. */ + if (opcode == LDO + && ldo_target_reg == rtn_reg) + { + delay_insn &= 0xfc00ffff; + delay_insn |= ((31 << 21) | (31 << 16)); + bfd_put_32 (input_bfd, delay_insn, hit_data + 4); + } + /* Use a BLE to reach the stub. */ + insn = BLE_SR4_R0; + } + else + { + /* Wonderful, we have to swap the call insn and its + delay slot. */ + bfd_put_32 (input_bfd, delay_insn, hit_data); + /* Use a BLE,n to reach the stub. */ + insn = (BLE_SR4_R0 | 0x2); + bfd_put_32 (input_bfd, insn, hit_data + 4); + insn = hppa_elf_relocate_insn (input_bfd, + input_section, + insn, offset + 4, + value, addend, + r_format, r_field, + r_pcrel); + /* Update the instruction word. */ + bfd_put_32 (input_bfd, insn, hit_data + 4); + return bfd_reloc_dangerous; + } + } + else + { + /* PLABEL stuff is easy. */ + + value = (stub_hash->offset + + stub_section->output_offset + + stub_section->output_section->vma); + /* We don't need the RP adjustment for PLABELs. */ + value += 4; + if (r_type == R_PARISC_PLABEL32) + r_format = 32; + else if (r_type == R_PARISC_PLABEL21L) + r_format = 21; + else if (r_type == R_PARISC_PLABEL14R) + r_format = 14; + + r_pcrel = 0; + addend = 0; + } } - else if (rtn_reg == 31) - { - /* The return register is r31, so this is a millicode - call. Do not perform any instruction reordering. */ - insn = BLE_XXX_0_0; - r_type = R_PARISC_DIR17F; - r_pcrel = 0; - insn = hppa_elf_relocate_insn (abfd, input_section, insn, - addr, sym_value, - r_addend, r_format, - r_field, r_pcrel); - bfd_put_32 (abfd, insn, hit_data); - return bfd_reloc_ok; - } else - { - /* Check to see if the delay slot instruction has a - relocation. If so, we need to change the address - field of it because the instruction it relocates - is going to be moved. Oh what a mess. */ - arelent * next_reloc_entry = reloc_entry+1; - - if (next_reloc_entry->address == reloc_entry->address + 4) - next_reloc_entry->address -= 4; - - insn = old_delay_slot_insn; - bfd_put_32 (abfd, insn, hit_data); - insn = BLE_N_XXX_0_0; - bfd_put_32 (abfd, insn, hit_data + 4); - r_type = R_PARISC_DIR17F; - r_pcrel = 0; - insn = hppa_elf_relocate_insn (abfd, input_section, insn, - addr + 4, - sym_value, r_addend, - r_format, r_field, r_pcrel); - bfd_put_32 (abfd, insn, hit_data + 4); - return bfd_reloc_ok; - } - } - /* Same comments as above regarding incorrect test. */ - else if (rtn_reg == 31) - { - /* The return register is r31, so this is a millicode call. - Perform no instruction reordering in this case. */ - insn = BLE_XXX_0_0; - r_type = R_PARISC_DIR17F; - r_pcrel = 0; - insn = hppa_elf_relocate_insn (abfd, input_section, insn, - addr, sym_value, - r_addend, r_format, - r_field, r_pcrel); - bfd_put_32 (abfd, insn, hit_data); - return bfd_reloc_ok; - } - else - { - /* Check to see if the delay slot instruction has a - relocation. If so, we need to change its address - field because the instruction it relocates is going - to be moved. */ - arelent * next_reloc_entry = reloc_entry+1; - - if (next_reloc_entry->address == reloc_entry->address + 4) - next_reloc_entry->address -= 4; - - insn = old_delay_slot_insn; - bfd_put_32 (abfd, insn, hit_data); - insn = BLE_N_XXX_0_0; - bfd_put_32 (abfd, insn, hit_data + 4); - r_type = R_PARISC_DIR17F; - r_pcrel = 0; - insn = hppa_elf_relocate_insn (abfd, input_section, insn, - addr + 4, sym_value, - r_addend, r_format, - r_field, r_pcrel); - bfd_put_32 (abfd, insn, hit_data + 4); - return bfd_reloc_ok; - } - } + return bfd_reloc_notsupported; + } + goto do_basic_type_1; + } + +do_basic_type_1: + insn = hppa_elf_relocate_insn (input_bfd, input_section, insn, + offset, value, addend, r_format, + r_field, r_pcrel); break; - + /* Something we don't know how to handle. */ default: - *error_message = (char *) "Unrecognized reloc"; return bfd_reloc_notsupported; } /* Update the instruction word. */ - bfd_put_32 (abfd, insn, hit_data); + bfd_put_32 (input_bfd, insn, hit_data); return (bfd_reloc_ok); } @@ -1097,50 +1552,144 @@ hppa_elf_is_local_label (abfd, sym) section *before* any other output processing happens. */ static void -elf32_hppa_backend_begin_write_processing (abfd) +elf32_hppa_backend_begin_write_processing (abfd, info) bfd *abfd; + struct bfd_link_info *info; { - int i; + unsigned int i; asection *symextn_sec; - /* Size up the symbol extension section. We can't built it just - yet as the elf_symbol_map hasn't been built. */ - if (abfd->outsymbols == NULL || symext_chain_size != 0) + /* Size up the symbol extension section. */ + if ((abfd->outsymbols == NULL + && info == NULL) + || symext_chain_size != 0) return; - /* Look at each symbol, and determine if it will need an entry in - the symbol extension section. */ - for (i = 0; i < abfd->symcount; i++) + if (info == NULL) { - elf_symbol_type *symbol = (elf_symbol_type *)abfd->outsymbols[i]; + /* We were not called from the BFD ELF linker code, so we need + to examine the output BFD's outsymbols. - /* Only functions ever need an entry in the symbol extension - section. */ - if (!(symbol->symbol.flags & BSF_FUNCTION)) - continue; + Note we can not build the symbol extensions now as the symbol + map hasn't been set up. */ + for (i = 0; i < abfd->symcount; i++) + { + elf_symbol_type *symbol = (elf_symbol_type *)abfd->outsymbols[i]; - /* And only if they specify the locations of their arguments. */ - if (symbol->tc_data.hppa_arg_reloc == 0) - continue; + /* Only functions ever need an entry in the symbol extension + section. */ + if (!(symbol->symbol.flags & BSF_FUNCTION)) + continue; + + /* And only if they specify the locations of their arguments. */ + if (symbol->tc_data.hppa_arg_reloc == 0) + continue; - /* Yup. This function symbol needs an entry. */ - symext_chain_size += 2 * sizeof (symext_entryS); + /* Yup. This function symbol needs an entry. */ + symext_chain_size += 2 * sizeof (symext_entryS); + } + } + else if (info->relocateable == true) + { + struct elf32_hppa_args_hash_table *table; + table = elf32_hppa_hash_table (info)->args_hash_table; + + /* Determine the size of the symbol extension section. */ + elf32_hppa_args_hash_traverse (table, + elf32_hppa_size_symext, + &symext_chain_size); } /* Now create the section and set its size. We'll fill in the contents later. */ symextn_sec = bfd_get_section_by_name (abfd, SYMEXTN_SECTION_NAME); if (symextn_sec == NULL) + symextn_sec = bfd_make_section (abfd, SYMEXTN_SECTION_NAME); + + bfd_set_section_flags (abfd, symextn_sec, + SEC_LOAD | SEC_HAS_CONTENTS | SEC_DATA); + symextn_sec->output_section = symextn_sec; + symextn_sec->output_offset = 0; + bfd_set_section_alignment (abfd, symextn_sec, 2); + bfd_set_section_size (abfd, symextn_sec, symext_chain_size); +} + +/* Called for each entry in the args location hash table. For each + entry we bump the size pointer by 2 records (16 bytes). */ + +static boolean +elf32_hppa_size_symext (gen_entry, in_args) + struct bfd_hash_entry *gen_entry; + PTR in_args; +{ + unsigned int *sizep = (unsigned int *)in_args; + + *sizep += 2 * sizeof (symext_entryS); + return true; +} + +/* Backend routine called by the linker for each output symbol. + + For PA ELF we use this opportunity to add an appropriate entry + to the symbol extension chain for function symbols. */ + +static boolean +elf32_hppa_link_output_symbol_hook (abfd, info, name, sym, section) + bfd *abfd; + struct bfd_link_info *info; + const char *name; + Elf_Internal_Sym *sym; + asection *section; +{ + char *new_name; + unsigned int len, index; + struct elf32_hppa_args_hash_table *args_hash_table; + struct elf32_hppa_args_hash_entry *args_hash; + + /* If the args hash table is NULL, then we've encountered an error + of some sorts (for example, an undefined symbol). In that case + we've got nothing else to do. + + NOTE: elf_link_output_symbol will abort if we return false here! */ + if (elf32_hppa_hash_table (info)->args_hash_table == NULL) + return true; + + index = elf32_hppa_hash_table (info)->output_symbol_count++; + + /* We need to look up this symbol in the args hash table to see if + it has argument relocation bits. */ + if (ELF_ST_TYPE (sym->st_info) != STT_FUNC) + return true; + + /* We know it's a function symbol of some kind. */ + len = strlen (name) + 1; + if (ELF_ST_BIND (sym->st_info) == STB_LOCAL) + len += 9; + + new_name = malloc (len); + if (new_name == NULL) { - symextn_sec = bfd_make_section (abfd, SYMEXTN_SECTION_NAME); - bfd_set_section_flags (abfd, symextn_sec, - SEC_LOAD | SEC_HAS_CONTENTS | SEC_DATA); - symextn_sec->output_section = symextn_sec; - symextn_sec->output_offset = 0; - bfd_set_section_alignment (abfd, symextn_sec, 2); - bfd_set_section_size (abfd, symextn_sec, symext_chain_size); + bfd_set_error (bfd_error_no_memory); + return false; } + strcpy (new_name, name); + if (ELF_ST_BIND (sym->st_info) == STB_LOCAL) + sprintf (new_name + len - 10, "_%08x", (int)section); + + /* Now that we have the unique name, we can look it up in the + args hash table. */ + args_hash_table = elf32_hppa_hash_table (info)->args_hash_table; + args_hash = elf32_hppa_args_hash_lookup (args_hash_table, new_name, + false, false); + free (new_name); + if (args_hash == NULL) + return true; + + /* We know this symbol has arg reloc bits. */ + add_entry_to_symext_chain (abfd, args_hash->arg_bits, + index, &symext_rootP, &symext_lastP); + return true; } /* Perform any processing needed late in the object file writing process. @@ -1148,37 +1697,45 @@ elf32_hppa_backend_begin_write_processing (abfd) section. */ static void -elf32_hppa_backend_final_write_processing (abfd) +elf32_hppa_backend_final_write_processing (abfd, linker) bfd *abfd; + boolean linker; { asection *symextn_sec; - int i, *symtab_map = (int *) elf_sym_extra (abfd); + unsigned int i, *symtab_map = (unsigned int *) elf_sym_extra (abfd); /* Now build the symbol extension section. */ if (symext_chain_size == 0) - return; + return; - /* Look at each symbol, adding the appropriate information to the - symbol extension section list as necessary. */ - for (i = 0; i < abfd->symcount; i++) + if (! linker) { - elf_symbol_type *symbol = (elf_symbol_type *) abfd->outsymbols[i]; + /* We were not called from the backend linker, so we still need + to build the symbol extension chain. - /* Only functions ever need an entry in the symbol extension - section. */ - if (!(symbol->symbol.flags & BSF_FUNCTION)) - continue; + Look at each symbol, adding the appropriate information to the + symbol extension section list as necessary. */ + for (i = 0; i < abfd->symcount; i++) + { + elf_symbol_type *symbol = (elf_symbol_type *) abfd->outsymbols[i]; - /* And only if they specify the locations of their arguments. */ - if (symbol->tc_data.hppa_arg_reloc == 0) - continue; + /* Only functions ever need an entry in the symbol extension + section. */ + if (!(symbol->symbol.flags & BSF_FUNCTION)) + continue; + + /* And only if they specify the locations of their arguments. */ + if (symbol->tc_data.hppa_arg_reloc == 0) + continue; - /* Add this symbol's information to the chain. */ - add_entry_to_symext_chain (abfd, symbol, symtab_map[i], - &symext_rootP, &symext_lastP); + /* Add this symbol's information to the chain. */ + add_entry_to_symext_chain (abfd, symbol->tc_data.hppa_arg_reloc, + symtab_map[i], &symext_rootP, + &symext_lastP); + } } - /* Now fill in the contents of the symbol extension chain. */ + /* Now fill in the contents of the symbol extension section. */ elf_hppa_tc_make_sections (abfd, symext_rootP); /* And attach that as the section's contents. */ @@ -1187,8 +1744,8 @@ elf32_hppa_backend_final_write_processing (abfd) abort(); symextn_sec->contents = (void *)symextn_contents; - - bfd_set_section_contents (abfd, symextn_sec, symextn_sec->contents, + + bfd_set_section_contents (abfd, symextn_sec, symextn_sec->contents, symextn_sec->output_offset, symextn_sec->_raw_size); } @@ -1196,15 +1753,14 @@ elf32_hppa_backend_final_write_processing (abfd) by SYMBOLP if SYMBOLP is a function symbol. Used internally and by GAS. */ static void -add_entry_to_symext_chain (abfd, symbol, sym_idx, symext_root, symext_last) +add_entry_to_symext_chain (abfd, arg_reloc, sym_idx, symext_root, symext_last) bfd *abfd; - elf_symbol_type *symbol; - int sym_idx; + unsigned int arg_reloc; + unsigned int sym_idx; symext_chainS **symext_root; symext_chainS **symext_last; { symext_chainS *symextP; - unsigned int arg_reloc = symbol->tc_data.hppa_arg_reloc; /* Allocate memory and initialize this entry. */ symextP = (symext_chainS *) bfd_alloc (abfd, sizeof (symext_chainS) * 2); @@ -1234,7 +1790,7 @@ add_entry_to_symext_chain (abfd, symbol, sym_idx, symext_root, symext_last) } } -/* Build the symbol extension section. Used internally and by GAS. */ +/* Build the symbol extension section. */ static void elf_hppa_tc_make_sections (abfd, symext_root) @@ -1242,12 +1798,9 @@ elf_hppa_tc_make_sections (abfd, symext_root) symext_chainS *symext_root; { symext_chainS *symextP; - int i; + unsigned int i; asection *symextn_sec; - /* FIXME: Huh? I don't see what this is supposed to do for us. */ - hppa_elf_stub_finish (abfd); - symextn_sec = bfd_get_section_by_name (abfd, SYMEXTN_SECTION_NAME); /* Grab some memory for the contents of the symbol extension section @@ -1267,1629 +1820,1119 @@ elf_hppa_tc_make_sections (abfd, symext_root) return; } -/* Return the symbol extension record of type TYPE for the symbol SYM. */ - -static symext_entryS -elf32_hppa_get_sym_extn (abfd, sym, type) - bfd *abfd; - asymbol *sym; - int type; -{ - switch (type) - { - case PARISC_SXT_SYMNDX: - case PARISC_SXT_NULL: - return (symext_entryS) 0; - case PARISC_SXT_ARG_RELOC: - { - elf_symbol_type *esymP = (elf_symbol_type *) sym; - - return (symext_entryS) esymP->tc_data.hppa_arg_reloc; - } - /* This should never happen. */ - default: - abort(); - } -} - -/* Search the chain of stub descriptions and locate the stub - description for this the given section within the given bfd. - - FIXME: I see yet another wonderful linear linked list search - here. This is probably bad. */ +/* Do some PA ELF specific work after reading in the symbol table. + In particular attach the argument relocation from the + symbol extension section to the appropriate symbols. */ -static elf32_hppa_stub_description * -find_stubs (abfd, stub_sec) +static boolean +elf32_hppa_backend_symbol_table_processing (abfd, esyms,symcnt) bfd *abfd; - asection *stub_sec; + elf_symbol_type *esyms; + int symcnt; { - elf32_hppa_stub_description *stubP; + Elf32_Internal_Shdr *symextn_hdr = + bfd_elf_find_section (abfd, SYMEXTN_SECTION_NAME); + unsigned int i, current_sym_idx = 0; - for (stubP = elf_hppa_stub_rootP; stubP; stubP = stubP->next) + /* If no symbol extension existed, then all symbol extension information + is assumed to be zero. */ + if (symextn_hdr == NULL) { - /* Is this the right one? */ - if (stubP->this_bfd == abfd && stubP->stub_sec == stub_sec) - return stubP; + for (i = 0; i < symcnt; i++) + esyms[i].tc_data.hppa_arg_reloc = 0; + return (true); } - return NULL; -} - -static elf32_hppa_stub_description * -new_stub (abfd, stub_sec, link_info) - bfd *abfd; - asection *stub_sec; - struct bfd_link_info *link_info; -{ - elf32_hppa_stub_description *stub = find_stubs (abfd, stub_sec); - - /* If we found a list for this bfd, then use it. */ - if (stub) - return stub; - /* Nope, allocate and initialize a new entry in the stub list chain. */ - stub = (elf32_hppa_stub_description *) - bfd_zalloc (abfd, sizeof (elf32_hppa_stub_description)); - if (stub) - { - stub->this_bfd = abfd; - stub->stub_sec = stub_sec; - stub->real_size = 0; - stub->allocated_size = 0; - stub->stub_contents = NULL; - stub->stub_secp = NULL; - stub->link_info = link_info; - - stub->next = elf_hppa_stub_rootP; - elf_hppa_stub_rootP = stub; - } - else + /* FIXME: Why not use bfd_get_section_contents here? Also should give + memory back when we're done. */ + /* Allocate a buffer of the appropriate size for the symextn section. */ + symextn_hdr->contents = bfd_zalloc(abfd,symextn_hdr->sh_size); + if (!symextn_hdr->contents) { bfd_set_error (bfd_error_no_memory); - abort(); /* FIXME */ + return false; } + symextn_hdr->size = symextn_hdr->sh_size; - return stub; -} - -/* Try and locate a stub with the name NAME within the stubs - associated with ABFD. More linked list searches. */ - -static elf32_hppa_stub_name_list * -find_stub_by_name (abfd, stub_sec, name) - bfd *abfd; - asection *stub_sec; - char *name; -{ - /* Find the stubs associated with this bfd. */ - elf32_hppa_stub_description *stub = find_stubs (abfd, stub_sec); + /* Read in the symextn section. */ + if (bfd_seek (abfd, symextn_hdr->sh_offset, SEEK_SET) == -1) + return false; + if (bfd_read ((PTR) symextn_hdr->contents, 1, symextn_hdr->size, abfd) + != symextn_hdr->size) + return false; - /* If found, then we have to walk down them looking for a match. */ - if (stub) + /* Parse entries in the symbol extension section, updating the symtab + entries as we go */ + for (i = 0; i < symextn_hdr->size / sizeof(symext_entryS); i++) { - elf32_hppa_stub_name_list *name_listP; + symext_entryS *seP = ((symext_entryS *)symextn_hdr->contents) + i; + unsigned int se_value = ELF32_PARISC_SX_VAL (*seP); + unsigned int se_type = ELF32_PARISC_SX_TYPE (*seP); - for (name_listP = stub->stub_listP; - name_listP; - name_listP = name_listP->next) + switch (se_type) { - if (!strcmp (name_listP->sym->name, name)) - return name_listP; - } - } - - /* Not found. */ - return 0; -} - -/* Add a new stub (SYM) to the list of stubs associated with the given BFD. */ -static elf32_hppa_stub_name_list * -add_stub_by_name(abfd, stub_sec, sym, link_info) - bfd *abfd; - asection *stub_sec; - asymbol *sym; - struct bfd_link_info *link_info; -{ - elf32_hppa_stub_description *stub = find_stubs (abfd, stub_sec); - elf32_hppa_stub_name_list *stub_entry; + case PARISC_SXT_NULL: + break; - /* If no stubs are associated with this bfd, then we have to make - a chain-of-stubs associated with this bfd. */ - if (!stub) - stub = new_stub (abfd, stub_sec, link_info); + case PARISC_SXT_SYMNDX: + if (se_value >= symcnt) + { + bfd_set_error (bfd_error_bad_value); + return (false); + } + current_sym_idx = se_value - 1; + break; - if (stub) - { - /* Allocate and initialize an entry in the stub chain. */ - stub_entry = (elf32_hppa_stub_name_list *) - bfd_zalloc (abfd, sizeof (elf32_hppa_stub_name_list)); + case PARISC_SXT_ARG_RELOC: + esyms[current_sym_idx].tc_data.hppa_arg_reloc = se_value; + break; - if (stub_entry) - { - stub_entry->size = 0; - stub_entry->sym = sym; - stub_entry->stub_desc = stub; - /* First byte of this stub is the pointer to - the next available location in the stub buffer. */ - stub_entry->stub_secp = stub->stub_secp; - /* Add it to the chain. */ - if (stub->stub_listP) - stub_entry->next = stub->stub_listP; - else - stub_entry->next = NULL; - stub->stub_listP = stub_entry; - return stub_entry; - } - else - { - bfd_set_error (bfd_error_no_memory); - abort(); /* FIXME */ + default: + bfd_set_error (bfd_error_bad_value); + return (false); } } - /* Death by mis-adventure. */ - abort (); - return (elf32_hppa_stub_name_list *)NULL; + return (true); } -/* For the given caller/callee argument location information and the - type of relocation (arguments or return value), return the type - of argument relocation needed to make caller and callee happy. */ +/* Read and attach the symbol extension information for the symbols + in INPUT_BFD to the argument location hash table. Handle locals + if DO_LOCALS is true; likewise for globals when DO_GLOBALS is true. */ -static arg_reloc_type -type_of_mismatch (caller_bits, callee_bits, type) - int caller_bits; - int callee_bits; - int type; +static boolean +elf32_hppa_read_symext_info (input_bfd, symtab_hdr, args_hash_table, + local_syms, do_locals, do_globals) + bfd *input_bfd; + Elf_Internal_Shdr *symtab_hdr; + struct elf32_hppa_args_hash_table *args_hash_table; + Elf_Internal_Sym *local_syms; + boolean do_locals; + boolean do_globals; { - switch (type) - { - case ARGUMENTS: - return mismatches[caller_bits][callee_bits]; - case RETURN_VALUE: - return retval_mismatches[caller_bits][callee_bits]; - } - return ARG_RELOC_ERR; -} + asection *symextn_sec; + symextn_entry *contents; + unsigned int i, n_entries, current_index = 0; -/* Extract specific argument location bits for WHICH from the - the full argument location information in AR. */ -#define EXTRACT_ARBITS(ar, which) ((ar) >> (8 - ((which) * 2))) & 3 - -/* Add the new instruction INSN into the stub area denoted by ENTRY. - FIXME: Looks like more cases where we assume sizeof (int) == - sizeof (insn) which may not be true if building cross tools. */ -#define NEW_INSTRUCTION(entry, insn) \ -{ \ - *((entry)->stub_desc->stub_secp)++ = (insn); \ - (entry)->stub_desc->real_size += sizeof (int); \ - (entry)->size += sizeof(int); \ - bfd_set_section_size((entry)->stub_desc->this_bfd, \ - (entry)->stub_desc->stub_sec, \ - (entry)->stub_desc->real_size); \ -} + /* Get the symbol extension section for this BFD. If no section exists + then there's nothing to do. Likewise if the section exists, but + has no contents. */ + symextn_sec = bfd_get_section_by_name (input_bfd, SYMEXTN_SECTION_NAME); + if (symextn_sec == NULL) + return true; -/* Find the offset of the current stub? Looks more like it - finds the offset of the last instruction to me. */ -#define CURRENT_STUB_OFFSET(entry) \ - ((char *)(entry)->stub_desc->stub_secp \ - - (char *)(entry)->stub_desc->stub_contents - 4) + /* Done separately so we can turn off SEC_HAS_CONTENTS (see below). */ + if (symextn_sec->_raw_size == 0) + { + symextn_sec->flags &= ~SEC_HAS_CONTENTS; + return true; + } -/* All the stubs have already been built, finish up stub stuff - by applying relocations to the stubs. */ + contents = (symextn_entry *) malloc (symextn_sec->_raw_size); + if (contents == NULL) + { + bfd_set_error (bfd_error_no_memory); + return false; + } -static void -hppa_elf_stub_finish (output_bfd) - bfd *output_bfd; -{ - elf32_hppa_stub_description *stub_list = elf_hppa_stub_rootP; + /* How gross. We turn off SEC_HAS_CONTENTS for the input symbol extension + sections to keep the generic ELF/BFD code from trying to do anything + with them. We have to undo that hack temporarily so that we can read + in the contents with the generic code. */ + symextn_sec->flags |= SEC_HAS_CONTENTS; + if (bfd_get_section_contents (input_bfd, symextn_sec, contents, + 0, symextn_sec->_raw_size) == false) + { + symextn_sec->flags &= ~SEC_HAS_CONTENTS; + free (contents); + return false; + } - /* If the stubs have been finished, then we're already done. */ - if (stubs_finished) - return; + /* Gross. Turn off SEC_HAS_CONTENTS for the input symbol extension + sections (see above). */ + symextn_sec->flags &= ~SEC_HAS_CONTENTS; - /* Walk down the list of stub lists. */ - for (; stub_list; stub_list = stub_list->next) + n_entries = symextn_sec->_raw_size / sizeof (symextn_entry); + for (i = 0; i < n_entries; i++) { - /* If this list has stubs, then do something. */ - if (stub_list->real_size) + symextn_entry entry = contents[i]; + unsigned int value = ELF32_PARISC_SX_VAL (entry); + unsigned int type = ELF32_PARISC_SX_TYPE (entry); + struct elf32_hppa_args_hash_entry *args_hash; + + switch (type) { - bfd *stub_bfd = stub_list->this_bfd; - asection *stub_sec = bfd_get_section_by_name (stub_bfd, - ".PARISC.stubs"); - long reloc_size; - arelent **reloc_vector; - long reloc_count; - - /* Some sanity checking. */ - BFD_ASSERT (stub_sec == stub_list->stub_sec); - BFD_ASSERT (stub_sec); - - /* For stub sections raw_size == cooked_size. Also update - reloc_done as we're handling the relocs now. */ - stub_sec->_cooked_size = stub_sec->_raw_size; - stub_sec->reloc_done = true; - - /* Make space to hold the relocations for the stub section. */ - reloc_size = bfd_get_reloc_upper_bound (stub_bfd, stub_sec); - if (reloc_size < 0) - { - /* FIXME: Should return an error. */ - abort (); - } - reloc_vector = (arelent **) malloc (reloc_size); - if (reloc_vector == NULL && reloc_size != 0) + case PARISC_SXT_NULL: + break; + + case PARISC_SXT_SYMNDX: + if (value >= symtab_hdr->sh_size / sizeof (Elf32_External_Sym)) { - /* FIXME: should be returning an error so the caller can - clean up */ - abort (); + bfd_set_error (bfd_error_bad_value); + free (contents); + return false; } + current_index = value; + break; - /* If we have relocations, do them. */ - reloc_count = bfd_canonicalize_reloc (stub_bfd, stub_sec, - reloc_vector, - output_bfd->outsymbols); - if (reloc_count < 0) + case PARISC_SXT_ARG_RELOC: + if (current_index < symtab_hdr->sh_info + && do_locals) { - /* FIXME: Should return an error. */ - abort (); + Elf_Internal_Shdr *hdr; + char *new_name; + const char *sym_name; + asection *sym_sec; + unsigned int len; + + hdr = elf_elfsections (input_bfd)[local_syms[current_index].st_shndx]; + sym_sec = hdr->bfd_section; + sym_name = elf_string_from_elf_section (input_bfd, + symtab_hdr->sh_link, + local_syms[current_index].st_name); + len = strlen (sym_name) + 10; + new_name = malloc (len); + if (new_name == NULL) + { + bfd_set_error (bfd_error_no_memory); + free (contents); + return false; + } + strcpy (new_name, sym_name); + sprintf (new_name + len - 10, "_%08x", (int)sym_sec); + + /* This is a global symbol with argument location info. + We need to enter it into the hash table. */ + args_hash = elf32_hppa_args_hash_lookup (args_hash_table, + new_name, true, + true); + free (new_name); + if (args_hash == NULL) + { + free (contents); + return false; + } + args_hash->arg_bits = value; + break; } - if (reloc_count > 0) + else if (current_index >= symtab_hdr->sh_info + && do_globals) { - arelent **parent; - for (parent = reloc_vector; *parent != NULL; parent++) + struct elf_link_hash_entry *h; + + current_index -= symtab_hdr->sh_info; + h = elf_sym_hashes(input_bfd)[current_index]; + /* This is a global symbol with argument location + information. We need to enter it into the hash table. */ + args_hash = elf32_hppa_args_hash_lookup (args_hash_table, + h->root.root.string, + true, true); + if (args_hash == NULL) { - char *err = NULL; - bfd_reloc_status_type r = - bfd_perform_relocation (stub_bfd, *parent, - stub_list->stub_contents, - stub_sec, (bfd *) NULL, &err); - - /* If there was an error, tell someone about it. */ - if (r != bfd_reloc_ok) - { - struct bfd_link_info *link_info = stub_list->link_info; - - switch (r) - { - case bfd_reloc_undefined: - if (! ((*link_info->callbacks->undefined_symbol) - (link_info, - bfd_asymbol_name (*(*parent)->sym_ptr_ptr), - stub_bfd, stub_sec, (*parent)->address))) - abort (); - break; - case bfd_reloc_dangerous: - if (! ((*link_info->callbacks->reloc_dangerous) - (link_info, err, stub_bfd, stub_sec, - (*parent)->address))) - abort (); - break; - case bfd_reloc_overflow: - { - if (! ((*link_info->callbacks->reloc_overflow) - (link_info, - bfd_asymbol_name (*(*parent)->sym_ptr_ptr), - (*parent)->howto->name, - (*parent)->addend, - stub_bfd, stub_sec, - (*parent)->address))) - abort (); - } - break; - case bfd_reloc_outofrange: - default: - abort (); - break; - } - } + bfd_set_error (bfd_error_bad_value); + free (contents); + return false; } + args_hash->arg_bits = value; + break; } - free (reloc_vector); + else + break; - /* All done with the relocations. Set the final contents - of the stub section. FIXME: no check of return value! */ - bfd_set_section_contents (output_bfd, stub_sec, - stub_list->stub_contents, - 0, stub_list->real_size); + default: + bfd_set_error (bfd_error_bad_value); + free (contents); + return false; } } - /* All done. */ - stubs_finished = true; + free (contents); + return true; } -/* Allocate a new relocation entry to be used in a linker stub. */ +/* Undo the generic ELF code's subtraction of section->vma from the + value of each external symbol. */ -static void -hppa_elf_stub_reloc (stub_desc, output_bfd, target_sym, offset, type) - elf32_hppa_stub_description *stub_desc; - bfd *output_bfd; - asymbol **target_sym; - int offset; - elf32_hppa_reloc_type type; +static boolean +elf32_hppa_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp) + bfd *abfd; + struct bfd_link_info *info; + const Elf_Internal_Sym *sym; + const char **namep; + flagword *flagsp; + asection **secp; + bfd_vma *valp; { - arelent relent; - int size; - Elf_Internal_Shdr *rela_hdr; - - /* I really don't like the realloc nonsense in here. FIXME. */ - if (stub_desc->relocs_allocated_cnt == stub_desc->stub_sec->reloc_count) - { - /* Allocate the first few relocation entries. */ - if (stub_desc->stub_sec->relocation == NULL) - { - stub_desc->relocs_allocated_cnt = STUB_RELOC_INCR; - size = sizeof (arelent) * stub_desc->relocs_allocated_cnt; - stub_desc->stub_sec->relocation = (arelent *) bfd_zmalloc (size); - } - else - { - /* We've used all the entries we've already allocated. So get - some more. */ - stub_desc->relocs_allocated_cnt += STUB_RELOC_INCR; - size = sizeof (arelent) * stub_desc->relocs_allocated_cnt; - stub_desc->stub_sec->relocation = (arelent *) - realloc (stub_desc->stub_sec->relocation, size); - } - if (!stub_desc->stub_sec->relocation) - { - bfd_set_error (bfd_error_no_memory); - abort (); /* FIXME */ - } - } - - rela_hdr = &elf_section_data(stub_desc->stub_sec)->rel_hdr; - rela_hdr->sh_size += sizeof(Elf32_External_Rela); - - /* Fill in the details. */ - relent.address = offset; - relent.addend = 0; - relent.sym_ptr_ptr = target_sym; - relent.howto = bfd_reloc_type_lookup (stub_desc->this_bfd, type); - - /* Save it in the array of relocations for the stub section. */ - memcpy (&stub_desc->stub_sec->relocation[stub_desc->stub_sec->reloc_count++], - &relent, sizeof (arelent)); + *valp += (*secp)->vma; + return true; } -/* Build an argument relocation stub. RTN_ADJUST is a hint that an - adjust to the return pointer from within the stub itself may be - needed. */ +/* Determine the name of the stub needed to perform a call assuming the + argument relocation bits for caller and callee are in CALLER and CALLEE + for a call from LOCATION to DESTINATION. Copy the name into STUB_NAME. */ -static asymbol * -hppa_elf_build_linker_stub (abfd, output_bfd, link_info, reloc_entry, - stub_types, rtn_adjust, data, linker_stub_type) - bfd *abfd; - bfd *output_bfd; - struct bfd_link_info *link_info; - arelent *reloc_entry; - arg_reloc_type stub_types[5]; - int rtn_adjust; - unsigned *data; - hppa_stub_type linker_stub_type; +static void +elf32_hppa_name_of_stub (caller, callee, location, destination, stub_name) + unsigned int caller, callee; + bfd_vma location, destination; + char *stub_name; { - int i; - boolean milli, dyncall; - char stub_sym_name[128]; - elf32_hppa_stub_name_list *stub_entry; - /* Some initialization. */ - unsigned insn = data[0]; - asymbol *stub_sym = NULL; - asymbol **orig_sym = reloc_entry->sym_ptr_ptr; - asection *stub_sec = bfd_get_section_by_name (abfd, ".PARISC.stubs"); - elf32_hppa_stub_description *stub_desc = find_stubs (abfd, stub_sec); - - /* Perform some additional checks on whether we should really do the - return adjustment. For example, if the instruction is nullified - or if the delay slot contains an instruction that modifies the return - pointer, then the branch instructions should not be rearranged - (rtn_adjust is false). */ - if (insn & 2 || insn == 0) - rtn_adjust = false; - else - { - unsigned delay_insn = data[1]; - - if (get_opcode (delay_insn) == LDO - && (((insn & 0x03e00000) >> 21) == ((delay_insn & 0x001f0000) >> 16))) - rtn_adjust = false; - } - - /* Some special code for long-call stubs. */ - if (linker_stub_type == HPPA_STUB_LONG_CALL) - { - - /* Is this a millicode call? If so, the return address - comes in on r31 rather than r2 (rp) so a slightly - different code sequence is needed. */ - unsigned rtn_reg = (insn & 0x03e00000) >> 21; - if (rtn_reg == 31) - milli = true; - - /* Dyncall is special because the user code has already - put the return pointer in %r2 (aka RP). Other millicode - calls have the return pointer in %r31. */ - if (strcmp ((*orig_sym)->name, "$$dyncall") == 0) - dyncall = true; - - /* If we are creating a call from a stub to another stub, then - never do the instruction reordering. We can tell if we are - going to be calling one stub from another by the fact that - the symbol name has '_stub_' (arg. reloc. stub) or '_lb_stub_' - prepended to the name. Alternatively, the section of the - symbol will be '.PARISC.stubs'. This is only an issue - for long-calls; they are the only stubs allowed to call another - stub. */ - if ((strncmp ((*orig_sym)->name, "_stub_", 6) == 0) - || (strncmp ((*orig_sym)->name, "_lb_stub_", 9) == 0)) - { - BFD_ASSERT (strcmp ((*orig_sym)->section->name, ".PARISC.stubs") - == 0); - rtn_adjust = false; - } - } + arg_reloc_type arg_reloc_types[5]; - /* Create the stub section if necessary. */ - if (!stub_sec) + if (elf32_hppa_arg_reloc_needed (caller, callee, arg_reloc_types)) { - BFD_ASSERT (stub_desc == NULL); - hppa_elf_create_stub_sec (abfd, output_bfd, &stub_sec, link_info); - stub_desc = new_stub (abfd, stub_sec, link_info); - } - - /* Make the stub if we did not find one already. */ - if (!stub_desc) - stub_desc = new_stub (abfd, stub_sec, link_info); - - /* Allocate space to write the stub. - FIXME: Why using realloc?!? */ - if (!stub_desc->stub_contents) - { - stub_desc->allocated_size = STUB_BUFFER_INCR; - stub_desc->stub_contents = (char *) malloc (STUB_BUFFER_INCR); - } - else if ((stub_desc->allocated_size - stub_desc->real_size) < STUB_MAX_SIZE) - { - stub_desc->allocated_size = stub_desc->allocated_size + STUB_BUFFER_INCR; - stub_desc->stub_contents = (char *) realloc (stub_desc->stub_contents, - stub_desc->allocated_size); - } + arg_reloc_location i; + /* Fill in the basic template. */ + strcpy (stub_name, "__XX_XX_XX_XX_XX_stub_"); - /* If no memory die. (I seriously doubt the other routines - are prepared to get a NULL return value). */ - if (!stub_desc->stub_contents) - { - bfd_set_error (bfd_error_no_memory); - abort (); + /* Now fix the specifics. */ + for (i = ARG0; i <= RET; i++) + switch (arg_reloc_types[i]) + { + case NO: + stub_name[3 * i + 2] = 'N'; + stub_name[3 * i + 3] = 'O'; + break; + case GF: + stub_name[3 * i + 2] = 'G'; + stub_name[3 * i + 3] = 'F'; + break; + case FG: + stub_name[3 * i + 2] = 'F'; + stub_name[3 * i + 3] = 'G'; + break; + case GD: + stub_name[3 * i + 2] = 'G'; + stub_name[3 * i + 3] = 'D'; + break; + case DG: + stub_name[3 * i + 2] = 'D'; + stub_name[3 * i + 3] = 'G'; + break; + } } - - /* Generate an appropriate name for this stub. */ - if (linker_stub_type == HPPA_STUB_ARG_RELOC) - sprintf (stub_sym_name, - "_stub_%s_%02d_%02d_%02d_%02d_%02d_%s", - reloc_entry->sym_ptr_ptr[0]->name, - stub_types[0], stub_types[1], stub_types[2], - stub_types[3], stub_types[4], - rtn_adjust ? "RA" : ""); else - sprintf (stub_sym_name, - "_lb_stub_%s_%s", reloc_entry->sym_ptr_ptr[0]->name, - rtn_adjust ? "RA" : ""); - + strcpy (stub_name, "_____long_branch_stub_"); +} - stub_desc->stub_secp - = (int *) (stub_desc->stub_contents + stub_desc->real_size); - stub_entry = find_stub_by_name (abfd, stub_sec, stub_sym_name); +/* Determine if an argument relocation stub is needed to perform a + call assuming the argument relocation bits for caller and callee + are in CALLER and CALLEE. Place the type of relocations (if any) + into stub_types_p. */ - /* See if we already have one by this name. */ - if (stub_entry) - { - /* Yes, re-use it. Redirect the original relocation from the - old symbol (a function symbol) to the stub (the stub will call - the original function). */ - stub_sym = stub_entry->sym; - reloc_entry->sym_ptr_ptr = (asymbol **) bfd_zalloc (abfd, - sizeof (asymbol **)); - if (reloc_entry->sym_ptr_ptr == NULL) - { - bfd_set_error (bfd_error_no_memory); - abort (); - } - reloc_entry->sym_ptr_ptr[0] = stub_sym; - if (linker_stub_type == HPPA_STUB_LONG_CALL - || (reloc_entry->howto->type != R_PARISC_PLABEL32 - && (get_opcode(insn) == BLE - || get_opcode (insn) == BE - || get_opcode (insn) == BL))) - reloc_entry->howto = bfd_reloc_type_lookup (abfd, R_PARISC_STUB_CALL_17); - } +static boolean +elf32_hppa_arg_reloc_needed (caller, callee, stub_types) + unsigned int caller, callee; + arg_reloc_type stub_types[5]; +{ + /* Special case for no relocations. */ + if (caller == 0 || callee == 0) + return 0; else { - /* Create a new symbol to point to this stub. */ - stub_sym = bfd_make_empty_symbol (abfd); - if (!stub_sym) + arg_location caller_loc[5]; + arg_location callee_loc[5]; + + /* Extract the location information for the argument and return + value on both the caller and callee sides. */ + caller_loc[ARG0] = EXTRACT_ARBITS (caller, ARG0); + callee_loc[ARG0] = EXTRACT_ARBITS (callee, ARG0); + caller_loc[ARG1] = EXTRACT_ARBITS (caller, ARG1); + callee_loc[ARG1] = EXTRACT_ARBITS (callee, ARG1); + caller_loc[ARG2] = EXTRACT_ARBITS (caller, ARG2); + callee_loc[ARG2] = EXTRACT_ARBITS (callee, ARG2); + caller_loc[ARG3] = EXTRACT_ARBITS (caller, ARG3); + callee_loc[ARG3] = EXTRACT_ARBITS (callee, ARG3); + caller_loc[RET] = EXTRACT_ARBITS (caller, RET); + callee_loc[RET] = EXTRACT_ARBITS (callee, RET); + + /* Check some special combinations. This is necessary to + deal with double precision FP arguments. */ + if (caller_loc[ARG0] == AR_FU || caller_loc[ARG1] == AR_FU) { - bfd_set_error (bfd_error_no_memory); - abort (); + caller_loc[ARG0] = AR_FPDBL1; + caller_loc[ARG1] = AR_NO; } - stub_sym->name = bfd_zalloc (abfd, strlen (stub_sym_name) + 1); - if (!stub_sym->name) + if (caller_loc[ARG2] == AR_FU || caller_loc[ARG3] == AR_FU) { - bfd_set_error (bfd_error_no_memory); - abort (); + caller_loc[ARG2] = AR_FPDBL2; + caller_loc[ARG3] = AR_NO; } - strcpy ((char *) stub_sym->name, stub_sym_name); - stub_sym->value - = (char *) stub_desc->stub_secp - (char *) stub_desc->stub_contents; - stub_sym->section = stub_sec; - stub_sym->flags = BSF_LOCAL | BSF_FUNCTION; - stub_entry = add_stub_by_name (abfd, stub_sec, stub_sym, link_info); - - /* Redirect the original relocation from the old symbol (a function) - to the stub (the stub calls the function). */ - reloc_entry->sym_ptr_ptr = (asymbol **) bfd_zalloc (abfd, - sizeof (asymbol **)); - if (reloc_entry->sym_ptr_ptr == NULL) + if (callee_loc[ARG0] == AR_FU || callee_loc[ARG1] == AR_FU) { - bfd_set_error (bfd_error_no_memory); - abort (); + callee_loc[ARG0] = AR_FPDBL1; + callee_loc[ARG1] = AR_NO; } - reloc_entry->sym_ptr_ptr[0] = stub_sym; - if (linker_stub_type == HPPA_STUB_LONG_CALL - || (reloc_entry->howto->type != R_PARISC_PLABEL32 - && (get_opcode (insn) == BLE - || get_opcode (insn) == BE - || get_opcode (insn) == BL))) - reloc_entry->howto = bfd_reloc_type_lookup (abfd, R_PARISC_STUB_CALL_17); - - /* Now generate the code for the stub. Starting with two - common instructions. - - FIXME: Do we still need the SP adjustment? - Do we still need to muck with space registers? */ - NEW_INSTRUCTION (stub_entry, LDSID_31_1) - NEW_INSTRUCTION (stub_entry, MTSP_1_SR0) - - if (linker_stub_type == HPPA_STUB_ARG_RELOC) + if (callee_loc[ARG2] == AR_FU || callee_loc[ARG3] == AR_FU) { - NEW_INSTRUCTION (stub_entry, ADDI_8_SP) + callee_loc[ARG2] = AR_FPDBL2; + callee_loc[ARG3] = AR_NO; + } - /* Examine each argument, generating code to relocate it - into a different register if necessary. */ - for (i = ARG0; i < ARG3; i++) - { - switch (stub_types[i]) - { + /* Now look up any relocation needed for each argument and the + return value. */ + stub_types[ARG0] = arg_mismatches[caller_loc[ARG0]][callee_loc[ARG0]]; + stub_types[ARG1] = arg_mismatches[caller_loc[ARG1]][callee_loc[ARG1]]; + stub_types[ARG2] = arg_mismatches[caller_loc[ARG2]][callee_loc[ARG2]]; + stub_types[ARG3] = arg_mismatches[caller_loc[ARG3]][callee_loc[ARG3]]; + stub_types[RET] = ret_mismatches[caller_loc[RET]][callee_loc[RET]]; + + return (stub_types[ARG0] != NO + || stub_types[ARG1] != NO + || stub_types[ARG2] != NO + || stub_types[ARG3] != NO + || stub_types[RET] != NO); + } +} - case NO_ARG_RELOC: - continue; +/* Compute the size of the stub needed to call from LOCATION to DESTINATION + (a function named SYM_NAME), with argument relocation bits CALLER and + CALLEE. Return zero if no stub is needed to perform such a call. */ - case R_TO_FR: - switch (i) - { - case ARG0: - NEW_INSTRUCTION (stub_entry, STWS_ARG0_M8SP) - NEW_INSTRUCTION (stub_entry, FLDWS_M8SP_FARG0) - break; - case ARG1: - NEW_INSTRUCTION (stub_entry, STWS_ARG1_M8SP) - NEW_INSTRUCTION (stub_entry, FLDWS_M8SP_FARG1) - break; - case ARG2: - NEW_INSTRUCTION (stub_entry, STWS_ARG2_M8SP) - NEW_INSTRUCTION (stub_entry, FLDWS_M8SP_FARG2) - break; - case ARG3: - NEW_INSTRUCTION (stub_entry, STWS_ARG3_M8SP) - NEW_INSTRUCTION (stub_entry, FLDWS_M8SP_FARG3) - break; - } - continue; - - case R01_TO_FR: - switch (i) - { - case ARG0: - NEW_INSTRUCTION (stub_entry, STWS_ARG0_M4SP) - NEW_INSTRUCTION (stub_entry, STWS_ARG1_M8SP) - NEW_INSTRUCTION (stub_entry, FLDDS_M8SP_FARG1) - break; - default: - abort (); - break; - } - continue; +static unsigned int +elf32_hppa_size_of_stub (callee, caller, location, destination, sym_name) + unsigned int callee, caller; + bfd_vma location, destination; + const char *sym_name; +{ + arg_reloc_type arg_reloc_types[5]; + + /* Determine if a long branch or argument relocation stub is needed. + If an argument relocation stub is needed, the relocation will be + stored into arg_reloc_types. */ + if (!(((int)(location - destination) > 0x3ffff) + || ((int)(location - destination) < (int)0xfffc0000) + || elf32_hppa_arg_reloc_needed (caller, callee, arg_reloc_types))) + return 0; - case R23_TO_FR: - switch (i) - { - case ARG2: - NEW_INSTRUCTION (stub_entry, STWS_ARG2_M4SP) - NEW_INSTRUCTION (stub_entry, STWS_ARG3_M8SP) - NEW_INSTRUCTION (stub_entry, FLDDS_M8SP_FARG3) - break; - default: - abort (); - break; - } - continue; + /* Some kind of stub is needed. Determine how big it needs to be. + First check for argument relocation stubs as they also handle + long calls. Then check for long calls to millicode and finally + the normal long calls. */ + if (arg_reloc_types[ARG0] != NO + || arg_reloc_types[ARG1] != NO + || arg_reloc_types[ARG2] != NO + || arg_reloc_types[ARG3] != NO + || arg_reloc_types[RET] != NO) + { + /* Some kind of argument relocation stub is needed. */ + unsigned int len = 16; + arg_reloc_location i; + + /* Each GR or FG relocation takes 2 insns, each GD or DG + relocation takes 3 insns. Plus 4 more insns for the + RP adjustment, ldil & (be | ble) and copy. */ + for (i = ARG0; i <= RET; i++) + switch (arg_reloc_types[i]) + { + case GF: + case FG: + len += 8; + break; - case FR_TO_R: - switch (i) - { - case ARG0: - NEW_INSTRUCTION (stub_entry, FSTWS_FARG0_M8SP) - NEW_INSTRUCTION (stub_entry, LDWS_M4SP_ARG0) - break; - case ARG1: - NEW_INSTRUCTION (stub_entry, FSTWS_FARG1_M8SP) - NEW_INSTRUCTION (stub_entry, LDWS_M4SP_ARG1) - break; - case ARG2: - NEW_INSTRUCTION (stub_entry, FSTWS_FARG2_M8SP) - NEW_INSTRUCTION (stub_entry, LDWS_M4SP_ARG2) - break; - case ARG3: - NEW_INSTRUCTION (stub_entry, FSTWS_FARG3_M8SP) - NEW_INSTRUCTION (stub_entry, LDWS_M4SP_ARG3) - break; - } - continue; - - case FR_TO_R01: - switch (i) - { - case ARG0: - NEW_INSTRUCTION (stub_entry, FSTDS_FARG1_M8SP) - NEW_INSTRUCTION (stub_entry, LDWS_M4SP_ARG0) - NEW_INSTRUCTION (stub_entry, LDWS_M8SP_ARG1) - break; - default: - abort (); - break; - } - continue; - - case FR_TO_R23: - switch (i) - { - case ARG2: - NEW_INSTRUCTION (stub_entry, FSTDS_FARG3_M8SP) - NEW_INSTRUCTION (stub_entry, LDWS_M4SP_ARG2) - NEW_INSTRUCTION (stub_entry, LDWS_M8SP_ARG3) - break; - default: - abort (); - break; - } - continue; + case GD: + case DG: + len += 12; + break; - default: - abort (); - break; - } - } + default: + break; + } + + /* Extra instructions are needed if we're relocating a return value. */ + if (arg_reloc_types[RET] != NO) + len += 12; + + return len; + } + else if (!strncmp ("$$", sym_name, 2) + && strcmp ("$$dyncall", sym_name)) + return 12; + else + return 16; +} - /* Put the stack pointer back. FIXME: Is this still necessary? */ - NEW_INSTRUCTION (stub_entry, ADDI_M8_SP_SP) +/* Build one linker stub as defined by the stub hash table entry GEN_ENTRY. + IN_ARGS contains the stub BFD and link info pointers. */ + +static boolean +elf32_hppa_build_one_stub (gen_entry, in_args) + struct bfd_hash_entry *gen_entry; + PTR in_args; +{ + void **args = (void **)in_args; + bfd *stub_bfd = (bfd *)args[0]; + struct bfd_link_info *info = (struct bfd_link_info *)args[1]; + struct elf32_hppa_stub_hash_entry *entry; + struct elf32_hppa_stub_hash_table *stub_hash_table; + bfd_byte *loc; + symvalue sym_value; + const char *sym_name; + + /* Initialize pointers to the stub hash table, the particular entry we + are building a stub for, and where (in memory) we should place the stub + instructions. */ + entry = (struct elf32_hppa_stub_hash_entry *)gen_entry; + stub_hash_table = elf32_hppa_hash_table(info)->stub_hash_table; + loc = stub_hash_table->location; + + /* Make a note of the offset within the stubs for this entry. */ + entry->offset = stub_hash_table->offset; + + /* The symbol's name starts at offset 22. */ + sym_name = entry->root.string + 22; + + sym_value = (entry->target_value + + entry->target_section->output_offset + + entry->target_section->output_section->vma); + + if (strncmp ("_____long_branch_stub_", entry->root.string, 22)) + { + /* This must be an argument or return value relocation stub. */ + unsigned long insn; + arg_reloc_location i; + bfd_byte *begin_loc = loc; + + /* First the return pointer adjustment. Depending on exact calling + sequence this instruction may be skipped. */ + bfd_put_32 (stub_bfd, LDO_M4_R31_R31, loc); + loc += 4; + + /* If we are relocating a return value, then we're going to have + to return into the stub. So we have to save off the user's + return pointer into the stack at RP'. */ + if (strncmp (entry->root.string + 14, "NO", 2)) + { + bfd_put_32 (stub_bfd, STW_R31_M8R30, loc); + loc += 4; } - /* Common code again. Return pointer adjustment and the like. */ - if (!dyncall) + /* Iterate over the argument relocations, emitting instructions + to move them around as necessary. */ + for (i = ARG0; i <= ARG3; i++) { - /* This isn't dyncall. */ - if (!milli) + if (!strncmp (entry->root.string + 3 * i + 2, "GF", 2)) { - /* It's not a millicode call, so get the correct return - value into %r2 (aka RP). */ - if (rtn_adjust) - NEW_INSTRUCTION (stub_entry, ADDI_M4_31_RP) - else - NEW_INSTRUCTION (stub_entry, COPY_31_2) + bfd_put_32 (stub_bfd, STW_ARG_M16R30 | ((26 - i) << 16), loc); + bfd_put_32 (stub_bfd, FLDW_M16R30_FARG | (4 + i), loc + 4); + loc += 8; } - else + else if (!strncmp (entry->root.string + 3 * i + 2, "FG", 2)) { - /* It is a millicode call, so get the correct return - value into %r1?!?. FIXME: Shouldn't this be - %r31? Yes, and a little re-arrangement of the - code below would make that possible. */ - if (rtn_adjust) - NEW_INSTRUCTION (stub_entry, ADDI_M4_31_1) - else - NEW_INSTRUCTION (stub_entry, COPY_31_1) + bfd_put_32 (stub_bfd, FSTW_FARG_M16R30 | (4 + i), loc); + bfd_put_32 (stub_bfd, LDW_M16R30_ARG | ((26 - i) << 16), loc + 4); + loc += 8; } - } - else - { - /* This is dyncall, so the code is a little different as the - return pointer is already in %r2 (aka RP). */ - if (rtn_adjust) - NEW_INSTRUCTION (stub_entry, ADDI_M4_31_RP) - } - - /* Save the return address. */ - if (linker_stub_type == HPPA_STUB_ARG_RELOC) - NEW_INSTRUCTION (stub_entry, STW_RP_M8SP) - - /* Long branch to the target function. */ - NEW_INSTRUCTION (stub_entry, LDIL_XXX_31) - hppa_elf_stub_reloc (stub_entry->stub_desc, - abfd, orig_sym, - CURRENT_STUB_OFFSET (stub_entry), - R_PARISC_DIR21L); - NEW_INSTRUCTION (stub_entry, BLE_XXX_0_31) - hppa_elf_stub_reloc (stub_entry->stub_desc, - abfd, orig_sym, - CURRENT_STUB_OFFSET (stub_entry), - R_PARISC_DIR17R); - - if (linker_stub_type == HPPA_STUB_ARG_RELOC) - { - /* In delay slot of long-call, copy %r31 into %r2 so that - the callee can return in the normal fashion. */ - NEW_INSTRUCTION (stub_entry, COPY_31_2) - - /* Restore the return address. */ - NEW_INSTRUCTION (stub_entry, LDW_M8SP_RP) - - /* Generate the code to move the return value around. */ - switch (stub_types[RETVAL]) - { - case NO_ARG_RELOC: - break; - - case R_TO_FR: - NEW_INSTRUCTION (stub_entry, STWS_RET0_M8SP) - NEW_INSTRUCTION (stub_entry, FLDWS_M8SP_FRET0) - break; - - case FR_TO_R: - NEW_INSTRUCTION (stub_entry, FSTWS_FRET0_M8SP) - NEW_INSTRUCTION (stub_entry, LDWS_M4SP_RET0) - break; - - default: - abort (); - break; - } - - /* Return back to the main code stream. */ - NEW_INSTRUCTION (stub_entry, BV_N_0_RP) - } - else - { - if (!dyncall) + else if (!strncmp (entry->root.string + 3 * i + 2, "GD", 2)) { - /* Get return address into %r31. Both variants may be necessary - (I think) as we could be cascading into another stub. */ - if (!milli) - NEW_INSTRUCTION (stub_entry, COPY_2_31) - else - NEW_INSTRUCTION (stub_entry, COPY_1_31) + bfd_put_32 (stub_bfd, STW_ARG_M12R30 | ((26 - i) << 16), loc); + bfd_put_32 (stub_bfd, STW_ARG_M16R30 | ((25 - i) << 16), loc + 4); + bfd_put_32 (stub_bfd, FLDD_M16R30_FARG | (5 + i), loc + 8); + loc += 12; } - else + else if (!strncmp (entry->root.string + 3 * i + 2, "DG", 2)) { - /* Get the return address into %r31 too. Might be necessary - (I think) as we could be cascading into another stub. */ - NEW_INSTRUCTION (stub_entry, COPY_2_31) + bfd_put_32 (stub_bfd, FSTD_FARG_M16R30 | (5 + i), loc); + bfd_put_32 (stub_bfd, LDW_M12R30_ARG | ((26 - i) << 16), loc + 4); + bfd_put_32 (stub_bfd, LDW_M16R30_ARG | ((25 - i) << 16), loc + 8); + loc += 12; } - - /* No need for a return to the main stream. */ } - } - return stub_sym; -} -/* Return nonzero if an argument relocation will be needed to call - the function (symbol in RELOC_ENTRY) assuming the caller has - argument relocation bugs CALLER_AR. */ - -static int -hppa_elf_arg_reloc_needed_p (abfd, reloc_entry, stub_types, caller_ar) - bfd *abfd; - arelent *reloc_entry; - arg_reloc_type stub_types[5]; - symext_entryS caller_ar; -{ - /* If the symbol is still undefined, then it's impossible to know - if an argument relocation is needed. */ - if (reloc_entry->sym_ptr_ptr[0] - && reloc_entry->sym_ptr_ptr[0]->section != &bfd_und_section) - { - symext_entryS callee_ar = elf32_hppa_get_sym_extn (abfd, - reloc_entry->sym_ptr_ptr[0], - PARISC_SXT_ARG_RELOC); + /* Load the high bits of the target address into %r1. */ + insn = hppa_rebuild_insn (stub_bfd, LDIL_R1, + hppa_field_adjust (sym_value, 0, e_lrsel), 21); + bfd_put_32 (stub_bfd, insn, loc); + loc += 4; - /* Now examine all the argument and return value location - information to determine if a relocation stub will be needed. */ - if (caller_ar && callee_ar) + /* If we are relocating a return value, then we're going to have + to return into the stub, then perform the return value relocation. */ + if (strncmp (entry->root.string + 14, "NO", 2)) { - arg_location caller_loc[5]; - arg_location callee_loc[5]; - - /* Extract the location information for the return value - and argument registers separately. */ - callee_loc[RETVAL] = EXTRACT_ARBITS (callee_ar, RETVAL); - caller_loc[RETVAL] = EXTRACT_ARBITS (caller_ar, RETVAL); - callee_loc[ARG0] = EXTRACT_ARBITS (callee_ar, ARG0); - caller_loc[ARG0] = EXTRACT_ARBITS (caller_ar, ARG0); - callee_loc[ARG1] = EXTRACT_ARBITS (callee_ar, ARG1); - caller_loc[ARG1] = EXTRACT_ARBITS (caller_ar, ARG1); - callee_loc[ARG2] = EXTRACT_ARBITS (callee_ar, ARG2); - caller_loc[ARG2] = EXTRACT_ARBITS (caller_ar, ARG2); - callee_loc[ARG3] = EXTRACT_ARBITS (callee_ar, ARG3); - caller_loc[ARG3] = EXTRACT_ARBITS (caller_ar, ARG3); - - /* Check some special combinations. For example, if FU - appears in ARG1 or ARG3, we can move it to ARG0 or ARG2, - respectively. (I guess this braindamage is correct? It'd - take an hour or two of reading PA calling conventions to - really know). */ - - if (caller_loc[ARG0] == AR_FU || caller_loc[ARG1] == AR_FU) + /* To return to the stub we "ble" to the target and copy the return + pointer from %r31 into %r2. */ + insn = hppa_rebuild_insn (stub_bfd, + BLE_SR4_R1, + hppa_field_adjust (sym_value, 0, + e_rrsel) >> 2, + 17); + bfd_put_32 (stub_bfd, insn, loc); + bfd_put_32 (stub_bfd, COPY_R31_R2, loc + 4); + + /* Reload the return pointer for our caller from the stack. */ + bfd_put_32 (stub_bfd, LDW_M8R30_R31, loc + 8); + loc += 12; + + /* Perform the return value relocation. */ + if (!strncmp (entry->root.string + 14, "GF", 2)) { - caller_loc[ARG0] = AR_DBL01; - caller_loc[ARG1] = AR_NO; + bfd_put_32 (stub_bfd, STW_ARG_M16R30 | (28 << 16), loc); + bfd_put_32 (stub_bfd, FLDW_M16R30_FARG | 4, loc + 4); + loc += 8; } - if (caller_loc[ARG2] == AR_FU || caller_loc[ARG3] == AR_FU) + else if (!strncmp (entry->root.string + 14, "FG", 2)) { - caller_loc[ARG2] = AR_DBL23; - caller_loc[ARG3] = AR_NO; + bfd_put_32 (stub_bfd, FSTW_FARG_M16R30 | 4, loc); + bfd_put_32 (stub_bfd, LDW_M16R30_ARG | (28 << 16), loc + 4); + loc += 8; } - if (callee_loc[ARG0] == AR_FU || callee_loc[ARG1] == AR_FU) + else if (!strncmp (entry->root.string + 2, "GD", 2)) { - callee_loc[ARG0] = AR_DBL01; - callee_loc[ARG1] = AR_NO; + bfd_put_32 (stub_bfd, STW_ARG_M12R30 | (28 << 16), loc); + bfd_put_32 (stub_bfd, STW_ARG_M16R30 | (29 << 16), loc + 4); + bfd_put_32 (stub_bfd, FLDD_M16R30_FARG | 4, loc + 8); + loc += 12; } - if (callee_loc[ARG2] == AR_FU || callee_loc[ARG3] == AR_FU) + else if (!strncmp (entry->root.string + 2, "DG", 2)) { - callee_loc[ARG2] = AR_DBL23; - callee_loc[ARG3] = AR_NO; + bfd_put_32 (stub_bfd, FSTD_FARG_M16R30 | 4, loc); + bfd_put_32 (stub_bfd, LDW_M12R30_ARG | (28 << 16), loc + 4); + bfd_put_32 (stub_bfd, LDW_M16R30_ARG | (29 << 16), loc + 8); + loc += 12; } + /* Branch back to the user's code now. */ + bfd_put_32 (stub_bfd, BV_N_0_R31, loc); + loc += 4; + } + else + { + /* No return value relocation, so we can simply "be" to the + target and copy out return pointer into %r2. */ + insn = hppa_rebuild_insn (stub_bfd, BE_SR4_R1, + hppa_field_adjust (sym_value, 0, + e_rrsel) >> 2, 17); + bfd_put_32 (stub_bfd, insn, loc); + bfd_put_32 (stub_bfd, COPY_R31_R2, loc + 4); + loc += 8; + } - /* Now look up potential mismatches. */ - stub_types[ARG0] = type_of_mismatch (caller_loc[ARG0], - callee_loc[ARG0], - ARGUMENTS); - stub_types[ARG1] = type_of_mismatch (caller_loc[ARG1], - callee_loc[ARG1], - ARGUMENTS); - stub_types[ARG2] = type_of_mismatch (caller_loc[ARG2], - callee_loc[ARG2], - ARGUMENTS); - stub_types[ARG3] = type_of_mismatch (caller_loc[ARG3], - callee_loc[ARG3], - ARGUMENTS); - stub_types[RETVAL] = type_of_mismatch (caller_loc[RETVAL], - callee_loc[RETVAL], - RETURN_VALUE); - - /* If any of the arguments or return value need an argument - relocation, then we will need an argument relocation stub. */ - if (stub_types[ARG0] != NO_ARG_RELOC - || stub_types[ARG1] != NO_ARG_RELOC - || stub_types[ARG2] != NO_ARG_RELOC - || stub_types[ARG3] != NO_ARG_RELOC - || stub_types[RETVAL] != NO_ARG_RELOC) - return 1; + /* Update the location and offsets. */ + stub_hash_table->location += (loc - begin_loc); + stub_hash_table->offset += (loc - begin_loc); + } + else + { + /* Create one of two variant long branch stubs. One for $$dyncall and + normal calls, the other for calls to millicode. */ + unsigned long insn; + int millicode_call = 0; + + if (!strncmp ("$$", sym_name, 2) && strcmp ("$$dyncall", sym_name)) + millicode_call = 1; + + /* First the return pointer adjustment. Depending on exact calling + sequence this instruction may be skipped. */ + bfd_put_32 (stub_bfd, LDO_M4_R31_R31, loc); + + /* The next two instructions are the long branch itself. A long branch + is formed with "ldil" loading the upper bits of the target address + into a register, then branching with "be" which adds in the lower bits. + Long branches to millicode nullify the delay slot of the "be". */ + insn = hppa_rebuild_insn (stub_bfd, LDIL_R1, + hppa_field_adjust (sym_value, 0, e_lrsel), 21); + bfd_put_32 (stub_bfd, insn, loc + 4); + insn = hppa_rebuild_insn (stub_bfd, BE_SR4_R1 | (millicode_call ? 2 : 0), + hppa_field_adjust (sym_value, 0, e_rrsel) >> 2, + 17); + bfd_put_32 (stub_bfd, insn, loc + 8); + + if (!millicode_call) + { + /* The sequence to call this stub places the return pointer into %r31, + the final target expects the return pointer in %r2, so copy the + return pointer into the proper register. */ + bfd_put_32 (stub_bfd, COPY_R31_R2, loc + 12); + + /* Update the location and offsets. */ + stub_hash_table->location += 16; + stub_hash_table->offset += 16; } + else + { + /* Update the location and offsets. */ + stub_hash_table->location += 12; + stub_hash_table->offset += 12; + } + } - return 0; + return true; } -/* Create the linker stub section. */ +/* External entry points for sizing and building linker stubs. */ -static void -hppa_elf_create_stub_sec (abfd, output_bfd, secptr, link_info) - bfd *abfd; - bfd *output_bfd; - asection **secptr; - struct bfd_link_info *link_info; -{ - asection *output_text_section; - - output_text_section = bfd_get_section_by_name (output_bfd, ".text"); - *secptr = bfd_make_section (abfd, ".PARISC.stubs"); - bfd_set_section_flags (abfd, *secptr, - SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD - | SEC_RELOC | SEC_CODE | SEC_READONLY); - (*secptr)->output_section = output_text_section->output_section; - (*secptr)->output_offset = 0; - - /* Set up the ELF section header for this new section. This - is basically the same processing as elf_make_sections(). - elf_make_sections is static and therefore not accessable - here. */ - { - Elf_Internal_Shdr *this_hdr; - this_hdr = &elf_section_data ((*secptr))->this_hdr; - - /* Set the sizes of this section. The contents have already - been set up ?!? */ - this_hdr->sh_addr = (*secptr)->vma; - this_hdr->sh_size = (*secptr)->_raw_size; - - /* Set appropriate flags for sections with relocations. */ - if ((*secptr)->flags & SEC_RELOC) - { - Elf_Internal_Shdr *rela_hdr; - int use_rela_p = get_elf_backend_data (abfd)->use_rela_p; - - rela_hdr = &elf_section_data ((*secptr))->rel_hdr; - - if (use_rela_p) - { - rela_hdr->sh_type = SHT_RELA; - rela_hdr->sh_entsize = sizeof (Elf32_External_Rela); - } - else - { - rela_hdr->sh_type = SHT_REL; - rela_hdr->sh_entsize = sizeof (Elf32_External_Rel); - } - rela_hdr->sh_flags = 0; - rela_hdr->sh_addr = 0; - rela_hdr->sh_offset = 0; - rela_hdr->sh_addralign = 0; - rela_hdr->size = 0; - } - - if ((*secptr)->flags & SEC_ALLOC) - this_hdr->sh_flags |= SHF_ALLOC; - - if (!((*secptr)->flags & SEC_READONLY)) - this_hdr->sh_flags |= SHF_WRITE; - - if ((*secptr)->flags & SEC_CODE) - this_hdr->sh_flags |= SHF_EXECINSTR; - } - - bfd_set_section_alignment (abfd, *secptr, 2); -} +/* 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 is called via hppaelf_finish in the linker. */ -/* Return nonzero if a long-call stub will be needed to call the - function (symbol in RELOC_ENTRY). */ - -static int -hppa_elf_long_branch_needed_p (abfd, asec, reloc_entry, symbol, insn) - bfd *abfd; - asection *asec; - arelent *reloc_entry; - asymbol *symbol; - unsigned insn; +boolean +elf32_hppa_build_stubs (stub_bfd, info) + bfd *stub_bfd; + struct bfd_link_info *info; { - long sym_value = get_symbol_value (symbol); - int fmt = reloc_entry->howto->bitsize; - unsigned char op = get_opcode (insn); - unsigned raddr; + /* The stub BFD only has one section. */ + asection *stub_sec = stub_bfd->sections; + struct elf32_hppa_stub_hash_table *table; + unsigned int size; + void *args[2]; + + /* So we can pass both the BFD for the stubs and the link info + structure to the routine which actually builds stubs. */ + args[0] = stub_bfd; + args[1] = info; + + /* Allocate memory to hold the linker stubs. */ + size = bfd_section_size (stub_bfd, stub_sec); + stub_sec->contents = (unsigned char *) bfd_zalloc (stub_bfd, size); + if (stub_sec->contents == NULL) + { + bfd_set_error (bfd_error_no_memory); + return false; + } + table = elf32_hppa_hash_table(info)->stub_hash_table; + table->location = stub_sec->contents; -#define too_far(val,num_bits) \ - ((int)(val) > (1 << (num_bits)) - 1) || ((int)(val) < (-1 << (num_bits))) + /* Build the stubs as directed by the stub hash table. */ + elf32_hppa_stub_hash_traverse (table, elf32_hppa_build_one_stub, args); - switch (op) - { - case BL: - raddr = - reloc_entry->address + asec->output_offset + asec->output_section->vma; - /* If the symbol and raddr (relocated addr?) are too far away from - each other, then a long-call stub will be needed. */ - if (too_far (sym_value - raddr, fmt + 1)) - return 1; - break; - } - return 0; + return true; } -/* Search the given section and determine if linker stubs will be - needed for any calls within that section. +/* Determine and set the size of the stub section for a final link. - Return any new stub symbols created. + The basic idea here is to examine all the relocations looking for + PC-relative calls to a target that is unreachable with a "bl" + instruction or calls where the caller and callee disagree on the + location of their arguments or return value. */ - Used out of hppaelf.em in the linker. */ - -asymbol * -hppa_look_for_stubs_in_section (stub_bfd, abfd, output_bfd, asec, - new_sym_cnt, link_info) +boolean +elf32_hppa_size_stubs (stub_bfd, output_bfd, link_info) bfd *stub_bfd; - bfd *abfd; bfd *output_bfd; - asection *asec; - int *new_sym_cnt; struct bfd_link_info *link_info; { - int i; - arg_reloc_type stub_types[5]; - asymbol *new_syms = NULL; - int new_cnt = 0; - int new_max = 0; - arelent **reloc_vector = NULL; - - /* Relocations are in different places depending on whether this is - an output section or an input section. Also, the relocations are - in different forms. Sigh. Luckily, we have bfd_canonicalize_reloc() - to straighten this out for us . */ - if (asec->reloc_count > 0) + bfd *input_bfd; + asection *section, *stub_sec; + Elf_Internal_Shdr *symtab_hdr; + Elf_Internal_Sym *local_syms, *isym; + Elf32_External_Sym *ext_syms, *esym; + struct elf32_hppa_stub_hash_table *stub_hash_table = 0; + struct elf32_hppa_args_hash_table *args_hash_table = 0; + + /* Create and initialize the stub hash table. */ + stub_hash_table = ((struct elf32_hppa_stub_hash_table *) + malloc (sizeof (struct elf32_hppa_stub_hash_table))); + if (!stub_hash_table) { - reloc_vector - = (arelent **) malloc (asec->reloc_count * (sizeof (arelent *) + 1)); - if (reloc_vector == NULL) - { - bfd_set_error (bfd_error_no_memory); - goto error_return; - } - - /* Make sure the canonical symbols are hanging around in a convient - location. */ - if (bfd_get_outsymbols (abfd) == NULL) - { - long symsize; - long symcount; - - symsize = bfd_get_symtab_upper_bound (abfd); - if (symsize < 0) - goto error_return; - abfd->outsymbols = (asymbol **) bfd_alloc (abfd, symsize); - if (!abfd->outsymbols && symsize != 0) - { - bfd_set_error (bfd_error_no_memory); - goto error_return; - } - symcount = bfd_canonicalize_symtab (abfd, abfd->outsymbols); - if (symcount < 0) - goto error_return; - abfd->symcount = symcount; - } - - /* Now get the relocations. */ - if (bfd_canonicalize_reloc (abfd, asec, reloc_vector, - bfd_get_outsymbols (abfd)) < 0) - goto error_return; - - /* Examine each relocation entry in this section. */ - for (i = 0; i < asec->reloc_count; i++) - { - arelent *rle = reloc_vector[i]; - - switch (rle->howto->type) - { - /* Any call could need argument relocation stubs, and - some may need long-call stubs. */ - case R_PARISC_PCREL21L: - case R_PARISC_PCREL17R: - case R_PARISC_PCREL17F: - case R_PARISC_PCREL17C: - case R_PARISC_PCREL14R: - case R_PARISC_PCREL14F: - { - symext_entryS caller_ar - = (symext_entryS) HPPA_R_ARG_RELOC (rle->addend); - unsigned insn[2]; - - /* We'll need this for the long-call checks. */ - bfd_get_section_contents (abfd, asec, insn, rle->address, - sizeof(insn)); - - /* See if this call needs an argument relocation stub. */ - if (hppa_elf_arg_reloc_needed_p (abfd, rle, stub_types, - caller_ar)) - { - /* Generate a stub and keep track of the new symbol. */ - asymbol *r; - - if (new_cnt == new_max) - { - new_max += STUB_SYM_BUFFER_INC; - new_syms = (asymbol *) - realloc (new_syms, new_max * sizeof (asymbol)); - if (new_syms == NULL) - { - bfd_set_error (bfd_error_no_memory); - goto error_return; - } - } - - /* Build the argument relocation stub. */ - r = hppa_elf_build_linker_stub (stub_bfd, output_bfd, - link_info, rle, - stub_types, true, insn, - HPPA_STUB_ARG_RELOC); - new_syms[new_cnt++] = *r; - } - - /* See if this call needs a long-call stub. */ - if (hppa_elf_long_branch_needed_p (abfd, asec, rle, - rle->sym_ptr_ptr[0], - insn[0])) - { - /* Generate a stub and keep track of the new symbol. */ - asymbol *r; - - if (new_cnt == new_max) - { - new_max += STUB_SYM_BUFFER_INC; - new_syms = (asymbol *) - realloc (new_syms, (new_max * sizeof (asymbol))); - if (! new_syms) - { - bfd_set_error (bfd_error_no_memory); - goto error_return; - } - } - - /* Build the long-call stub. */ - r = hppa_elf_build_linker_stub (stub_bfd, output_bfd, - link_info, rle, - NULL, true, insn, - HPPA_STUB_LONG_CALL); - new_syms[new_cnt++] = *r; - } - } - break; - - /* PLABELs may need argument relocation stubs. */ - case R_PARISC_PLABEL32: - case R_PARISC_PLABEL21L: - case R_PARISC_PLABEL14R: - { - /* On a plabel relocation, assume the arguments of the - caller are set up in general registers (indirect - calls only use general registers. - NOTE: 0x155 = ARGW0=GR,ARGW1=GR,ARGW2=GR,RETVAL=GR. */ - symext_entryS caller_ar = (symext_entryS) 0x155; - unsigned insn[2]; - - /* Do we really need this? */ - bfd_get_section_contents (abfd, asec, insn, rle->address, - sizeof(insn)); - - /* See if this call needs an argument relocation stub. */ - if (hppa_elf_arg_reloc_needed_p (abfd, rle, stub_types, - caller_ar)) - { - /* Generate a plabel stub and keep track of the - new symbol. */ - asymbol *r; - int rtn_adjust; - - if (new_cnt == new_max) - { - new_max += STUB_SYM_BUFFER_INC; - new_syms = (asymbol *) realloc (new_syms, new_max - * sizeof (asymbol)); - } + bfd_set_error (bfd_error_no_memory); + goto error_return; + } - /* Determine whether a return adjustment - (see the relocation code for relocation type - R_PARISC_STUB_CALL_17) is possible. Basically, - determine whether we are looking at a branch or not. */ - if (rle->howto->type == R_PARISC_PLABEL32) - rtn_adjust = false; - else - { - switch (get_opcode(insn[0])) - { - case BLE: - case BE: - rtn_adjust = true; - break; - default: - rtn_adjust = false; - } - } + if (!elf32_hppa_stub_hash_table_init (stub_hash_table, stub_bfd, + elf32_hppa_stub_hash_newfunc)) + goto error_return; - /* Build the argument relocation stub. */ - r = hppa_elf_build_linker_stub (stub_bfd, output_bfd, - link_info, rle, stub_types, - rtn_adjust, insn, - HPPA_STUB_ARG_RELOC); - new_syms[new_cnt++] = *r; - } - } - break; - - default: - break; - } - } + /* Likewise for the argument location hash table. */ + args_hash_table = ((struct elf32_hppa_args_hash_table *) + malloc (sizeof (struct elf32_hppa_args_hash_table))); + if (!args_hash_table) + { + bfd_set_error (bfd_error_no_memory); + goto error_return; } - if (reloc_vector != NULL) - free (reloc_vector); - /* Return the new symbols and update the counters. */ - *new_sym_cnt = new_cnt; - return new_syms; - - error_return: - if (reloc_vector != NULL) - free (reloc_vector); - /* FIXME: This is bogus. We should be returning NULL. But do the callers - check for that? */ - abort (); -} + if (!elf32_hppa_args_hash_table_init (args_hash_table, + elf32_hppa_args_hash_newfunc)) + goto error_return; -/* Set the contents of a particular section at a particular location. */ + /* Attach the hash tables to the main hash table. */ + elf32_hppa_hash_table(link_info)->stub_hash_table = stub_hash_table; + elf32_hppa_hash_table(link_info)->args_hash_table = args_hash_table; -static boolean -hppa_elf_set_section_contents (abfd, section, location, offset, count) - bfd *abfd; - sec_ptr section; - PTR location; - file_ptr offset; - bfd_size_type count; -{ - /* Linker stubs are handled a little differently. */ - if (! strcmp (section->name, ".PARISC.stubs")) + /* Walk over all the input BFDs adding entries to the args hash table + for all the external functions. */ + for (input_bfd = link_info->input_bfds; + input_bfd != NULL; + input_bfd = input_bfd->link_next) { - if (linker_stubs_max_size < offset + count) - { - linker_stubs_max_size = offset + count + STUB_ALLOC_INCR; - linker_stubs = (char *)realloc (linker_stubs, linker_stubs_max_size); - if (! linker_stubs) - abort (); - } - - if (offset + count > linker_stubs_size) - linker_stubs_size = offset + count; + /* We'll need the symbol table in a second. */ + symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; + if (symtab_hdr->sh_info == 0) + continue; - /* Set the contents. */ - memcpy(linker_stubs + offset, location, count); - return (true); + if (elf32_hppa_read_symext_info (input_bfd, symtab_hdr, args_hash_table, + NULL, false, true) == false) + goto error_return; } - /* Ignore write requests for the symbol extension section until we've - had the chance to rebuild it ourselves. */ - else if (! strcmp (section->name, ".PARISC.symextn") && !symext_chain_size) - return true; - else - return bfd_elf32_set_section_contents (abfd, section, location, - offset, count); -} -/* Get the contents of the given section. - - This is special for PA ELF because some sections (such as linker stubs) - may reside in memory rather than on disk, or in the case of the symbol - extension section, the contents may need to be generated from other - information contained in the BFD. */ + /* Magic as we know the stub bfd only has one section. */ + stub_sec = stub_bfd->sections; -boolean -hppa_elf_get_section_contents (abfd, section, location, offset, count) - bfd *abfd; - sec_ptr section; - PTR location; - file_ptr offset; - bfd_size_type count; -{ - /* If this is the linker stub section, then its contents are contained - in memory rather than on disk. FIXME. Is that always right? What - about the case where a final executable is read in and a user tries - to get the contents of this section? In that case the contents would - be on disk like everything else. */ - if (strcmp (section->name, ".PARISC.stubs") == 0) + /* Now that we have argument location information for all the global + functions we can start looking for stubs. */ + for (input_bfd = link_info->input_bfds; + input_bfd != NULL; + input_bfd = input_bfd->link_next) { - elf32_hppa_stub_description *stub_desc = find_stubs (abfd, section); - - if (count == 0) - return true; - - /* Sanity check our arguments. */ - if ((bfd_size_type) (offset + count) > section->_raw_size - || (bfd_size_type) (offset + count) > stub_desc->real_size) - return (false); - - memcpy (location, stub_desc->stub_contents + offset, count); - return (true); - } - else - /* It's not the linker stub section, use the generic routines. */ - return _bfd_generic_get_section_contents (abfd, section, location, - offset, count); -} - -/* Translate from an elf into field into a howto relocation pointer. */ + unsigned int i; -static void -elf_info_to_howto (abfd, cache_ptr, dst) - bfd *abfd; - arelent *cache_ptr; - Elf32_Internal_Rela *dst; -{ - BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_PARISC_UNIMPLEMENTED); - cache_ptr->howto = &elf_hppa_howto_table[ELF32_R_TYPE (dst->r_info)]; -} + /* We'll need the symbol table in a second. */ + symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; + if (symtab_hdr->sh_info == 0) + continue; -/* Do PA ELF specific processing for symbols. Needed to find the - value of $global$. */ + /* We need an array of the local symbols attached to the input bfd. + Unfortunately, we're going to have to read & swap them in. */ + local_syms + = (Elf_Internal_Sym *)malloc (symtab_hdr->sh_info + * sizeof (Elf_Internal_Sym)); + if (local_syms == NULL) + { + bfd_set_error (bfd_error_no_memory); + goto error_return; + } -static void -elf32_hppa_backend_symbol_processing (abfd, sym) - bfd *abfd; - asymbol *sym; -{ - /* Is this a definition of $global$? If so, keep it because it will be - needed if any relocations are performed. */ - if (!strcmp (sym->name, "$global$") - && sym->section != &bfd_und_section) - { - global_symbol = sym; - } -} + ext_syms + = (Elf32_External_Sym *)malloc (symtab_hdr->sh_info + * sizeof (Elf32_External_Sym)); + if (ext_syms == NULL) + { + bfd_set_error (bfd_error_no_memory); + free (local_syms); + goto error_return; + } -/* Do some PA ELF specific work after reading in the symbol table. - In particular attach the argument relocation from the - symbol extension section to the appropriate symbols. */ -static boolean -elf32_hppa_backend_symbol_table_processing (abfd, esyms,symcnt) - bfd *abfd; - elf_symbol_type *esyms; - int symcnt; -{ - Elf32_Internal_Shdr *symextn_hdr = - bfd_elf_find_section (abfd, SYMEXTN_SECTION_NAME); - int i, current_sym_idx = 0; + if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0 + || bfd_read (ext_syms, 1, + (symtab_hdr->sh_info + * sizeof (Elf32_External_Sym)), input_bfd) + != (symtab_hdr->sh_info * sizeof (Elf32_External_Sym))) + { + free (local_syms); + free (ext_syms); + goto error_return; + } - /* If no symbol extension existed, then all symbol extension information - is assumed to be zero. */ - if (symextn_hdr == NULL) - { - for (i = 0; i < symcnt; i++) - esyms[i].tc_data.hppa_arg_reloc = 0; - return (true); - } + /* Swap the local symbols in. */ + isym = local_syms; + esym = ext_syms; + for (i = 0; i < symtab_hdr->sh_info; i++, esym++, isym++) + bfd_elf32_swap_symbol_in (input_bfd, esym, isym); - /* Allocate a buffer of the appropriate size for the symextn section. */ - symextn_hdr->contents = bfd_zalloc(abfd,symextn_hdr->sh_size); - if (!symextn_hdr->contents) - { - bfd_set_error (bfd_error_no_memory); - return false; - } - symextn_hdr->size = symextn_hdr->sh_size; - - /* Read in the symextn section. */ - if (bfd_seek (abfd, symextn_hdr->sh_offset, SEEK_SET) == -1) - return false; - if (bfd_read ((PTR) symextn_hdr->contents, 1, symextn_hdr->size, abfd) - != symextn_hdr->size) - return false; + /* Now we can free the external symbols. */ + free (ext_syms); - /* Parse entries in the symbol extension section, updating the symtab - entries as we go */ - for (i = 0; i < symextn_hdr->size / sizeof(symext_entryS); i++) - { - symext_entryS *seP = ((symext_entryS *)symextn_hdr->contents) + i; - int se_value = ELF32_PARISC_SX_VAL (*seP); - int se_type = ELF32_PARISC_SX_TYPE (*seP); + if (elf32_hppa_read_symext_info (input_bfd, symtab_hdr, args_hash_table, + local_syms, true, false) == false) + { + free (local_syms); + goto error_return; + } - switch (se_type) + /* If generating a relocateable output file, then we don't + have to examine the relocs. */ + if (link_info->relocateable) { - case PARISC_SXT_NULL: - break; + free (local_syms); + return true; + } - case PARISC_SXT_SYMNDX: - if (se_value >= symcnt) + /* Walk over each section attached to the input bfd. */ + for (section = input_bfd->sections; + section != NULL; + section = section->next) + { + Elf_Internal_Shdr *input_rel_hdr; + Elf32_External_Rela *external_relocs, *erelaend, *erela; + Elf_Internal_Rela *internal_relocs, *irelaend, *irela; + + /* If there aren't any relocs, then there's nothing to do. */ + if ((section->flags & SEC_RELOC) == 0 + || section->reloc_count == 0) + continue; + + /* Allocate space for the external relocations. */ + external_relocs + = (Elf32_External_Rela *) malloc (section->reloc_count * sizeof (Elf32_External_Rela)); + if (external_relocs == NULL) { - bfd_set_error (bfd_error_bad_value); - return (false); + bfd_set_error (bfd_error_no_memory); + free (local_syms); + goto error_return; } - current_sym_idx = se_value - 1; - break; - case PARISC_SXT_ARG_RELOC: - esyms[current_sym_idx].tc_data.hppa_arg_reloc = se_value; - break; + /* Likewise for the internal relocations. */ + internal_relocs + = (Elf_Internal_Rela *) malloc (section->reloc_count * sizeof (Elf_Internal_Rela)); + if (internal_relocs == NULL) + { + bfd_set_error (bfd_error_no_memory); + free (external_relocs); + free (local_syms); + goto error_return; + } - default: - bfd_set_error (bfd_error_bad_value); - return (false); - } - } - return (true); -} + /* Read in the external relocs. */ + input_rel_hdr = &elf_section_data (section)->rel_hdr; + if (bfd_seek (input_bfd, input_rel_hdr->sh_offset, SEEK_SET) != 0 + || bfd_read (external_relocs, 1, input_rel_hdr->sh_size, + input_bfd) != input_rel_hdr->sh_size) + { + free (external_relocs); + free (internal_relocs); + free (local_syms); + goto error_return; + } -/* Perform on PA ELF specific processing once a section has been - read in. In particular keep the symbol indexes correct for - the symbol extension information. */ + /* Swap in the relocs. */ + erela = external_relocs; + erelaend = erela + section->reloc_count; + irela = internal_relocs; + for (; erela < erelaend; erela++, irela++) + bfd_elf32_swap_reloca_in (input_bfd, erela, irela); -static boolean -elf32_hppa_backend_section_processing (abfd, secthdr) - bfd *abfd; - Elf32_Internal_Shdr *secthdr; -{ - int i, j, k; + /* We're done with the external relocs, free them. */ + free (external_relocs); - if (secthdr->sh_type == SHT_PARISC_SYMEXTN) - { - for (i = 0; i < secthdr->size / sizeof (symext_entryS); i++) - { - symext_entryS *seP = ((symext_entryS *)secthdr->contents) + i; - int se_value = ELF32_PARISC_SX_VAL (*seP); - int se_type = ELF32_PARISC_SX_TYPE (*seP); - - switch (se_type) + /* Now examine each relocation. */ + irela = internal_relocs; + irelaend = irela + section->reloc_count; + for (; irela < irelaend; irela++) { - case PARISC_SXT_NULL: - break; - - case PARISC_SXT_SYMNDX: - for (j = 0; j < abfd->symcount; j++) + long r_type, callee_args, caller_args, r_index, size_of_stub; + struct elf_link_hash_entry *hash; + struct elf32_hppa_stub_hash_entry *stub_hash; + struct elf32_hppa_args_hash_entry *args_hash; + Elf_Internal_Sym *sym; + asection *sym_sec; + const char *sym_name; + symvalue sym_value; + bfd_vma location, destination; + char *new_name = NULL; + + r_type = ELF32_R_TYPE (irela->r_info); + r_index = ELF32_R_SYM (irela->r_info); + + if (r_type < 0 || r_type >= (int) R_PARISC_UNIMPLEMENTED) { - /* Locate the map entry for this symbol and modify the - symbol extension section symbol index entry to reflect - the new symbol table index. */ - for (k = 0; k < elf32_hppa_symextn_map_size; k++) + bfd_set_error (bfd_error_bad_value); + free (internal_relocs); + free (local_syms); + goto error_return; + } + + /* Only look for stubs on call instructions or plabel + references. */ + if (r_type != R_PARISC_PCREL17F + && r_type != R_PARISC_PLABEL32 + && r_type != R_PARISC_PLABEL21L + && r_type != R_PARISC_PLABEL14R) + continue; + + /* Now determine the call target, its name, value, section + and argument relocation bits. */ + hash = NULL; + sym = NULL; + sym_sec = NULL; + if (r_index < symtab_hdr->sh_info) + { + /* It's a local symbol. */ + Elf_Internal_Shdr *hdr; + + sym = local_syms + r_index; + hdr = elf_elfsections (input_bfd)[sym->st_shndx]; + sym_sec = hdr->bfd_section; + sym_name = elf_string_from_elf_section (input_bfd, + symtab_hdr->sh_link, + sym->st_name); + sym_value = (ELF_ST_TYPE (sym->st_info) == STT_SECTION + ? 0 : sym->st_value); + destination = (sym_value + + sym_sec->output_offset + + sym_sec->output_section->vma); + + /* Tack on an ID so we can uniquely identify this local + symbol in the stub or arg info hash tables. */ + new_name = malloc (strlen (sym_name) + 10); + if (new_name == 0) { - if (elf32_hppa_symextn_map[k].old_index == se_value - && elf32_hppa_symextn_map[k].bfd - == abfd->outsymbols[j]->the_bfd - && elf32_hppa_symextn_map[k].sym - == abfd->outsymbols[j]) - { - bfd_put_32(abfd, - ELF32_PARISC_SX_WORD (PARISC_SXT_SYMNDX, j), - (char *)seP); - } + bfd_set_error (bfd_error_bad_value); + free (internal_relocs); + free (local_syms); + goto error_return; } + sprintf (new_name, "%s_%08x", sym_name, (int)sym_sec); + sym_name = new_name; } - break; - - case PARISC_SXT_ARG_RELOC: - break; - - default: - bfd_set_error (bfd_error_bad_value); - return (false); - } - } - } - return true; -} - -/* What does this really do? Just determine if there is an appropriate - mapping from ELF section headers to backend sections? More symbol - extension braindamage. */ - -static boolean -elf32_hppa_backend_section_from_shdr (abfd, hdr, name) - bfd *abfd; - Elf32_Internal_Shdr *hdr; - char *name; -{ - asection *newsect; - - if (hdr->sh_type == SHT_PARISC_SYMEXTN) - { - BFD_ASSERT (strcmp (name, ".PARISC.symextn") == 0); - - /* Bits that get saved. This one is real. */ - if (!hdr->rawdata) - { - newsect = bfd_make_section (abfd, name); - if (newsect != NULL) - { - newsect->vma = hdr->sh_addr; - newsect->_raw_size = hdr->sh_size; - newsect->filepos = hdr->sh_offset; - newsect->flags |= SEC_HAS_CONTENTS; - newsect->alignment_power = hdr->sh_addralign; - - if (hdr->sh_flags & SHF_ALLOC) + else { - newsect->flags |= SEC_ALLOC; - newsect->flags |= SEC_LOAD; + /* It's an external symbol. */ + long index; + + index = r_index - symtab_hdr->sh_info; + hash = elf_sym_hashes (input_bfd)[index]; + if (hash->root.type == bfd_link_hash_defined) + { + sym_sec = hash->root.u.def.section; + sym_name = hash->root.root.string; + sym_value = hash->root.u.def.value; + destination = (sym_value + + sym_sec->output_offset + + sym_sec->output_section->vma); + } + else + { + bfd_set_error (bfd_error_bad_value); + free (internal_relocs); + free (local_syms); + goto error_return; + } } - if (!(hdr->sh_flags & SHF_WRITE)) - newsect->flags |= SEC_READONLY; + args_hash = elf32_hppa_args_hash_lookup (args_hash_table, + sym_name, false, false); - if (hdr->sh_flags & SHF_EXECINSTR) - newsect->flags |= SEC_CODE; + /* Get both caller and callee argument information. */ + if (args_hash == NULL) + callee_args = 0; else - newsect->flags |= SEC_DATA; - - hdr->rawdata = (void *) newsect; - } - } - return true; - } - return false; -} + callee_args = args_hash->arg_bits; + + /* For calls get the caller's bits from the addend of + the call relocation. For PLABELS the caller's bits + are assumed to have all args & return values in general + registers (0x155). */ + if (r_type == R_PARISC_PCREL17F) + caller_args = HPPA_R_ARG_RELOC (irela->r_addend); + else + caller_args = 0x155; + + /* Now determine where the call point is. */ + location = (section->output_offset + + section->output_section->vma + + irela->r_offset); + + /* We only care about the destination for PCREL function + calls (eg. we don't care for PLABELS). */ + if (r_type != R_PARISC_PCREL17F) + location = destination; + + /* Determine what (if any) linker stub is needed and its + size (in bytes). */ + size_of_stub = elf32_hppa_size_of_stub (callee_args, + caller_args, + location, + destination, + sym_name); + if (size_of_stub != 0) + { + char *stub_name; + unsigned int len; -/* Return true if the given section is a fake section. */ + /* Get the name of this stub. */ + len = strlen (sym_name); + len += 23; -static boolean -elf32_hppa_backend_fake_sections (abfd, secthdr, asect) - bfd *abfd; - Elf_Internal_Shdr *secthdr; - asection *asect; -{ + stub_name = malloc (len); + if (!stub_name) + { + bfd_set_error (bfd_error_no_memory); - if (strcmp(asect->name, ".PARISC.symextn") == 0) - { - secthdr->sh_type = SHT_PARISC_SYMEXTN; - secthdr->sh_flags = 0; - secthdr->sh_info = elf_section_data(asect)->rel_hdr.sh_link; - secthdr->sh_link = elf_onesymtab(abfd); - return true; - } + /* Because sym_name was mallocd above for local + symbols. */ + if (r_index < symtab_hdr->sh_info) + free (new_name); - if (!strcmp (asect->name, ".PARISC.unwind")) - { - secthdr->sh_type = SHT_PROGBITS; - /* Unwind descriptors are not part of the program memory image. */ - secthdr->sh_flags = 0; - secthdr->sh_info = 0; - secthdr->sh_link = 0; - secthdr->sh_entsize = 16; - return true; - } + free (internal_relocs); + free (local_syms); + goto error_return; + } + elf32_hppa_name_of_stub (caller_args, callee_args, + location, destination, stub_name); + strcat (stub_name + 22, sym_name); + + /* Because sym_name was malloced above for local symbols. */ + if (r_index < symtab_hdr->sh_info) + free (new_name); + + stub_hash + = elf32_hppa_stub_hash_lookup (stub_hash_table, stub_name, + false, false); + if (stub_hash != NULL) + { + /* The proper stub has already been created, nothing + else to do. */ + free (stub_name); + } + else + { + bfd_set_section_size (stub_bfd, stub_sec, + (bfd_section_size (stub_bfd, + stub_sec) + + size_of_stub)); + + /* Enter this entry into the linker stub hash table. */ + stub_hash + = elf32_hppa_stub_hash_lookup (stub_hash_table, + stub_name, true, true); + if (stub_hash == NULL) + { + bfd_set_error (bfd_error_no_memory); + free (stub_name); + free (internal_relocs); + free (local_syms); + goto error_return; + } - /* @@ Should this be CPU specific?? KR */ - if (!strcmp (asect->name, ".stabstr")) - { - secthdr->sh_type = SHT_STRTAB; - secthdr->sh_flags = 0; - secthdr->sh_info = 0; - secthdr->sh_link = 0; - secthdr->sh_entsize = 0; - return true; + /* We'll need these to determine the address that the + stub will branch to. */ + stub_hash->target_value = sym_value; + stub_hash->target_section = sym_sec; + } + free (stub_name); + } + } + /* We're done with the internal relocs, free them. */ + free (internal_relocs); + } + /* We're done with the local symbols, free them. */ + free (local_syms); } + return true; - return false; -} - -/* Return true if there is a mapping from bfd section into a - backend section. */ - -static boolean -elf32_hppa_backend_section_from_bfd_section (abfd, hdr, asect, ignored) - bfd *abfd; - Elf32_Internal_Shdr *hdr; - asection *asect; - int *ignored; -{ - if (hdr->sh_type == SHT_PARISC_SYMEXTN) +error_return: + /* Return gracefully, avoiding dangling references to the hash tables. */ + if (stub_hash_table) { - if (hdr->rawdata) - { - if (((struct sec *) (hdr->rawdata)) == asect) - { - BFD_ASSERT (strcmp (asect->name, ".PARISC.symextn") == 0); - return true; - } - } + elf32_hppa_hash_table(link_info)->stub_hash_table = NULL; + free (stub_hash_table); } - else if (hdr->sh_type == SHT_STRTAB) + if (args_hash_table) { - if (hdr->rawdata) - { - if (((struct sec *) (hdr->rawdata)) == asect) - { - BFD_ASSERT (strcmp (asect->name, ".stabstr") == 0); - return true; - } - } + elf32_hppa_hash_table(link_info)->args_hash_table = NULL; + free (args_hash_table); } - return false; } -#define bfd_elf32_bfd_reloc_type_lookup elf_hppa_reloc_type_lookup -#define elf_backend_section_from_bfd_section elf32_hppa_backend_section_from_bfd_section - -#define elf_backend_symbol_processing elf32_hppa_backend_symbol_processing -#define elf_backend_symbol_table_processing elf32_hppa_backend_symbol_table_processing - -#define bfd_elf32_get_section_contents hppa_elf_get_section_contents -#define bfd_elf32_set_section_contents hppa_elf_set_section_contents +/* Misc BFD support code. */ +#define bfd_elf32_bfd_reloc_type_lookup elf_hppa_reloc_type_lookup #define bfd_elf32_bfd_is_local_label hppa_elf_is_local_label -#define elf_backend_section_processing elf32_hppa_backend_section_processing - -#define elf_backend_section_from_shdr elf32_hppa_backend_section_from_shdr -#define elf_backend_fake_sections elf32_hppa_backend_fake_sections +/* Symbol extension stuff. */ +#define bfd_elf32_set_section_contents elf32_hppa_set_section_contents +#define elf_backend_symbol_table_processing \ + elf32_hppa_backend_symbol_table_processing #define elf_backend_begin_write_processing \ elf32_hppa_backend_begin_write_processing #define elf_backend_final_write_processing \ elf32_hppa_backend_final_write_processing +/* Stuff for the BFD linker. */ +#define elf_backend_relocate_section elf32_hppa_relocate_section +#define elf_backend_add_symbol_hook elf32_hppa_add_symbol_hook +#define elf_backend_link_output_symbol_hook \ + elf32_hppa_link_output_symbol_hook +#define bfd_elf32_bfd_link_hash_table_create \ + elf32_hppa_link_hash_table_create + #define TARGET_BIG_SYM bfd_elf32_hppa_vec #define TARGET_BIG_NAME "elf32-hppa" #define ELF_ARCH bfd_arch_hppa diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c index 6148a5a..08d2d7f 100644 --- a/bfd/elf32-mips.c +++ b/bfd/elf32-mips.c @@ -71,7 +71,8 @@ static void mips_info_to_howto_rel PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *)); static boolean mips_elf_sym_is_global PARAMS ((bfd *, asymbol *)); static boolean mips_elf_object_p PARAMS ((bfd *)); -static void mips_elf_final_write_processing PARAMS ((bfd *)); +static void mips_elf_final_write_processing + PARAMS ((bfd *, boolean)); static boolean mips_elf_section_from_shdr PARAMS ((bfd *, Elf32_Internal_Shdr *, char *)); static boolean mips_elf_fake_sections @@ -95,7 +96,7 @@ static void mips_elf_relocate_hi16 bfd_vma)); static boolean mips_elf_relocate_section PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, - Elf_Internal_Rela *, Elf_Internal_Sym *, asection **)); + Elf_Internal_Rela *, Elf_Internal_Sym *, asection **, char *)); static boolean mips_elf_add_symbol_hook PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *, const char **, flagword *, asection **, bfd_vma *)); @@ -362,7 +363,7 @@ mips_elf_hi16_reloc (abfd, abort (); ret = bfd_reloc_ok; - if (symbol->section == &bfd_und_section + if (bfd_is_und_section (symbol->section) && output_bfd == (bfd *) NULL) ret = bfd_reloc_undefined; @@ -548,7 +549,7 @@ mips_elf_gprel16_reloc (abfd, output_bfd = symbol->section->output_section->owner; } - if (symbol->section == &bfd_und_section + if (bfd_is_und_section (symbol->section) && relocateable == false) return bfd_reloc_undefined; @@ -839,9 +840,11 @@ mips_elf_object_p (abfd) file. This gets the MIPS architecture right based on the machine number. */ +/*ARGSUSED*/ static void -mips_elf_final_write_processing (abfd) +mips_elf_final_write_processing (abfd, linker) bfd *abfd; + boolean linker; { unsigned long val; unsigned int i; @@ -878,8 +881,8 @@ mips_elf_final_write_processing (abfd) const char *name; asection *sec; - BFD_ASSERT ((*hdrpp)->rawdata != NULL); - name = ((asection *) (*hdrpp)->rawdata)->name; + BFD_ASSERT ((*hdrpp)->bfd_section != NULL); + name = bfd_get_section_name (abfd, (*hdrpp)->bfd_section); BFD_ASSERT (name != NULL && strncmp (name, ".gptab.", sizeof ".gptab." - 1) == 0); sec = bfd_get_section_by_name (abfd, name + sizeof ".gptab" - 1); @@ -944,7 +947,7 @@ mips_elf_section_from_shdr (abfd, hdr, name) if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name)) return false; - newsect = (asection *) hdr->rawdata; + newsect = hdr->bfd_section; if (hdr->sh_type == SHT_MIPS_DEBUG) { @@ -1042,8 +1045,6 @@ mips_elf_section_from_bfd_section (abfd, hdr, sec, retval) *retval = SHN_MIPS_SCOMMON; return true; } - if ((asection *) hdr->rawdata == sec) - return true; return false; } @@ -1073,9 +1074,9 @@ mips_elf_section_processing (abfd, hdr) return false; } - if (hdr->rawdata != NULL) + if (hdr->bfd_section != NULL) { - const char *name = ((asection *) hdr->rawdata)->name; + const char *name = bfd_get_section_name (abfd, hdr->bfd_section); if (strcmp (name, ".sdata") == 0) { @@ -1173,7 +1174,7 @@ mips_elf_symbol_processing (abfd, asym) break; case SHN_MIPS_SUNDEFINED: - asym->section = &bfd_und_section; + asym->section = bfd_und_section_ptr; break; } } @@ -1409,7 +1410,7 @@ mips_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp) break; case SHN_MIPS_SUNDEFINED: - *secp = &bfd_und_section; + *secp = bfd_und_section_ptr; break; } @@ -2150,7 +2151,8 @@ mips_elf_relocate_hi16 (input_bfd, relhi, rello, contents, addend) static boolean mips_elf_relocate_section (output_bfd, info, input_bfd, input_section, - contents, relocs, local_syms, local_sections) + contents, relocs, local_syms, local_sections, + output_names) bfd *output_bfd; struct bfd_link_info *info; bfd *input_bfd; @@ -2159,6 +2161,7 @@ mips_elf_relocate_section (output_bfd, info, input_bfd, input_section, Elf_Internal_Rela *relocs; Elf_Internal_Sym *local_syms; asection **local_sections; + char *output_names; { Elf_Internal_Shdr *symtab_hdr; size_t locsymcount; @@ -2372,9 +2375,7 @@ mips_elf_relocate_section (output_bfd, info, input_bfd, input_section, name = h->root.root.string; else { - name = elf_string_from_elf_section (input_bfd, - symtab_hdr->sh_link, - sym->st_name); + name = output_names + sym->st_name; if (name == NULL) return false; if (*name == '\0') diff --git a/bfd/elfcode.h b/bfd/elfcode.h index 888e512..60b3a49 100644 --- a/bfd/elfcode.h +++ b/bfd/elfcode.h @@ -300,8 +300,8 @@ elf_swap_shdr_in (abfd, src, dst) dst->sh_info = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_info); dst->sh_addralign = get_word (abfd, (bfd_byte *) src->sh_addralign); dst->sh_entsize = get_word (abfd, (bfd_byte *) src->sh_entsize); - /* we haven't done any processing on it yet, so... */ - dst->rawdata = (void *) 0; + dst->bfd_section = NULL; + dst->contents = NULL; } /* Translate an ELF section header table entry in internal format into an @@ -575,13 +575,12 @@ bfd_section_from_shdr (abfd, shindex) return _bfd_elf_make_section_from_shdr (abfd, hdr, name); case SHT_STRTAB: /* A string table */ - if (hdr->rawdata != NULL) + if (hdr->bfd_section != NULL) return true; if (ehdr->e_shstrndx == shindex) { elf_tdata (abfd)->shstrtab_hdr = *hdr; elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->shstrtab_hdr; - hdr->rawdata = (PTR) & elf_tdata (abfd)->shstrtab_hdr; return true; } { @@ -613,10 +612,10 @@ bfd_section_from_shdr (abfd, shindex) #if 0 /* Not handling other string tables specially right now. */ hdr2 = elf_elfsections (abfd)[i]; /* in case it moved */ /* We have a strtab for some random other section. */ - newsect = (asection *) hdr2->rawdata; + newsect = (asection *) hdr2->bfd_section; if (!newsect) break; - hdr->rawdata = (PTR) newsect; + hdr->bfd_section = newsect; hdr2 = &elf_section_data (newsect)->str_hdr; *hdr2 = *hdr; elf_elfsections (abfd)[shindex] = hdr2; @@ -663,8 +662,7 @@ bfd_section_from_shdr (abfd, shindex) if (! bfd_section_from_shdr (abfd, hdr->sh_info)) return false; target_sect = section_from_elf_index (abfd, hdr->sh_info); - if (target_sect == NULL - || elf_section_data (target_sect) == NULL) + if (target_sect == NULL) return false; hdr2 = &elf_section_data (target_sect)->rel_hdr; @@ -1188,9 +1186,8 @@ elf_fake_sections (abfd, asect, ignore) this_hdr->sh_addralign = 1 << asect->alignment_power; this_hdr->sh_entsize = 0; - this_hdr->rawdata = (PTR) asect; + this_hdr->bfd_section = asect; this_hdr->contents = NULL; - this_hdr->size = 0; /* FIXME: This should not be based on section names. */ if (strcmp (asect->name, ".dynstr") == 0) @@ -1279,7 +1276,6 @@ elf_fake_sections (abfd, asect, ignore) rela_hdr->sh_addr = 0; rela_hdr->sh_size = 0; rela_hdr->sh_offset = 0; - rela_hdr->size = 0; } } @@ -1520,7 +1516,6 @@ elf_map_symbols (abfd) } max_index++; - elf_num_section_syms (abfd) = max_index; sect_syms = (asymbol **) bfd_zalloc (abfd, max_index * sizeof (asymbol *)); elf_section_syms (abfd) = sect_syms; @@ -1530,18 +1525,40 @@ elf_map_symbols (abfd) return false; } - for (asect = abfd->sections; asect; asect = asect->next) + for (idx = 0; idx < symcount; idx++) { - asymbol *sym = bfd_make_empty_symbol (abfd); - if (!sym) + if ((syms[idx]->flags & BSF_SECTION_SYM) != 0) { - bfd_set_error (bfd_error_no_memory); - return false; + asection *sec; + + sec = syms[idx]->section; + if (! bfd_is_abs_section (sec)) + { + if (sec->owner != abfd) + { + sec = sec->output_section; + BFD_ASSERT (sec->owner == abfd); + } + sect_syms[sec->index] = syms[idx]; + } } + } + + for (asect = abfd->sections; asect; asect = asect->next) + { + asymbol *sym; + + if (sect_syms[asect->index] != NULL) + continue; + + sym = bfd_make_empty_symbol (abfd); + if (sym == NULL) + return false; sym->the_bfd = abfd; sym->name = asect->name; sym->value = asect->vma; - sym->flags = BSF_SECTION_SYM; + /* Set the flags to 0 to indicate that this one was newly added. */ + sym->flags = 0; sym->section = asect; sect_syms[asect->index] = sym; num_sections++; @@ -1554,15 +1571,15 @@ elf_map_symbols (abfd) if (num_sections) { -#if 0 /* @@ I just deleted bfd_realloc, because it's broken and too hard to - fix. I'm leaving this code here as a reminder to look at this more - carefully later and see if we can avoid wasting memory. */ if (syms) - syms = (asymbol **) bfd_realloc (abfd, syms, + { + asymbol **osyms = syms; + syms = (asymbol **) bfd_alloc (abfd, ((symcount + num_sections + 1) * sizeof (asymbol *))); + memcpy (syms, osyms, symcount * sizeof (asymbol *)); + } else -#endif syms = (asymbol **) bfd_alloc (abfd, (num_sections + 1) * sizeof (asymbol *)); if (!syms) @@ -1573,8 +1590,12 @@ elf_map_symbols (abfd) for (asect = abfd->sections; asect; asect = asect->next) { - if (sect_syms[asect->index]) - syms[symcount++] = sect_syms[asect->index]; + if (sect_syms[asect->index] != NULL + && sect_syms[asect->index]->flags == 0) + { + sect_syms[asect->index]->flags = BSF_SECTION_SYM; + syms[symcount++] = sect_syms[asect->index]; + } } syms[symcount] = (asymbol *) 0; @@ -1699,8 +1720,8 @@ assign_file_position_for_section (i_shdrp, offset, align) offset = BFD_ALIGN (offset, al); } i_shdrp->sh_offset = offset; - if (i_shdrp->rawdata != NULL) - ((asection *) i_shdrp->rawdata)->filepos = offset; + if (i_shdrp->bfd_section != NULL) + i_shdrp->bfd_section->filepos = offset; if (i_shdrp->sh_type != SHT_NOBITS) offset += i_shdrp->sh_size; return offset; @@ -2395,7 +2416,6 @@ swap_out_syms (abfd) symstrtab_hdr->sh_link = 0; symstrtab_hdr->sh_info = 0; symstrtab_hdr->sh_addralign = 1; - symstrtab_hdr->size = 0; } return true; @@ -2524,52 +2544,18 @@ NAME(bfd_elf,write_object_contents) (abfd) return write_shdrs_and_ehdr (abfd); } -/* Given an index of a section, retrieve a pointer to it. Note - that for our purposes, sections are indexed by {1, 2, ...} with - 0 being an illegal index. */ - -/* In the original, each ELF section went into exactly one BFD - section. This doesn't really make sense, so we need a real mapping. - The mapping has to hide in the Elf_Internal_Shdr since asection - doesn't have anything like a tdata field... */ +/* Given an ELF section number, retrieve the corresponding BFD + section. */ static asection * section_from_elf_index (abfd, index) bfd *abfd; unsigned int index; { - /* @@ Is bfd_com_section_ptr really correct in all the places it could - be returned from this routine? */ - - if (index == SHN_ABS) - return bfd_com_section_ptr; /* not abs? */ - if (index == SHN_COMMON) - return bfd_com_section_ptr; - + BFD_ASSERT (index > 0 && index < SHN_LORESERVE); if (index >= elf_elfheader (abfd)->e_shnum) return NULL; - - { - Elf_Internal_Shdr *hdr = elf_elfsections (abfd)[index]; - - switch (hdr->sh_type) - { - /* ELF sections that map to BFD sections */ - case SHT_PROGBITS: - case SHT_NOBITS: - case SHT_HASH: - case SHT_DYNAMIC: - if (hdr->rawdata == NULL) - { - if (! bfd_section_from_shdr (abfd, index)) - return NULL; - } - return (struct sec *) hdr->rawdata; - - default: - return bfd_abs_section_ptr; - } - } + return elf_elfsections (abfd)[index]->bfd_section; } /* given a section, search the header to find them... */ @@ -2578,6 +2564,7 @@ elf_section_from_bfd_section (abfd, asect) bfd *abfd; struct sec *asect; { + struct elf_backend_data *bed = get_elf_backend_data (abfd); Elf_Internal_Shdr **i_shdrp = elf_elfsections (abfd); int index; Elf_Internal_Shdr *hdr; @@ -2599,56 +2586,20 @@ elf_section_from_bfd_section (abfd, asect) for (index = 0; index < maxindex; index++) { hdr = i_shdrp[index]; - switch (hdr->sh_type) - { - /* ELF sections that map to BFD sections */ - case SHT_PROGBITS: - case SHT_NOBITS: - case SHT_NOTE: - case SHT_HASH: - case SHT_DYNAMIC: - case SHT_DYNSYM: - case SHT_SYMTAB: - if (hdr->rawdata) - { - if (((struct sec *) (hdr->rawdata)) == asect) - return index; - } - break; - - case SHT_REL: - case SHT_RELA: - /* We sometimes map a reloc section to a BFD section. */ - if (hdr->sh_link != elf_onesymtab (abfd) - && (asection *) hdr->rawdata == asect) - return index; - break; + if (hdr->bfd_section == asect) + return index; - case SHT_STRTAB: - /* We map most string tables to BFD sections. */ - if (index != elf_elfheader (abfd)->e_shstrndx - && index != elf_onesymtab (abfd) - && (asection *) hdr->rawdata == asect) - return index; - - /* FALL THROUGH */ - default: - { - struct elf_backend_data *bed = get_elf_backend_data (abfd); - - if (bed->elf_backend_section_from_bfd_section) - { - int retval; + if (bed->elf_backend_section_from_bfd_section) + { + int retval; - retval = index; - if ((*bed->elf_backend_section_from_bfd_section) - (abfd, hdr, asect, &retval)) - return retval; - } - } - break; + retval = index; + if ((*bed->elf_backend_section_from_bfd_section) + (abfd, hdr, asect, &retval)) + return retval; } } + return -1; } @@ -3073,9 +3024,6 @@ elf_debug_section (str, num, hdr) (long) hdr->sh_addralign); fprintf (stderr, "sh_entsize = %ld\n", (long) hdr->sh_entsize); - fprintf (stderr, "rawdata = 0x%.8lx\n", (long) hdr->rawdata); - fprintf (stderr, "contents = 0x%.8lx\n", (long) hdr->contents); - fprintf (stderr, "size = %ld\n", (long) hdr->size); fflush (stderr); } @@ -4203,9 +4151,10 @@ elf_link_add_object_symbols (abfd, info) else if (sym.st_shndx > 0 && sym.st_shndx < SHN_LORESERVE) { sec = section_from_elf_index (abfd, sym.st_shndx); - if (sec == NULL) - goto error_return; - value -= sec->vma; + if (sec != NULL) + value -= sec->vma; + else + sec = bfd_abs_section_ptr; } else if (sym.st_shndx == SHN_ABS) sec = bfd_abs_section_ptr; @@ -5389,7 +5338,7 @@ elf_bfd_final_link (abfd, info) for (i = 1; i < elf_elfheader (abfd)->e_shnum; i++) { o = section_from_elf_index (abfd, i); - if (! bfd_is_abs_section (o)) + if (o != NULL) o->target_index = abfd->symcount; elfsym.st_shndx = i; if (! elf_link_output_sym (&finfo, (const char *) NULL, @@ -6034,11 +5983,7 @@ elf_link_input_bfd (finfo, input_bfd) if (isym->st_shndx == SHN_UNDEF) isec = bfd_und_section_ptr; else if (isym->st_shndx > 0 && isym->st_shndx < SHN_LORESERVE) - { - isec = section_from_elf_index (input_bfd, isym->st_shndx); - if (isec == NULL) - return false; - } + isec = section_from_elf_index (input_bfd, isym->st_shndx); else if (isym->st_shndx == SHN_ABS) isec = bfd_abs_section_ptr; else if (isym->st_shndx == SHN_COMMON) diff --git a/bfd/libelf.h b/bfd/libelf.h index 6edc9a3..5000e20 100644 --- a/bfd/libelf.h +++ b/bfd/libelf.h @@ -449,7 +449,6 @@ struct elf_obj_tdata int num_globals; Elf_Sym_Extra *sym_extra; asymbol **section_syms; /* STT_SECTION symbols for each section */ - int num_section_syms; /* number of section_syms allocated */ Elf_Internal_Shdr symtab_hdr; Elf_Internal_Shdr shstrtab_hdr; Elf_Internal_Shdr strtab_hdr; @@ -499,7 +498,6 @@ struct elf_obj_tdata #define elf_num_globals(bfd) (elf_tdata(bfd) -> num_globals) #define elf_sym_extra(bfd) (elf_tdata(bfd) -> sym_extra) #define elf_section_syms(bfd) (elf_tdata(bfd) -> section_syms) -#define elf_num_section_syms(bfd) (elf_tdata(bfd) -> num_section_syms) #define core_prpsinfo(bfd) (elf_tdata(bfd) -> prpsinfo) #define core_prstatus(bfd) (elf_tdata(bfd) -> prstatus) #define elf_gp(bfd) (elf_tdata(bfd) -> gp) |