X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-rx.c;h=3f03ab21f09cf4f7a149232e131a4e60a8886e13;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=058e086008fa173338492b319ef2053d3a4d3cb7;hpb=6346d5ca43719ba6fc3176c29fd58a83d439f011;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c index 058e086008..3f03ab21f0 100644 --- a/bfd/elf32-rx.c +++ b/bfd/elf32-rx.c @@ -1,5 +1,5 @@ /* Renesas RX specific support for 32-bit ELF. - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2020 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -15,11 +15,11 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ #include "sysdep.h" #include "bfd.h" -#include "bfd_stdint.h" #include "libbfd.h" #include "elf-bfd.h" #include "elf/rx.h" @@ -49,15 +49,15 @@ void rx_dump_symtab (bfd *, void *, void *); static reloc_howto_type rx_elf_howto_table [] = { - RXREL (NONE, 3, 0, 0, dont, FALSE), - RXREL (DIR32, 2, 32, 0, signed, FALSE), + RXREL (NONE, 3, 0, 0, dont, FALSE), + RXREL (DIR32, 2, 32, 0, signed, FALSE), RXREL (DIR24S, 2, 24, 0, signed, FALSE), - RXREL (DIR16, 1, 16, 0, dont, FALSE), + RXREL (DIR16, 1, 16, 0, dont, FALSE), RXREL (DIR16U, 1, 16, 0, unsigned, FALSE), RXREL (DIR16S, 1, 16, 0, signed, FALSE), - RXREL (DIR8, 0, 8, 0, dont, FALSE), - RXREL (DIR8U, 0, 8, 0, unsigned, FALSE), - RXREL (DIR8S, 0, 8, 0, signed, FALSE), + RXREL (DIR8, 0, 8, 0, dont, FALSE), + RXREL (DIR8U, 0, 8, 0, unsigned, FALSE), + RXREL (DIR8S, 0, 8, 0, signed, FALSE), RXREL (DIR24S_PCREL, 2, 24, 0, signed, TRUE), RXREL (DIR16S_PCREL, 1, 16, 0, signed, TRUE), RXREL (DIR8S_PCREL, 0, 8, 0, signed, TRUE), @@ -65,9 +65,9 @@ static reloc_howto_type rx_elf_howto_table [] = RXREL (DIR16UW, 1, 16, 1, unsigned, FALSE), RXREL (DIR8UL, 0, 8, 2, unsigned, FALSE), RXREL (DIR8UW, 0, 8, 1, unsigned, FALSE), - RXREL (DIR32_REV, 1, 16, 0, dont, FALSE), - RXREL (DIR16_REV, 1, 16, 0, dont, FALSE), - RXREL (DIR3U_PCREL, 0, 3, 0, dont, TRUE), + RXREL (DIR32_REV, 1, 16, 0, dont, FALSE), + RXREL (DIR16_REV, 1, 16, 0, dont, FALSE), + RXREL (DIR3U_PCREL, 0, 3, 0, dont, TRUE), EMPTY_HOWTO (0x13), EMPTY_HOWTO (0x14), @@ -83,20 +83,20 @@ static reloc_howto_type rx_elf_howto_table [] = EMPTY_HOWTO (0x1e), EMPTY_HOWTO (0x1f), - RXREL (RH_3_PCREL, 0, 3, 0, signed, TRUE), - RXREL (RH_16_OP, 1, 16, 0, signed, FALSE), - RXREL (RH_24_OP, 2, 24, 0, signed, FALSE), - RXREL (RH_32_OP, 2, 32, 0, signed, FALSE), + RXREL (RH_3_PCREL, 0, 3, 0, signed, TRUE), + RXREL (RH_16_OP, 1, 16, 0, signed, FALSE), + RXREL (RH_24_OP, 2, 24, 0, signed, FALSE), + RXREL (RH_32_OP, 2, 32, 0, signed, FALSE), RXREL (RH_24_UNS, 2, 24, 0, unsigned, FALSE), - RXREL (RH_8_NEG, 0, 8, 0, signed, FALSE), - RXREL (RH_16_NEG, 1, 16, 0, signed, FALSE), - RXREL (RH_24_NEG, 2, 24, 0, signed, FALSE), - RXREL (RH_32_NEG, 2, 32, 0, signed, FALSE), - RXREL (RH_DIFF, 2, 32, 0, signed, FALSE), + RXREL (RH_8_NEG, 0, 8, 0, signed, FALSE), + RXREL (RH_16_NEG, 1, 16, 0, signed, FALSE), + RXREL (RH_24_NEG, 2, 24, 0, signed, FALSE), + RXREL (RH_32_NEG, 2, 32, 0, signed, FALSE), + RXREL (RH_DIFF, 2, 32, 0, signed, FALSE), RXREL (RH_GPRELB, 1, 16, 0, unsigned, FALSE), RXREL (RH_GPRELW, 1, 16, 0, unsigned, FALSE), RXREL (RH_GPRELL, 1, 16, 0, unsigned, FALSE), - RXREL (RH_RELAX, 0, 0, 0, dont, FALSE), + RXREL (RH_RELAX, 0, 0, 0, dont, FALSE), EMPTY_HOWTO (0x2e), EMPTY_HOWTO (0x2f), @@ -118,14 +118,14 @@ static reloc_howto_type rx_elf_howto_table [] = EMPTY_HOWTO (0x3f), EMPTY_HOWTO (0x40), - RXREL (ABS32, 2, 32, 0, dont, FALSE), + RXREL (ABS32, 2, 32, 0, dont, FALSE), RXREL (ABS24S, 2, 24, 0, signed, FALSE), - RXREL (ABS16, 1, 16, 0, dont, FALSE), + RXREL (ABS16, 1, 16, 0, dont, FALSE), RXREL (ABS16U, 1, 16, 0, unsigned, FALSE), RXREL (ABS16S, 1, 16, 0, signed, FALSE), - RXREL (ABS8, 0, 8, 0, dont, FALSE), - RXREL (ABS8U, 0, 8, 0, unsigned, FALSE), - RXREL (ABS8S, 0, 8, 0, signed, FALSE), + RXREL (ABS8, 0, 8, 0, dont, FALSE), + RXREL (ABS8U, 0, 8, 0, unsigned, FALSE), + RXREL (ABS8S, 0, 8, 0, signed, FALSE), RXREL (ABS24S_PCREL, 2, 24, 0, signed, TRUE), RXREL (ABS16S_PCREL, 1, 16, 0, signed, TRUE), RXREL (ABS8S_PCREL, 0, 8, 0, signed, TRUE), @@ -133,8 +133,8 @@ static reloc_howto_type rx_elf_howto_table [] = RXREL (ABS16UW, 1, 16, 0, unsigned, FALSE), RXREL (ABS8UL, 0, 8, 0, unsigned, FALSE), RXREL (ABS8UW, 0, 8, 0, unsigned, FALSE), - RXREL (ABS32_REV, 2, 32, 0, dont, FALSE), - RXREL (ABS16_REV, 1, 16, 0, dont, FALSE), + RXREL (ABS32_REV, 2, 32, 0, dont, FALSE), + RXREL (ABS16_REV, 1, 16, 0, dont, FALSE), #define STACK_REL_P(x) ((x) <= R_RX_ABS16_REV && (x) >= R_RX_ABS32) @@ -181,42 +181,42 @@ static reloc_howto_type rx_elf_howto_table [] = /* A 5-bit unsigned displacement to a B/W/L address, at bit position 8/12. */ /* ---- ---- 4--- 3210. */ #define R_RX_RH_ABS5p8B 0x78 - RXREL (RH_ABS5p8B, 0, 0, 0, dont, FALSE), + RXREL (RH_ABS5p8B, 0, 0, 0, dont, FALSE), #define R_RX_RH_ABS5p8W 0x79 - RXREL (RH_ABS5p8W, 0, 0, 0, dont, FALSE), + RXREL (RH_ABS5p8W, 0, 0, 0, dont, FALSE), #define R_RX_RH_ABS5p8L 0x7a - RXREL (RH_ABS5p8L, 0, 0, 0, dont, FALSE), + RXREL (RH_ABS5p8L, 0, 0, 0, dont, FALSE), /* A 5-bit unsigned displacement to a B/W/L address, at bit position 5/12. */ /* ---- -432 1--- 0---. */ #define R_RX_RH_ABS5p5B 0x7b - RXREL (RH_ABS5p5B, 0, 0, 0, dont, FALSE), + RXREL (RH_ABS5p5B, 0, 0, 0, dont, FALSE), #define R_RX_RH_ABS5p5W 0x7c - RXREL (RH_ABS5p5W, 0, 0, 0, dont, FALSE), + RXREL (RH_ABS5p5W, 0, 0, 0, dont, FALSE), #define R_RX_RH_ABS5p5L 0x7d - RXREL (RH_ABS5p5L, 0, 0, 0, dont, FALSE), + RXREL (RH_ABS5p5L, 0, 0, 0, dont, FALSE), /* A 4-bit unsigned immediate at bit position 8. */ #define R_RX_RH_UIMM4p8 0x7e - RXREL (RH_UIMM4p8, 0, 0, 0, dont, FALSE), + RXREL (RH_UIMM4p8, 0, 0, 0, dont, FALSE), /* A 4-bit negative unsigned immediate at bit position 8. */ #define R_RX_RH_UNEG4p8 0x7f - RXREL (RH_UNEG4p8, 0, 0, 0, dont, FALSE), + RXREL (RH_UNEG4p8, 0, 0, 0, dont, FALSE), /* End of internal relocs. */ - RXREL (SYM, 2, 32, 0, dont, FALSE), - RXREL (OPneg, 2, 32, 0, dont, FALSE), - RXREL (OPadd, 2, 32, 0, dont, FALSE), - RXREL (OPsub, 2, 32, 0, dont, FALSE), - RXREL (OPmul, 2, 32, 0, dont, FALSE), - RXREL (OPdiv, 2, 32, 0, dont, FALSE), + RXREL (SYM, 2, 32, 0, dont, FALSE), + RXREL (OPneg, 2, 32, 0, dont, FALSE), + RXREL (OPadd, 2, 32, 0, dont, FALSE), + RXREL (OPsub, 2, 32, 0, dont, FALSE), + RXREL (OPmul, 2, 32, 0, dont, FALSE), + RXREL (OPdiv, 2, 32, 0, dont, FALSE), RXREL (OPshla, 2, 32, 0, dont, FALSE), RXREL (OPshra, 2, 32, 0, dont, FALSE), RXREL (OPsctsize, 2, 32, 0, dont, FALSE), RXREL (OPscttop, 2, 32, 0, dont, FALSE), - RXREL (OPand, 2, 32, 0, dont, FALSE), - RXREL (OPor, 2, 32, 0, dont, FALSE), - RXREL (OPxor, 2, 32, 0, dont, FALSE), - RXREL (OPnot, 2, 32, 0, dont, FALSE), - RXREL (OPmod, 2, 32, 0, dont, FALSE), + RXREL (OPand, 2, 32, 0, dont, FALSE), + RXREL (OPor, 2, 32, 0, dont, FALSE), + RXREL (OPxor, 2, 32, 0, dont, FALSE), + RXREL (OPnot, 2, 32, 0, dont, FALSE), + RXREL (OPmod, 2, 32, 0, dont, FALSE), RXREL (OPromtop, 2, 32, 0, dont, FALSE), RXREL (OPramtop, 2, 32, 0, dont, FALSE) }; @@ -226,7 +226,7 @@ static reloc_howto_type rx_elf_howto_table [] = struct rx_reloc_map { bfd_reloc_code_real_type bfd_reloc_val; - unsigned int rx_reloc_val; + unsigned int rx_reloc_val; }; static const struct rx_reloc_map rx_reloc_map [] = @@ -269,7 +269,7 @@ static const struct rx_reloc_map rx_reloc_map [] = #define BIGE(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_BIG) static reloc_howto_type * -rx_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED, +rx_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED, bfd_reloc_code_real_type code) { unsigned int i; @@ -277,7 +277,7 @@ rx_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED, if (code == BFD_RELOC_RX_32_OP) return rx_elf_howto_table + R_RX_DIR32; - for (i = ARRAY_SIZE (rx_reloc_map); --i;) + for (i = ARRAY_SIZE (rx_reloc_map); i--;) if (rx_reloc_map [i].bfd_reloc_val == code) return rx_elf_howto_table + rx_reloc_map[i].rx_reloc_val; @@ -299,9 +299,9 @@ rx_reloc_name_lookup (bfd * abfd ATTRIBUTE_UNUSED, const char * r_name) /* Set the howto pointer for an RX ELF reloc. */ -static void -rx_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, - arelent * cache_ptr, +static bfd_boolean +rx_info_to_howto_rela (bfd * abfd, + arelent * cache_ptr, Elf_Internal_Rela * dst) { unsigned int r_type; @@ -309,18 +309,29 @@ rx_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_RX_max) { - _bfd_error_handler (_("%A: invalid RX reloc number: %d"), abfd, r_type); - r_type = 0; + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), + abfd, r_type); + bfd_set_error (bfd_error_bad_value); + return FALSE; } cache_ptr->howto = rx_elf_howto_table + r_type; + if (cache_ptr->howto->name == NULL) + { + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), + abfd, r_type); + bfd_set_error (bfd_error_bad_value); + return FALSE; + } + return TRUE; } static bfd_vma -get_symbol_value (const char * name, - bfd_reloc_status_type * status, +get_symbol_value (const char * name, struct bfd_link_info * info, - bfd * input_bfd, - asection * input_section, + bfd * input_bfd, + asection * input_section, int offset) { bfd_vma value = 0; @@ -331,7 +342,7 @@ get_symbol_value (const char * name, if (h == NULL || (h->type != bfd_link_hash_defined && h->type != bfd_link_hash_defweak)) - * status = info->callbacks->undefined_symbol + (*info->callbacks->undefined_symbol) (info, name, input_bfd, input_section, offset, TRUE); else value = (h->u.def.value @@ -340,8 +351,9 @@ get_symbol_value (const char * name, return value; } + static bfd_vma -get_symbol_value_maybe (const char * name, +get_symbol_value_maybe (const char * name, struct bfd_link_info * info) { bfd_vma value = 0; @@ -362,10 +374,9 @@ get_symbol_value_maybe (const char * name, } static bfd_vma -get_gp (bfd_reloc_status_type * status, - struct bfd_link_info * info, - bfd * abfd, - asection * sec, +get_gp (struct bfd_link_info * info, + bfd * abfd, + asection * sec, int offset) { static bfd_boolean cached = FALSE; @@ -373,17 +384,16 @@ get_gp (bfd_reloc_status_type * status, if (!cached) { - cached_value = get_symbol_value ("__gp", status, info, abfd, sec, offset); + cached_value = get_symbol_value ("__gp", info, abfd, sec, offset); cached = TRUE; } return cached_value; } static bfd_vma -get_romstart (bfd_reloc_status_type * status, - struct bfd_link_info * info, - bfd * abfd, - asection * sec, +get_romstart (struct bfd_link_info * info, + bfd * abfd, + asection * sec, int offset) { static bfd_boolean cached = FALSE; @@ -391,17 +401,16 @@ get_romstart (bfd_reloc_status_type * status, if (!cached) { - cached_value = get_symbol_value ("_start", status, info, abfd, sec, offset); + cached_value = get_symbol_value ("_start", info, abfd, sec, offset); cached = TRUE; } return cached_value; } static bfd_vma -get_ramstart (bfd_reloc_status_type * status, - struct bfd_link_info * info, - bfd * abfd, - asection * sec, +get_ramstart (struct bfd_link_info * info, + bfd * abfd, + asection * sec, int offset) { static bfd_boolean cached = FALSE; @@ -409,7 +418,7 @@ get_ramstart (bfd_reloc_status_type * status, if (!cached) { - cached_value = get_symbol_value ("__datastart", status, info, abfd, sec, offset); + cached_value = get_symbol_value ("__datastart", info, abfd, sec, offset); cached = TRUE; } return cached_value; @@ -423,9 +432,9 @@ static unsigned int rx_stack_top; do \ { \ if (rx_stack_top < NUM_STACK_ENTRIES) \ - rx_stack [rx_stack_top ++] = (val); \ + rx_stack [rx_stack_top ++] = (val); \ else \ - r = bfd_reloc_dangerous; \ + r = bfd_reloc_dangerous; \ } \ while (0) @@ -433,9 +442,9 @@ static unsigned int rx_stack_top; do \ { \ if (rx_stack_top > 0) \ - (dest) = rx_stack [-- rx_stack_top]; \ + (dest) = rx_stack [-- rx_stack_top]; \ else \ - (dest) = 0, r = bfd_reloc_dangerous; \ + (dest) = 0, r = bfd_reloc_dangerous; \ } \ while (0) @@ -474,19 +483,19 @@ static unsigned int rx_stack_top; static bfd_boolean rx_elf_relocate_section - (bfd * output_bfd, + (bfd * output_bfd, struct bfd_link_info * info, - bfd * input_bfd, - asection * input_section, - bfd_byte * contents, + bfd * input_bfd, + asection * input_section, + bfd_byte * contents, Elf_Internal_Rela * relocs, - Elf_Internal_Sym * local_syms, - asection ** local_sections) + Elf_Internal_Sym * local_syms, + asection ** local_sections) { - Elf_Internal_Shdr * symtab_hdr; + Elf_Internal_Shdr * symtab_hdr; struct elf_link_hash_entry ** sym_hashes; - Elf_Internal_Rela * rel; - Elf_Internal_Rela * relend; + Elf_Internal_Rela * rel; + Elf_Internal_Rela * relend; bfd_boolean pid_mode; bfd_boolean saw_subtract = FALSE; const char * table_default_cache = NULL; @@ -503,22 +512,22 @@ rx_elf_relocate_section relend = relocs + input_section->reloc_count; for (rel = relocs; rel < relend; rel ++) { - reloc_howto_type * howto; - unsigned long r_symndx; - Elf_Internal_Sym * sym; - asection * sec; + reloc_howto_type * howto; + unsigned long r_symndx; + Elf_Internal_Sym * sym; + asection * sec; struct elf_link_hash_entry * h; - bfd_vma relocation; - bfd_reloc_status_type r; - const char * name = NULL; - bfd_boolean unresolved_reloc = TRUE; - int r_type; + bfd_vma relocation; + bfd_reloc_status_type r; + const char * name = NULL; + bfd_boolean unresolved_reloc = TRUE; + int r_type; r_type = ELF32_R_TYPE (rel->r_info); r_symndx = ELF32_R_SYM (rel->r_info); howto = rx_elf_howto_table + ELF32_R_TYPE (rel->r_info); - h = NULL; + h = NULL; sym = NULL; sec = NULL; relocation = 0; @@ -534,7 +543,7 @@ rx_elf_relocate_section name = bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link, sym->st_name); - name = (sym->st_name == 0) ? bfd_section_name (input_bfd, sec) : name; + name = sym->st_name == 0 ? bfd_section_name (sec) : name; } else { @@ -553,7 +562,6 @@ rx_elf_relocate_section bfd_vma entry_vma; int idx; char *buf; - bfd_reloc_status_type tstat = 0; if (table_default_cache != name) { @@ -568,21 +576,19 @@ rx_elf_relocate_section /* We have already done error checking in rx_table_find(). */ - buf = (char *) malloc (13 + strlen (name + 20)); + buf = (char *) bfd_malloc (13 + strlen (name + 20)); + if (buf == NULL) + return FALSE; sprintf (buf, "$tablestart$%s", name + 20); - tstat = 0; table_start_cache = get_symbol_value (buf, - &tstat, info, input_bfd, input_section, rel->r_offset); sprintf (buf, "$tableend$%s", name + 20); - tstat = 0; table_end_cache = get_symbol_value (buf, - &tstat, info, input_bfd, input_section, @@ -597,13 +603,15 @@ rx_elf_relocate_section if (table_end_cache <= entry_vma || entry_vma < table_start_cache) { - _bfd_error_handler (_("%B:%A: table entry %s outside table"), + /* xgettext:c-format */ + _bfd_error_handler (_("%pB:%pA: table entry %s outside table"), input_bfd, input_section, name); } else if ((int) (entry_vma - table_start_cache) % 4) { - _bfd_error_handler (_("%B:%A: table entry %s not word-aligned within table"), + /* xgettext:c-format */ + _bfd_error_handler (_("%pB:%pA: table entry %s not word-aligned within table"), input_bfd, input_section, name); } @@ -612,7 +620,10 @@ rx_elf_relocate_section idx = (int) (entry_vma - table_start_cache) / 4; /* This will look like $tableentry$$ */ - buf = (char *) malloc (12 + 20 + strlen (name + 20)); + buf = (char *) bfd_malloc (12 + 20 + strlen (name + 20)); + if (buf == NULL) + return FALSE; + sprintf (buf, "$tableentry$%d$%s", idx, name + 20); h = (struct elf_link_hash_entry *) bfd_link_hash_lookup (info->hash, buf, FALSE, FALSE, TRUE); @@ -632,12 +643,12 @@ rx_elf_relocate_section RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section, rel, 1, relend, howto, 0, contents); - if (info->relocatable) + if (bfd_link_relocatable (info)) { /* This is a relocatable 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. */ + 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 (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION) rel->r_addend += sec->output_offset; continue; @@ -664,12 +675,20 @@ rx_elf_relocate_section r = bfd_reloc_ok; -#define RANGE(a,b) if (a > (long) relocation || (long) relocation > b) r = bfd_reloc_overflow -#define ALIGN(m) if (relocation & m) r = bfd_reloc_other; -#define OP(i) (contents[rel->r_offset + (i)]) +#define RANGE(a,b) \ + if (a > (long) relocation || (long) relocation > b) \ + r = bfd_reloc_overflow +#define ALIGN(m) \ + if (relocation & m) \ + r = bfd_reloc_other +#define OP(i) \ + (contents[rel->r_offset + (i)]) #define WARN_REDHAT(type) \ - _bfd_error_handler (_("%B:%A: Warning: deprecated Red Hat reloc " type " detected against: %s."), \ - input_bfd, input_section, name) + /* xgettext:c-format */ \ + _bfd_error_handler \ + (_("%pB:%pA: warning: deprecated Red Hat reloc " \ + "%s detected against: %s"), \ + input_bfd, input_section, #type, name) /* Check for unsafe relocs in PID mode. These are any relocs where an absolute address is being computed. There are special cases @@ -679,16 +698,20 @@ rx_elf_relocate_section do \ { \ if (pid_mode \ - && sec != NULL \ + && sec != NULL \ && sec->flags & SEC_READONLY \ && !(input_section->flags & SEC_DEBUGGING) \ && strcmp (name, "__pid_base") != 0 \ && strcmp (name, "__gp") != 0 \ && strcmp (name, "__romdatastart") != 0 \ && !saw_subtract) \ - _bfd_error_handler (_("%B(%A): unsafe PID relocation %s at 0x%08lx (against %s in %s)"), \ + /* xgettext:c-format */ \ + _bfd_error_handler (_("%pB(%pA): unsafe PID relocation %s " \ + "at %#" PRIx64 " (against %s in %s)"), \ input_bfd, input_section, howto->name, \ - input_section->output_section->vma + input_section->output_offset + rel->r_offset, \ + (uint64_t) (input_section->output_section->vma \ + + input_section->output_offset \ + + rel->r_offset), \ name, sec->name); \ } \ while (0) @@ -712,6 +735,7 @@ rx_elf_relocate_section case R_RX_RH_8_NEG: WARN_REDHAT ("RX_RH_8_NEG"); relocation = - relocation; + /* Fall through. */ case R_RX_DIR8S_PCREL: UNSAFE_FOR_PID; RANGE (-128, 127); @@ -733,6 +757,7 @@ rx_elf_relocate_section case R_RX_RH_16_NEG: WARN_REDHAT ("RX_RH_16_NEG"); relocation = - relocation; + /* Fall through. */ case R_RX_DIR16S_PCREL: UNSAFE_FOR_PID; RANGE (-32768, 32767); @@ -817,6 +842,7 @@ rx_elf_relocate_section UNSAFE_FOR_PID; WARN_REDHAT ("RX_RH_24_NEG"); relocation = - relocation; + /* Fall through. */ case R_RX_DIR24S_PCREL: RANGE (-0x800000, 0x7fffff); #if RX_OPCODE_BIG_ENDIAN @@ -956,7 +982,7 @@ rx_elf_relocate_section case R_RX_RH_GPRELB: WARN_REDHAT ("RX_RH_GPRELB"); - relocation -= get_gp (&r, info, input_bfd, input_section, rel->r_offset); + relocation -= get_gp (info, input_bfd, input_section, rel->r_offset); RANGE (0, 65535); #if RX_OPCODE_BIG_ENDIAN OP (1) = relocation; @@ -969,7 +995,7 @@ rx_elf_relocate_section case R_RX_RH_GPRELW: WARN_REDHAT ("RX_RH_GPRELW"); - relocation -= get_gp (&r, info, input_bfd, input_section, rel->r_offset); + relocation -= get_gp (info, input_bfd, input_section, rel->r_offset); ALIGN (1); relocation >>= 1; RANGE (0, 65535); @@ -984,7 +1010,7 @@ rx_elf_relocate_section case R_RX_RH_GPRELL: WARN_REDHAT ("RX_RH_GPRELL"); - relocation -= get_gp (&r, info, input_bfd, input_section, rel->r_offset); + relocation -= get_gp (info, input_bfd, input_section, rel->r_offset); ALIGN (3); relocation >>= 2; RANGE (0, 65535); @@ -1240,6 +1266,7 @@ rx_elf_relocate_section case R_RX_ABS8S: UNSAFE_FOR_PID; + /* Fall through. */ case R_RX_ABS8S_PCREL: RX_STACK_POP (relocation); RANGE (-128, 127); @@ -1262,7 +1289,8 @@ rx_elf_relocate_section + sec->output_offset + rel->r_addend); else - _bfd_error_handler (_("Warning: RX_SYM reloc with an unknown symbol")); + _bfd_error_handler + (_("warning: RX_SYM reloc with an unknown symbol")); } break; @@ -1407,11 +1435,11 @@ rx_elf_relocate_section break; case R_RX_OPromtop: - RX_STACK_PUSH (get_romstart (&r, info, input_bfd, input_section, rel->r_offset)); + RX_STACK_PUSH (get_romstart (info, input_bfd, input_section, rel->r_offset)); break; case R_RX_OPramtop: - RX_STACK_PUSH (get_ramstart (&r, info, input_bfd, input_section, rel->r_offset)); + RX_STACK_PUSH (get_ramstart (info, input_bfd, input_section, rel->r_offset)); break; default: @@ -1429,45 +1457,47 @@ rx_elf_relocate_section /* Catch the case of a missing function declaration and emit a more helpful error message. */ if (r_type == R_RX_DIR24S_PCREL) - msg = _("%B(%A): error: call to undefined function '%s'"); + /* xgettext:c-format */ + msg = _("%pB(%pA): error: call to undefined function '%s'"); else - r = info->callbacks->reloc_overflow + (*info->callbacks->reloc_overflow) (info, (h ? &h->root : NULL), name, howto->name, (bfd_vma) 0, input_bfd, input_section, rel->r_offset); break; case bfd_reloc_undefined: - r = info->callbacks->undefined_symbol - (info, name, input_bfd, input_section, rel->r_offset, - TRUE); + (*info->callbacks->undefined_symbol) + (info, name, input_bfd, input_section, rel->r_offset, TRUE); break; case bfd_reloc_other: - msg = _("%B(%A): warning: unaligned access to symbol '%s' in the small data area"); + /* xgettext:c-format */ + msg = _("%pB(%pA): warning: unaligned access to symbol '%s' in the small data area"); break; case bfd_reloc_outofrange: - msg = _("%B(%A): internal error: out of range error"); + /* xgettext:c-format */ + msg = _("%pB(%pA): internal error: out of range error"); break; case bfd_reloc_notsupported: - msg = _("%B(%A): internal error: unsupported relocation error"); + /* xgettext:c-format */ + msg = _("%pB(%pA): internal error: unsupported relocation error"); break; case bfd_reloc_dangerous: - msg = _("%B(%A): internal error: dangerous relocation"); + /* xgettext:c-format */ + msg = _("%pB(%pA): internal error: dangerous relocation"); break; default: - msg = _("%B(%A): internal error: unknown error"); + /* xgettext:c-format */ + msg = _("%pB(%pA): internal error: unknown error"); break; } if (msg) _bfd_error_handler (msg, input_bfd, input_section, name); - - if (! r) - return FALSE; } } @@ -1531,17 +1561,18 @@ next_smaller_reloc (int r) static bfd_boolean elf32_rx_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, int count, - Elf_Internal_Rela *alignment_rel, int force_snip) + Elf_Internal_Rela *alignment_rel, int force_snip, + Elf_Internal_Rela *irelstart) { Elf_Internal_Shdr * symtab_hdr; - unsigned int sec_shndx; - bfd_byte * contents; + unsigned int sec_shndx; + bfd_byte * contents; Elf_Internal_Rela * irel; Elf_Internal_Rela * irelend; Elf_Internal_Sym * isym; Elf_Internal_Sym * isymend; - bfd_vma toaddr; - unsigned int symcount; + bfd_vma toaddr; + unsigned int symcount; struct elf_link_hash_entry ** sym_hashes; struct elf_link_hash_entry ** end_hashes; @@ -1558,8 +1589,7 @@ elf32_rx_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, int count, if (alignment_rel) toaddr = alignment_rel->r_offset; - irel = elf_section_data (sec)->relocs; - irelend = irel + sec->reloc_count; + BFD_ASSERT (toaddr > addr); /* Actually delete the bytes. */ memmove (contents + addr, contents + addr + count, @@ -1573,8 +1603,12 @@ elf32_rx_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, int count, else memset (contents + toaddr - count, 0x03, count); + irel = irelstart; + BFD_ASSERT (irel != NULL || sec->reloc_count == 0); + irelend = irel + sec->reloc_count; + /* Adjust all the relocs. */ - for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++) + for (; irel < irelend; irel++) { /* Get the new reloc address. */ if (irel->r_offset > addr @@ -1706,16 +1740,16 @@ reloc_bubblesort (Elf_Internal_Rela * r, int count) lrel, abfd, sec, link_info, scale) static bfd_vma -rx_offset_for_reloc (bfd * abfd, +rx_offset_for_reloc (bfd * abfd, Elf_Internal_Rela * rel, Elf_Internal_Shdr * symtab_hdr, - Elf_External_Sym_Shndx * shndx_buf ATTRIBUTE_UNUSED, - Elf_Internal_Sym * intsyms, + bfd_byte * shndx_buf ATTRIBUTE_UNUSED, + Elf_Internal_Sym * intsyms, Elf_Internal_Rela ** lrel, - bfd * input_bfd, - asection * input_section, + bfd * input_bfd, + asection * input_section, struct bfd_link_info * info, - int * scale) + int * scale) { bfd_vma symval; bfd_reloc_status_type r; @@ -1898,11 +1932,11 @@ rx_offset_for_reloc (bfd * abfd, break; case R_RX_OPromtop: - RX_STACK_PUSH (get_romstart (&r, info, input_bfd, input_section, rel->r_offset)); + RX_STACK_PUSH (get_romstart (info, input_bfd, input_section, rel->r_offset)); break; case R_RX_OPramtop: - RX_STACK_PUSH (get_ramstart (&r, info, input_bfd, input_section, rel->r_offset)); + RX_STACK_PUSH (get_ramstart (info, input_bfd, input_section, rel->r_offset)); break; case R_RX_DIR16UL: @@ -1937,6 +1971,8 @@ rx_offset_for_reloc (bfd * abfd, rel ++; } + /* FIXME. */ + (void) r; } static void @@ -1956,26 +1992,25 @@ move_reloc (Elf_Internal_Rela * irel, Elf_Internal_Rela * srel, int delta) /* Relax one section. */ static bfd_boolean -elf32_rx_relax_section (bfd * abfd, - asection * sec, +elf32_rx_relax_section (bfd * abfd, + asection * sec, struct bfd_link_info * link_info, - bfd_boolean * again, - bfd_boolean allow_pcrel3) + bfd_boolean * again, + bfd_boolean allow_pcrel3) { Elf_Internal_Shdr * symtab_hdr; Elf_Internal_Shdr * shndx_hdr; Elf_Internal_Rela * internal_relocs; - Elf_Internal_Rela * free_relocs = NULL; Elf_Internal_Rela * irel; Elf_Internal_Rela * srel; Elf_Internal_Rela * irelend; Elf_Internal_Rela * next_alignment; Elf_Internal_Rela * prev_alignment; - bfd_byte * contents = NULL; - bfd_byte * free_contents = NULL; + bfd_byte * contents = NULL; + bfd_byte * free_contents = NULL; Elf_Internal_Sym * intsyms = NULL; Elf_Internal_Sym * free_intsyms = NULL; - Elf_External_Sym_Shndx * shndx_buf = NULL; + bfd_byte * shndx_buf = NULL; bfd_vma pc; bfd_vma sec_start; bfd_vma symval = 0; @@ -1991,14 +2026,17 @@ elf32_rx_relax_section (bfd * abfd, /* We don't have to do anything for a relocatable link, if this section does not have relocs, or if this is not a code section. */ - if (link_info->relocatable + if (bfd_link_relocatable (link_info) || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 || (sec->flags & SEC_CODE) == 0) return TRUE; - symtab_hdr = &elf_tdata (abfd)->symtab_hdr; - shndx_hdr = &elf_tdata (abfd)->symtab_shndx_hdr; + symtab_hdr = & elf_symtab_hdr (abfd); + if (elf_symtab_shndx_list (abfd)) + shndx_hdr = & elf_symtab_shndx_list (abfd)->hdr; + else + shndx_hdr = NULL; sec_start = sec->output_section->vma + sec->output_offset; @@ -2023,29 +2061,34 @@ elf32_rx_relax_section (bfd * abfd, symtab_hdr->contents = (bfd_byte *) intsyms; } - if (shndx_hdr->sh_size != 0) + if (shndx_hdr && shndx_hdr->sh_size != 0) { - bfd_size_type amt; + size_t amt; - amt = symtab_hdr->sh_info; - amt *= sizeof (Elf_External_Sym_Shndx); - shndx_buf = (Elf_External_Sym_Shndx *) bfd_malloc (amt); - if (shndx_buf == NULL) + if (_bfd_mul_overflow (symtab_hdr->sh_info, + sizeof (Elf_External_Sym_Shndx), &amt)) + { + bfd_set_error (bfd_error_file_too_big); + goto error_return; + } + if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0) goto error_return; - if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0 - || bfd_bread (shndx_buf, amt, abfd) != amt) + shndx_buf = _bfd_malloc_and_read (abfd, amt, amt); + if (shndx_buf == NULL) goto error_return; - shndx_hdr->contents = (bfd_byte *) shndx_buf; + shndx_hdr->contents = shndx_buf; } /* Get a copy of the native relocations. */ - internal_relocs = (_bfd_elf_link_read_relocs - (abfd, sec, NULL, (Elf_Internal_Rela *) NULL, - link_info->keep_memory)); + /* Note - we ignore the setting of link_info->keep_memory when reading + in these relocs. We have to maintain a permanent copy of the relocs + because we are going to walk over them multiple times, adjusting them + as bytes are deleted from the section, and with this relaxation + function itself being called multiple times on the same section... */ + internal_relocs = _bfd_elf_link_read_relocs + (abfd, sec, NULL, (Elf_Internal_Rela *) NULL, TRUE); if (internal_relocs == NULL) goto error_return; - if (! link_info->keep_memory) - free_relocs = internal_relocs; /* The RL_ relocs must be just before the operand relocs they go with, so we must sort them to guarantee this. We use bubblesort @@ -2135,7 +2178,7 @@ elf32_rx_relax_section (bfd * abfd, nbytes *= alignment; elf32_rx_relax_delete_bytes (abfd, sec, erel->r_offset-nbytes, nbytes, next_alignment, - erel->r_offset == sec->size); + erel->r_offset == sec->size, internal_relocs); *again = TRUE; continue; @@ -2154,9 +2197,9 @@ elf32_rx_relax_section (bfd * abfd, reloc entry (such as gp-rel symbols). */ /* Get the value of the symbol referred to by the reloc. Just - in case this is the last reloc in the list, use the RL's - addend to choose between this reloc (no addend) or the next - (yes addend, which means at least one following reloc). */ + in case this is the last reloc in the list, use the RL's + addend to choose between this reloc (no addend) or the next + (yes addend, which means at least one following reloc). */ /* srel points to the "current" reloction for this insn - actually the last reloc for a given operand, which is the one @@ -2174,9 +2217,9 @@ elf32_rx_relax_section (bfd * abfd, nrelocs --; #define SNIPNR(offset, nbytes) \ - elf32_rx_relax_delete_bytes (abfd, sec, (insn - contents) + offset, nbytes, next_alignment, 0); + elf32_rx_relax_delete_bytes (abfd, sec, (insn - contents) + offset, nbytes, next_alignment, 0, internal_relocs); #define SNIP(offset, nbytes, newtype) \ - SNIPNR (offset, nbytes); \ + SNIPNR (offset, nbytes); \ srel->r_info = ELF32_R_INFO (ELF32_R_SYM (srel->r_info), newtype) /* The order of these bit tests must match the order that the @@ -2897,9 +2940,9 @@ elf32_rx_relax_section (bfd * abfd, break; case 0: #if RX_OPCODE_BIG_ENDIAN - imm_val = (ip[0] << 24) | (ip[1] << 16) | (ip[2] << 8) | ip[3]; + imm_val = ((unsigned) ip[0] << 24) | (ip[1] << 16) | (ip[2] << 8) | ip[3]; #else - imm_val = (ip[3] << 24) | (ip[2] << 16) | (ip[1] << 8) | ip[0]; + imm_val = ((unsigned) ip[3] << 24) | (ip[2] << 16) | (ip[1] << 8) | ip[0]; #endif break; } @@ -2994,11 +3037,7 @@ elf32_rx_relax_section (bfd * abfd, return TRUE; error_return: - if (free_relocs != NULL) - free (free_relocs); - - if (free_contents != NULL) - free (free_contents); + free (free_contents); if (shndx_buf != NULL) { @@ -3006,17 +3045,16 @@ elf32_rx_relax_section (bfd * abfd, free (shndx_buf); } - if (free_intsyms != NULL) - free (free_intsyms); + free (free_intsyms); return FALSE; } static bfd_boolean -elf32_rx_relax_section_wrapper (bfd * abfd, - asection * sec, +elf32_rx_relax_section_wrapper (bfd * abfd, + asection * sec, struct bfd_link_info * link_info, - bfd_boolean * again) + bfd_boolean * again) { return elf32_rx_relax_section (abfd, sec, link_info, again, FALSE); } @@ -3074,6 +3112,9 @@ describe_flags (flagword flags) else strcat (buf, ", GCC ABI"); + if (flags & E_FLAG_RX_SINSNS_SET) + strcat (buf, flags & E_FLAG_RX_SINSNS_YES ? ", uses String instructions" : ", bans String instructions"); + return buf; } @@ -3081,8 +3122,9 @@ describe_flags (flagword flags) object file when linking. */ static bfd_boolean -rx_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd) +rx_elf_merge_private_bfd_data (bfd * ibfd, struct bfd_link_info *info) { + bfd *obfd = info->output_bfd; flagword old_flags; flagword new_flags; bfd_boolean error = FALSE; @@ -3100,8 +3142,22 @@ rx_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd) { flagword known_flags; + if (old_flags & E_FLAG_RX_SINSNS_SET) + { + if ((new_flags & E_FLAG_RX_SINSNS_SET) == 0) + { + new_flags &= ~ E_FLAG_RX_SINSNS_MASK; + new_flags |= (old_flags & E_FLAG_RX_SINSNS_MASK); + } + } + else if (new_flags & E_FLAG_RX_SINSNS_SET) + { + old_flags &= ~ E_FLAG_RX_SINSNS_MASK; + old_flags |= (new_flags & E_FLAG_RX_SINSNS_MASK); + } + known_flags = E_FLAG_RX_ABI | E_FLAG_RX_64BIT_DOUBLES - | E_FLAG_RX_DSP | E_FLAG_RX_PID; + | E_FLAG_RX_DSP | E_FLAG_RX_PID | E_FLAG_RX_SINSNS_MASK; if ((old_flags ^ new_flags) & known_flags) { @@ -3114,11 +3170,12 @@ rx_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd) } else { - _bfd_error_handler ("There is a conflict merging the ELF header flags from %s", - bfd_get_filename (ibfd)); - _bfd_error_handler (" the input file's flags: %s", + _bfd_error_handler (_("there is a conflict merging the" + " ELF header flags from %pB"), + ibfd); + _bfd_error_handler (_(" the input file's flags: %s"), describe_flags (new_flags)); - _bfd_error_handler (" the output file's flags: %s", + _bfd_error_handler (_(" the output file's flags: %s"), describe_flags (old_flags)); error = TRUE; } @@ -3158,10 +3215,15 @@ elf32_rx_machine (bfd * abfd ATTRIBUTE_UNUSED) { #if 0 /* FIXME: EF_RX_CPU_MASK collides with E_FLAG_RX_... Need to sort out how these flag bits are used. - For now we assume that the flags are OK. */ + For now we assume that the flags are OK. */ if ((elf_elfheader (abfd)->e_flags & EF_RX_CPU_MASK) == EF_RX_CPU_RX) #endif - return bfd_mach_rx; + if ((elf_elfheader (abfd)->e_flags & E_FLAG_RX_V2)) + return bfd_mach_rx_v2; + else if ((elf_elfheader (abfd)->e_flags & E_FLAG_RX_V3)) + return bfd_mach_rx_v3; + else + return bfd_mach_rx; return 0; } @@ -3172,9 +3234,11 @@ rx_elf_object_p (bfd * abfd) int i; unsigned int u; Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr; - int nphdrs = elf_elfheader (abfd)->e_phnum; + Elf_Internal_Ehdr *ehdr = elf_elfheader (abfd); + int nphdrs = ehdr->e_phnum; sec_ptr bsec; static int saw_be = FALSE; + bfd_vma end_phdroff; /* We never want to automatically choose the non-swapping big-endian target. The user can only get that explicitly, such as with -I @@ -3199,6 +3263,17 @@ rx_elf_object_p (bfd * abfd) corresponds (based on matching file offsets) and use its VMA information to reconstruct the p_vaddr field we clobbered when we wrote it out. */ + /* If PT_LOAD headers include the ELF file header or program headers + then the PT_LOAD header does not start with some section contents. + Making adjustments based on the difference between sh_offset and + p_offset is nonsense in such cases. Exclude them. Note that + since standard linker scripts for RX do not use SIZEOF_HEADERS, + the linker won't normally create PT_LOAD segments covering the + headers so this is mainly for passing the ld testsuite. + FIXME. Why are we looking at non-PT_LOAD headers here? */ + end_phdroff = ehdr->e_ehsize; + if (ehdr->e_phoff != 0) + end_phdroff = ehdr->e_phoff + nphdrs * ehdr->e_phentsize; for (i=0; inum_elf_sections; u++) @@ -3206,7 +3281,10 @@ rx_elf_object_p (bfd * abfd) Elf_Internal_Shdr *sec = elf_tdata(abfd)->elf_sect_ptr[u]; if (phdr[i].p_filesz + && phdr[i].p_offset >= end_phdroff && phdr[i].p_offset <= (bfd_vma) sec->sh_offset + && sec->sh_size > 0 + && sec->sh_type != SHT_NOBITS && (bfd_vma)sec->sh_offset <= phdr[i].p_offset + (phdr[i].p_filesz - 1)) { /* Found one! The difference between the two addresses, @@ -3242,6 +3320,13 @@ rx_elf_object_p (bfd * abfd) return TRUE; } + +static bfd_boolean +rx_linux_object_p (bfd * abfd) +{ + bfd_default_set_arch_mach (abfd, bfd_arch_rx, elf32_rx_machine (abfd)); + return TRUE; +} #ifdef DEBUG @@ -3253,26 +3338,14 @@ rx_dump_symtab (bfd * abfd, void * internal_syms, void * external_syms) Elf_Internal_Sym * isymend; Elf_Internal_Sym * isym; Elf_Internal_Shdr * symtab_hdr; - bfd_boolean free_internal = FALSE, free_external = FALSE; char * st_info_str; char * st_info_stb_str; char * st_other_str; char * st_shndx_str; - if (! internal_syms) - { - internal_syms = bfd_malloc (1000); - free_internal = 1; - } - if (! external_syms) - { - external_syms = bfd_malloc (1000); - free_external = 1; - } - symtab_hdr = &elf_tdata (abfd)->symtab_hdr; locsymcount = symtab_hdr->sh_size / get_elf_backend_data (abfd)->s->sizeof_sym; - if (free_internal) + if (!internal_syms) isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr, symtab_hdr->sh_info, 0, internal_syms, external_syms, NULL); @@ -3324,10 +3397,6 @@ rx_dump_symtab (bfd * abfd, void * internal_syms, void * external_syms) isym->st_other, st_other_str, isym->st_shndx, st_shndx_str); } - if (free_internal) - free (internal_syms); - if (free_external) - free (external_syms); } char * @@ -3349,9 +3418,9 @@ rx_get_reloc (long reloc) what you'd get by default. */ static bfd_boolean -rx_get_section_contents (bfd * abfd, +rx_get_section_contents (bfd * abfd, sec_ptr section, - void * location, + void * location, file_ptr offset, bfd_size_type count) { @@ -3376,11 +3445,11 @@ rx_get_section_contents (bfd * abfd, /* Fetch and swap unaligned bytes at the beginning. */ if (offset % 4) - { + { char buf[4]; rv = _bfd_generic_get_section_contents (abfd, section, buf, - (offset & -4), 4); + (offset & -4), 4); if (!rv) return FALSE; @@ -3418,7 +3487,7 @@ rx_get_section_contents (bfd * abfd, /* Fetch the end bytes. */ rv = _bfd_generic_get_section_contents (abfd, section, buf, - offset + count - end_cnt, 4); + offset + count - end_cnt, 4); if (!rv) return FALSE; @@ -3434,7 +3503,7 @@ rx_get_section_contents (bfd * abfd, #ifdef DJDEBUG static bfd_boolean -rx2_set_section_contents (bfd * abfd, +rx2_set_section_contents (bfd * abfd, sec_ptr section, const void * location, file_ptr offset, @@ -3465,7 +3534,7 @@ rx2_set_section_contents (bfd * abfd, #endif static bfd_boolean -rx_set_section_contents (bfd * abfd, +rx_set_section_contents (bfd * abfd, sec_ptr section, const void * location, file_ptr offset, @@ -3524,7 +3593,7 @@ rx_set_section_contents (bfd * abfd, if (! rv) return rv; - location ++; + location = (bfd_byte *) location + 1; offset ++; count --; caddr ++; @@ -3536,6 +3605,8 @@ rx_set_section_contents (bfd * abfd, char * cloc = (char *) location; swapped_data = (char *) bfd_alloc (abfd, count); + if (swapped_data == NULL) + return FALSE; for (i = 0; i < count; i += 4) { @@ -3550,7 +3621,7 @@ rx_set_section_contents (bfd * abfd, } count -= scount; - location += scount; + location = (bfd_byte *) location + scount; offset += scount; if (count > 0) @@ -3569,7 +3640,7 @@ rx_set_section_contents (bfd * abfd, if (! rv) return rv; - location ++; + location = (bfd_byte *) location + 1; offset ++; count --; caddr ++; @@ -3605,8 +3676,7 @@ rx_final_link (bfd * abfd, struct bfd_link_info * info) } static bfd_boolean -elf32_rx_modify_program_headers (bfd * abfd ATTRIBUTE_UNUSED, - struct bfd_link_info * info ATTRIBUTE_UNUSED) +elf32_rx_modify_headers (bfd *abfd, struct bfd_link_info *info) { const struct elf_backend_data * bed; struct elf_obj_tdata * tdata; @@ -3638,7 +3708,7 @@ elf32_rx_modify_program_headers (bfd * abfd ATTRIBUTE_UNUSED, #endif } - return TRUE; + return _bfd_elf_modify_headers (abfd, info); } /* The default literal sections should always be marked as "code" (i.e., @@ -3646,10 +3716,10 @@ elf32_rx_modify_program_headers (bfd * abfd ATTRIBUTE_UNUSED, when we do not want their contents byte reversed. */ static const struct bfd_elf_special_section elf32_rx_special_sections[] = { - { STRING_COMMA_LEN (".init_array"), 0, SHT_INIT_ARRAY, SHF_ALLOC + SHF_EXECINSTR }, - { STRING_COMMA_LEN (".fini_array"), 0, SHT_FINI_ARRAY, SHF_ALLOC + SHF_EXECINSTR }, + { STRING_COMMA_LEN (".init_array"), 0, SHT_INIT_ARRAY, SHF_ALLOC + SHF_EXECINSTR }, + { STRING_COMMA_LEN (".fini_array"), 0, SHT_FINI_ARRAY, SHF_ALLOC + SHF_EXECINSTR }, { STRING_COMMA_LEN (".preinit_array"), 0, SHT_PREINIT_ARRAY, SHF_ALLOC + SHF_EXECINSTR }, - { NULL, 0, 0, 0, 0 } + { NULL, 0, 0, 0, 0 } }; typedef struct { @@ -3701,21 +3771,25 @@ rx_table_find (struct bfd_hash_entry *vent, void *vinfo) find all the related symbols and mark their sections as SEC_KEEP so we don't garbage collect them. */ - buf = (char *) malloc (12 + 10 + strlen (tname)); + buf = (char *) bfd_malloc (12 + 10 + strlen (tname)); + if (buf == NULL) + return FALSE; sprintf (buf, "$tableend$%s", tname); h = bfd_link_hash_lookup (info->info->hash, buf, FALSE, FALSE, TRUE); if (!h || (h->type != bfd_link_hash_defined && h->type != bfd_link_hash_defweak)) { - _bfd_error_handler (_("%B:%A: table %s missing corresponding %s"), + /* xgettext:c-format */ + _bfd_error_handler (_("%pB:%pA: table %s missing corresponding %s"), abfd, sec, name, buf); return TRUE; } if (h->u.def.section != ent->u.def.section) { - _bfd_error_handler (_("%B:%A: %s and %s must be in the same input section"), + /* xgettext:c-format */ + _bfd_error_handler (_("%pB:%pA: %s and %s must be in the same input section"), h->u.def.section->owner, h->u.def.section, name, buf); return TRUE; @@ -3751,7 +3825,7 @@ rx_table_find (struct bfd_hash_entry *vent, void *vinfo) called once per input object file. */ static bfd_boolean rx_check_directives - (bfd * abfd ATTRIBUTE_UNUSED, + (bfd * abfd ATTRIBUTE_UNUSED, struct bfd_link_info * info ATTRIBUTE_UNUSED) { RX_Table_Info stuff; @@ -3828,7 +3902,9 @@ rx_table_map (struct bfd_hash_entry *vent, void *vinfo) + ent->u.def.section->output_section->vma + ent->u.def.section->output_offset); - buf = (char *) malloc (12 + 10 + strlen (tname)); + buf = (char *) bfd_malloc (12 + 10 + strlen (tname)); + if (buf == NULL) + return FALSE; sprintf (buf, "$tableend$%s", tname); end_addr = get_symbol_value_maybe (buf, info->info); @@ -3848,8 +3924,21 @@ rx_table_map (struct bfd_hash_entry *vent, void *vinfo) info->table_start = start_addr; info->table_size = (int) (end_addr - start_addr) / 4; - info->table_handlers = (bfd_vma *) malloc (info->table_size * sizeof (bfd_vma)); - info->table_entries = (struct bfd_link_hash_entry **) malloc (info->table_size * sizeof (struct bfd_link_hash_entry)); + info->table_handlers = (bfd_vma *) + bfd_malloc (info->table_size * sizeof (bfd_vma)); + if (info->table_handlers == NULL) + { + free (buf); + return FALSE; + } + info->table_entries = (struct bfd_link_hash_entry **) + bfd_malloc (info->table_size * sizeof (struct bfd_link_hash_entry)); + if (info->table_entries == NULL) + { + free (info->table_handlers); + free (buf); + return FALSE; + } for (idx = 0; idx < (int) (end_addr - start_addr) / 4; idx ++) { @@ -3954,9 +4043,9 @@ rx_additional_link_map_text (bfd *obfd, struct bfd_link_info *info, FILE *mapfil #define elf_info_to_howto rx_info_to_howto_rela #define elf_backend_object_p rx_elf_object_p #define elf_backend_relocate_section rx_elf_relocate_section -#define elf_symbol_leading_char ('_') +#define elf_symbol_leading_char ('_') #define elf_backend_can_gc_sections 1 -#define elf_backend_modify_program_headers elf32_rx_modify_program_headers +#define elf_backend_modify_headers elf32_rx_modify_headers #define bfd_elf32_bfd_reloc_type_lookup rx_reloc_type_lookup #define bfd_elf32_bfd_reloc_name_lookup rx_reloc_name_lookup @@ -3967,7 +4056,7 @@ rx_additional_link_map_text (bfd *obfd, struct bfd_link_info *info, FILE *mapfil #define bfd_elf32_set_section_contents rx_set_section_contents #define bfd_elf32_bfd_final_link rx_final_link #define bfd_elf32_bfd_relax_section elf32_rx_relax_section_wrapper -#define elf_backend_special_sections elf32_rx_special_sections +#define elf_backend_special_sections elf32_rx_special_sections #define elf_backend_check_directives rx_check_directives #include "elf32-target.h" @@ -3976,11 +4065,11 @@ rx_additional_link_map_text (bfd *obfd, struct bfd_link_info *info, FILE *mapfil section get/set hooks, for times when we want to preserve the pre-swapped .text sections (like objcopy). */ -#undef TARGET_BIG_SYM +#undef TARGET_BIG_SYM #define TARGET_BIG_SYM rx_elf32_be_ns_vec -#undef TARGET_BIG_NAME +#undef TARGET_BIG_NAME #define TARGET_BIG_NAME "elf32-rx-be-ns" -#undef TARGET_LITTLE_SYM +#undef TARGET_LITTLE_SYM #undef bfd_elf32_get_section_contents #undef bfd_elf32_set_section_contents @@ -3989,3 +4078,18 @@ rx_additional_link_map_text (bfd *obfd, struct bfd_link_info *info, FILE *mapfil #define elf32_bed elf32_rx_be_ns_bed #include "elf32-target.h" + +#undef TARGET_LITTLE_SYM +#define TARGET_LITTLE_SYM rx_elf32_linux_le_vec +#undef TARGET_LITTLE_NAME +#define TARGET_LITTLE_NAME "elf32-rx-linux" +#undef TARGET_BIG_SYM +#undef TARGET_BIG_NAME + +#undef elf_backend_object_p +#define elf_backend_object_p rx_linux_object_p +#undef elf_symbol_leading_char +#undef elf32_bed +#define elf32_bed elf32_rx_le_linux_bed + +#include "elf32-target.h"