From 20135e4cea8994900955e560910b2e675881fa95 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 16 Apr 2009 15:39:48 +0000 Subject: Add new binutils target: moxie --- bfd/ChangeLog | 12 ++ bfd/Makefile.am | 10 ++ bfd/Makefile.in | 10 ++ bfd/archures.c | 4 + bfd/bfd-in2.h | 2 + bfd/coffcode.h | 5 +- bfd/config.bfd | 4 + bfd/configure | 1 + bfd/configure.in | 1 + bfd/cpu-moxie.c | 40 ++++++ bfd/elf32-moxie.c | 378 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ bfd/targets.c | 2 + 12 files changed, 467 insertions(+), 2 deletions(-) create mode 100644 bfd/cpu-moxie.c create mode 100644 bfd/elf32-moxie.c (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6e4b535..0917e65 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,15 @@ +2009-04-15 Anthony Green + + * targets.c: Add moxie support. + * Makefile.am: Ditto. + * Makefile.in: Rebuilt. + * cpu-moxie.c, elf32-moxie.c: New files. + * archures.c: Add moxie support. + * configure.in: Add moxie support. + * configure: Rebuilt. + * config.bfd, archures.c: Add moxie support. + * bfd-in2.h: Rebuilt. + 2009-04-15 Christophe Lyon * elf32-arm.c (elf32_arm_final_link_relocate): Don't convert ARM diff --git a/bfd/Makefile.am b/bfd/Makefile.am index c55450e..683599a 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -74,6 +74,7 @@ ALL_MACHINES = \ cpu-dlx.lo \ cpu-fr30.lo \ cpu-frv.lo \ + cpu-moxie.lo \ cpu-h8300.lo \ cpu-h8500.lo \ cpu-hppa.lo \ @@ -141,6 +142,7 @@ ALL_MACHINES_CFILES = \ cpu-dlx.c \ cpu-fr30.c \ cpu-frv.c \ + cpu-moxie.c \ cpu-h8300.c \ cpu-h8500.c \ cpu-hppa.c \ @@ -258,6 +260,7 @@ BFD32_BACKENDS = \ elf32-dlx.lo \ elf32-fr30.lo \ elf32-frv.lo \ + elf32-moxie.lo \ elf32-gen.lo \ elf32-h8300.lo \ elf32-hppa.lo \ @@ -440,6 +443,7 @@ BFD32_BACKENDS_CFILES = \ elf32-dlx.c \ elf32-fr30.c \ elf32-frv.c \ + elf32-moxie.c \ elf32-gen.c \ elf32-h8300.c \ elf32-hppa.c \ @@ -1119,6 +1123,7 @@ cpu-d30v.lo: cpu-d30v.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-dlx.lo: cpu-dlx.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-fr30.lo: cpu-fr30.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-frv.lo: cpu-frv.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h +cpu-moxie.lo: cpu-moxie.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-h8300.lo: cpu-h8300.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-h8500.lo: cpu-h8500.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-hppa.lo: cpu-hppa.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h @@ -1421,6 +1426,11 @@ elf32-frv.lo: elf32-frv.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/frv.h \ $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/dwarf2.h \ elf32-target.h +elf32-moxie.lo: elf32-moxie.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/moxie.h \ + $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/dwarf2.h \ + elf32-target.h elf32-gen.lo: elf32-gen.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \ $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h elf32-target.h diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 190888e..24c8ee1 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -340,6 +340,7 @@ ALL_MACHINES = \ cpu-dlx.lo \ cpu-fr30.lo \ cpu-frv.lo \ + cpu-moxie.lo \ cpu-h8300.lo \ cpu-h8500.lo \ cpu-hppa.lo \ @@ -407,6 +408,7 @@ ALL_MACHINES_CFILES = \ cpu-dlx.c \ cpu-fr30.c \ cpu-frv.c \ + cpu-moxie.c \ cpu-h8300.c \ cpu-h8500.c \ cpu-hppa.c \ @@ -525,6 +527,7 @@ BFD32_BACKENDS = \ elf32-dlx.lo \ elf32-fr30.lo \ elf32-frv.lo \ + elf32-moxie.lo \ elf32-gen.lo \ elf32-h8300.lo \ elf32-hppa.lo \ @@ -707,6 +710,7 @@ BFD32_BACKENDS_CFILES = \ elf32-dlx.c \ elf32-fr30.c \ elf32-frv.c \ + elf32-moxie.c \ elf32-gen.c \ elf32-h8300.c \ elf32-hppa.c \ @@ -1716,6 +1720,7 @@ cpu-d30v.lo: cpu-d30v.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-dlx.lo: cpu-dlx.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-fr30.lo: cpu-fr30.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-frv.lo: cpu-frv.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h +cpu-moxie.lo: cpu-moxie.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-h8300.lo: cpu-h8300.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-h8500.lo: cpu-h8500.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-hppa.lo: cpu-hppa.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h @@ -2018,6 +2023,11 @@ elf32-frv.lo: elf32-frv.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/frv.h \ $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/dwarf2.h \ elf32-target.h +elf32-moxie.lo: elf32-moxie.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/moxie.h \ + $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/dwarf2.h \ + elf32-target.h elf32-gen.lo: elf32-gen.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \ $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h elf32-target.h diff --git a/bfd/archures.c b/bfd/archures.c index b0bf140..0a78542 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -331,6 +331,8 @@ DESCRIPTION .#define bfd_mach_frvtomcat 499 {* fr500 prototype *} .#define bfd_mach_fr500 500 .#define bfd_mach_fr550 550 +. bfd_arch_moxie, {* The moxie processor *} +.#define bfd_mach_moxie 1 . bfd_arch_mcore, . bfd_arch_mep, .#define bfd_mach_mep 1 @@ -467,6 +469,7 @@ extern const bfd_arch_info_type bfd_d30v_arch; extern const bfd_arch_info_type bfd_dlx_arch; extern const bfd_arch_info_type bfd_fr30_arch; extern const bfd_arch_info_type bfd_frv_arch; +extern const bfd_arch_info_type bfd_moxie_arch; extern const bfd_arch_info_type bfd_h8300_arch; extern const bfd_arch_info_type bfd_h8500_arch; extern const bfd_arch_info_type bfd_hppa_arch; @@ -539,6 +542,7 @@ static const bfd_arch_info_type * const bfd_archures_list[] = &bfd_dlx_arch, &bfd_fr30_arch, &bfd_frv_arch, + &bfd_moxie_arch, &bfd_h8300_arch, &bfd_h8500_arch, &bfd_hppa_arch, diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 6629ed7..bb2cbc3 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1968,6 +1968,8 @@ enum bfd_architecture #define bfd_mach_frvtomcat 499 /* fr500 prototype */ #define bfd_mach_fr500 500 #define bfd_mach_fr550 550 + bfd_arch_moxie, /* The moxie. */ +#define bfd_mach_moxie 1 bfd_arch_mcore, bfd_arch_mep, #define bfd_mach_mep 1 diff --git a/bfd/coffcode.h b/bfd/coffcode.h index 4f53e47..35c6f70 100644 --- a/bfd/coffcode.h +++ b/bfd/coffcode.h @@ -944,7 +944,8 @@ handle_COMDAT (bfd * abfd, but there's some checking we can do to be sure. */ - if (! (isym.n_sclass == C_STAT + if (! ((isym.n_sclass == C_STAT + || isym.n_sclass == C_EXT) && isym.n_type == T_NULL && isym.n_value == 0)) abort (); @@ -954,7 +955,7 @@ handle_COMDAT (bfd * abfd, names like .text$foo__Fv (in the case of a function). See comment above for more. */ - if (strcmp (name, symname) != 0) + if (isym.n_sclass == C_STAT && strcmp (name, symname) != 0) _bfd_error_handler (_("%B: warning: COMDAT symbol '%s' does not match section name '%s'"), abfd, symname, name); diff --git a/bfd/config.bfd b/bfd/config.bfd index 9082658..9e9e021 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -413,6 +413,10 @@ case "${targ}" in targ_selvecs=bfd_elf32_frv_vec ;; + moxie-*-elf) + targ_defvec=bfd_elf32_moxie_vec + ;; + h8300*-*-rtemscoff*) targ_defvec=h8300coff_vec targ_underscore=yes diff --git a/bfd/configure b/bfd/configure index 288137b..41520b2 100755 --- a/bfd/configure +++ b/bfd/configure @@ -20969,6 +20969,7 @@ do bfd_elf32_fr30_vec) tb="$tb elf32-fr30.lo elf32.lo $elf" ;; bfd_elf32_frv_vec) tb="$tb elf32-frv.lo elf32.lo $elf" ;; bfd_elf32_frvfdpic_vec) tb="$tb elf32-frv.lo elf32.lo $elf" ;; + bfd_elf32_moxie_vec) tb="$tb elf32-moxie.lo elf32.lo $elf" ;; bfd_elf32_h8300_vec) tb="$tb elf32-h8300.lo elf32.lo $elf" ;; bfd_elf32_hppa_linux_vec) tb="$tb elf32-hppa.lo elf32.lo $elf" ;; bfd_elf32_hppa_nbsd_vec) tb="$tb elf32-hppa.lo elf32.lo $elf" ;; diff --git a/bfd/configure.in b/bfd/configure.in index 5704a0d..868730a 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -690,6 +690,7 @@ do bfd_elf32_fr30_vec) tb="$tb elf32-fr30.lo elf32.lo $elf" ;; bfd_elf32_frv_vec) tb="$tb elf32-frv.lo elf32.lo $elf" ;; bfd_elf32_frvfdpic_vec) tb="$tb elf32-frv.lo elf32.lo $elf" ;; + bfd_elf32_moxie_vec) tb="$tb elf32-moxie.lo elf32.lo $elf" ;; bfd_elf32_h8300_vec) tb="$tb elf32-h8300.lo elf32.lo $elf" ;; bfd_elf32_hppa_linux_vec) tb="$tb elf32-hppa.lo elf32.lo $elf" ;; bfd_elf32_hppa_nbsd_vec) tb="$tb elf32-hppa.lo elf32.lo $elf" ;; diff --git a/bfd/cpu-moxie.c b/bfd/cpu-moxie.c new file mode 100644 index 0000000..39debbc --- /dev/null +++ b/bfd/cpu-moxie.c @@ -0,0 +1,40 @@ +/* BFD support for the moxie processor. + Copyright 2009 Free Software Foundation, Inc. + Written by Anthony Green + + This file is part of BFD, the Binary File Descriptor library. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ + +#include "sysdep.h" +#include "bfd.h" +#include "libbfd.h" + + +const bfd_arch_info_type bfd_moxie_arch = + { + 32, /* 32 bits in a word. */ + 32, /* 32 bits in an address. */ + 8, /* 8 bits in a byte. */ + bfd_arch_moxie, /* enum bfd_architecture arch. */ + bfd_mach_moxie, + "moxie", /* Arch name. */ + "moxie", /* Printable name. */ + 2, /* Unsigned int section alignment power. */ + TRUE, /* The one and only. */ + bfd_default_compatible, + bfd_default_scan , + 0, + }; diff --git a/bfd/elf32-moxie.c b/bfd/elf32-moxie.c new file mode 100644 index 0000000..e3f01d2 --- /dev/null +++ b/bfd/elf32-moxie.c @@ -0,0 +1,378 @@ +/* moxie-specific support for 32-bit ELF. + Copyright 2008 Anthony Green. + Copyright 2009 Free Software Foundation, Inc. + + Copied from elf32-fr30.c which is.. + Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Free Software Foundation, Inc. + + This file is part of BFD, the Binary File Descriptor library. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ + +#include "sysdep.h" +#include "bfd.h" +#include "libbfd.h" +#include "elf-bfd.h" +#include "elf/moxie.h" + +/* Forward declarations. */ + +static reloc_howto_type moxie_elf_howto_table [] = +{ + /* This reloc does nothing. */ + HOWTO (R_MOXIE_NONE, /* type */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ + 32, /* bitsize */ + FALSE, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_bitfield, /* complain_on_overflow */ + bfd_elf_generic_reloc, /* special_function */ + "R_MOXIE_NONE", /* name */ + FALSE, /* partial_inplace */ + 0, /* src_mask */ + 0, /* dst_mask */ + FALSE), /* pcrel_offset */ + + /* A 32 bit absolute relocation. */ + HOWTO (R_MOXIE_32, /* type */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ + 32, /* bitsize */ + FALSE, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_bitfield, /* complain_on_overflow */ + bfd_elf_generic_reloc, /* special_function */ + "R_MOXIE_32", /* name */ + FALSE, /* partial_inplace */ + 0x00000000, /* src_mask */ + 0xffffffff, /* dst_mask */ + FALSE), /* pcrel_offset */ +}; + +/* Map BFD reloc types to MOXIE ELF reloc types. */ + +struct moxie_reloc_map +{ + bfd_reloc_code_real_type bfd_reloc_val; + unsigned int moxie_reloc_val; +}; + +static const struct moxie_reloc_map moxie_reloc_map [] = +{ + { BFD_RELOC_NONE, R_MOXIE_NONE }, + { BFD_RELOC_32, R_MOXIE_32 }, +}; + +static reloc_howto_type * +moxie_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, + bfd_reloc_code_real_type code) +{ + unsigned int i; + + for (i = sizeof (moxie_reloc_map) / sizeof (moxie_reloc_map[0]); + --i;) + if (moxie_reloc_map [i].bfd_reloc_val == code) + return & moxie_elf_howto_table [moxie_reloc_map[i].moxie_reloc_val]; + + return NULL; +} + +static reloc_howto_type * +moxie_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name) +{ + unsigned int i; + + for (i = 0; + i < sizeof (moxie_elf_howto_table) / sizeof (moxie_elf_howto_table[0]); + i++) + if (moxie_elf_howto_table[i].name != NULL + && strcasecmp (moxie_elf_howto_table[i].name, r_name) == 0) + return &moxie_elf_howto_table[i]; + + return NULL; +} + +/* Set the howto pointer for an MOXIE ELF reloc. */ + +static void +moxie_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, + arelent *cache_ptr, + Elf_Internal_Rela *dst) +{ + unsigned int r_type; + + r_type = ELF32_R_TYPE (dst->r_info); + BFD_ASSERT (r_type < (unsigned int) R_MOXIE_max); + cache_ptr->howto = & moxie_elf_howto_table [r_type]; +} + +/* Perform a single relocation. By default we use the standard BFD + routines, but a few relocs, we have to do them ourselves. */ + +static bfd_reloc_status_type +moxie_final_link_relocate (reloc_howto_type *howto, + bfd *input_bfd, + asection *input_section, + bfd_byte *contents, + Elf_Internal_Rela *rel, + bfd_vma relocation) +{ + bfd_reloc_status_type r = bfd_reloc_ok; + + switch (howto->type) + { + default: + r = _bfd_final_link_relocate (howto, input_bfd, input_section, + contents, rel->r_offset, + relocation, rel->r_addend); + } + + return r; +} + +/* Relocate an MOXIE ELF section. + + The RELOCATE_SECTION function is called by the new ELF backend linker + to handle the relocations for a section. + + The relocs are always passed as Rela structures; if the section + actually uses Rel structures, the r_addend field will always be + zero. + + This function is responsible for adjusting the section contents as + necessary, and (if using Rela relocs and generating a relocatable + output file) adjusting the reloc addend as necessary. + + This function does not have to worry about setting the reloc + address or the reloc symbol index. + + LOCAL_SYMS is a pointer to the swapped in local symbols. + + LOCAL_SECTIONS is an array giving the section in the input file + corresponding to the st_shndx field of each local symbol. + + The global hash table entry for the global symbols can be found + via elf_sym_hashes (input_bfd). + + When generating relocatable output, this function must handle + STB_LOCAL/STT_SECTION symbols specially. The output symbol is + going to be the section symbol corresponding to the output + section, which means that the addend must be adjusted + accordingly. */ + +static bfd_boolean +moxie_elf_relocate_section (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) +{ + Elf_Internal_Shdr *symtab_hdr; + struct elf_link_hash_entry **sym_hashes; + Elf_Internal_Rela *rel; + Elf_Internal_Rela *relend; + + symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr; + sym_hashes = elf_sym_hashes (input_bfd); + 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; + struct elf_link_hash_entry *h; + bfd_vma relocation; + bfd_reloc_status_type r; + const char *name; + int r_type; + + r_type = ELF32_R_TYPE (rel->r_info); + + r_symndx = ELF32_R_SYM (rel->r_info); + + howto = moxie_elf_howto_table + ELF32_R_TYPE (rel->r_info); + h = NULL; + sym = NULL; + sec = NULL; + + if (r_symndx < symtab_hdr->sh_info) + { + sym = local_syms + r_symndx; + sec = local_sections [r_symndx]; + relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel); + + name = bfd_elf_string_from_elf_section + (input_bfd, symtab_hdr->sh_link, sym->st_name); + name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name; + } + else + { + bfd_boolean unresolved_reloc, warned; + + RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel, + r_symndx, symtab_hdr, sym_hashes, + h, sec, relocation, + unresolved_reloc, warned); + + name = h->root.root.string; + } + + if (sec != NULL && elf_discarded_section (sec)) + { + /* For relocs against symbols from removed linkonce sections, + or sections discarded by a linker script, we just want the + section contents zeroed. Avoid any special processing. */ + _bfd_clear_contents (howto, input_bfd, contents + rel->r_offset); + rel->r_info = 0; + rel->r_addend = 0; + continue; + } + + if (info->relocatable) + continue; + + r = moxie_final_link_relocate (howto, input_bfd, input_section, + contents, rel, relocation); + + if (r != bfd_reloc_ok) + { + const char * msg = NULL; + + switch (r) + { + case bfd_reloc_overflow: + r = 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); + break; + + case bfd_reloc_outofrange: + msg = _("internal error: out of range error"); + break; + + case bfd_reloc_notsupported: + msg = _("internal error: unsupported relocation error"); + break; + + case bfd_reloc_dangerous: + msg = _("internal error: dangerous relocation"); + break; + + default: + msg = _("internal error: unknown error"); + break; + } + + if (msg) + r = info->callbacks->warning + (info, msg, name, input_bfd, input_section, rel->r_offset); + + if (! r) + return FALSE; + } + } + + return TRUE; +} + +/* Return the section that should be marked against GC for a given + relocation. */ + +static asection * +moxie_elf_gc_mark_hook (asection *sec, + struct bfd_link_info *info, + Elf_Internal_Rela *rel, + struct elf_link_hash_entry *h, + Elf_Internal_Sym *sym) +{ + return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym); +} + +/* Look through the relocs for a section during the first phase. + Since we don't do .gots or .plts, we just need to consider the + virtual table relocs for gc. */ + +static bfd_boolean +moxie_elf_check_relocs (bfd *abfd, + struct bfd_link_info *info, + asection *sec, + const Elf_Internal_Rela *relocs) +{ + Elf_Internal_Shdr *symtab_hdr; + struct elf_link_hash_entry **sym_hashes; + const Elf_Internal_Rela *rel; + const Elf_Internal_Rela *rel_end; + + if (info->relocatable) + return TRUE; + + symtab_hdr = &elf_tdata (abfd)->symtab_hdr; + sym_hashes = elf_sym_hashes (abfd); + + rel_end = relocs + sec->reloc_count; + for (rel = relocs; rel < rel_end; rel++) + { + struct elf_link_hash_entry *h; + unsigned long r_symndx; + + r_symndx = ELF32_R_SYM (rel->r_info); + if (r_symndx < symtab_hdr->sh_info) + h = NULL; + else + { + h = sym_hashes[r_symndx - symtab_hdr->sh_info]; + while (h->root.type == bfd_link_hash_indirect + || h->root.type == bfd_link_hash_warning) + h = (struct elf_link_hash_entry *) h->root.u.i.link; + } + } + + return TRUE; +} + +#define ELF_ARCH bfd_arch_moxie +#define ELF_MACHINE_CODE EM_MOXIE +#define ELF_MAXPAGESIZE 0x1 + +#define TARGET_BIG_SYM bfd_elf32_moxie_vec +#define TARGET_BIG_NAME "elf32-moxie" + +#define elf_info_to_howto_rel NULL +#define elf_info_to_howto moxie_info_to_howto_rela +#define elf_backend_relocate_section moxie_elf_relocate_section +#define elf_backend_gc_mark_hook moxie_elf_gc_mark_hook +#define elf_backend_check_relocs moxie_elf_check_relocs + +#define elf_backend_can_gc_sections 1 +#define elf_backend_rela_normal 1 + +#define bfd_elf32_bfd_reloc_type_lookup moxie_reloc_type_lookup +#define bfd_elf32_bfd_reloc_name_lookup moxie_reloc_name_lookup + +#include "elf32-target.h" diff --git a/bfd/targets.c b/bfd/targets.c index aef9c29..a52b37d 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -589,6 +589,7 @@ extern const bfd_target bfd_elf32_dlx_big_vec; extern const bfd_target bfd_elf32_fr30_vec; extern const bfd_target bfd_elf32_frv_vec; extern const bfd_target bfd_elf32_frvfdpic_vec; +extern const bfd_target bfd_elf32_moxie_vec; extern const bfd_target bfd_elf32_h8300_vec; extern const bfd_target bfd_elf32_hppa_linux_vec; extern const bfd_target bfd_elf32_hppa_nbsd_vec; @@ -923,6 +924,7 @@ static const bfd_target * const _bfd_target_vector[] = &bfd_elf32_fr30_vec, &bfd_elf32_frv_vec, &bfd_elf32_frvfdpic_vec, + &bfd_elf32_moxie_vec, &bfd_elf32_h8300_vec, &bfd_elf32_hppa_linux_vec, &bfd_elf32_hppa_nbsd_vec, -- cgit v1.1