diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/emultempl/metagelf.em | 4 | ||||
| -rw-r--r-- | ld/emultempl/nios2elf.em | 6 | ||||
| -rw-r--r-- | ld/emultempl/spuelf.em | 4 | ||||
| -rw-r--r-- | ld/emultempl/tic6xdsbt.em | 26 |
5 files changed, 27 insertions, 20 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 150df06..9decdaa 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2014-05-02 Alan Modra <amodra@gmail.com> + + * emultempl/metagelf.em: Update bfd target vector naming. + * emultempl/nios2elf.em: Likewise. + * emultempl/spuelf.em: Likewise. + * emultempl/tic6xdsbt.em: Likewise. + 2014-04-22 Christian Svensson <blue@cmd.nu> * Makefile.am: Remove openrisc and or32 support. Add support for or1k. diff --git a/ld/emultempl/metagelf.em b/ld/emultempl/metagelf.em index 7aaf168..1f77ecd 100644 --- a/ld/emultempl/metagelf.em +++ b/ld/emultempl/metagelf.em @@ -45,9 +45,9 @@ static bfd_signed_vma group_size = 1; static void metagelf_create_output_section_statements (void) { - extern const bfd_target bfd_elf32_metag_vec; + extern const bfd_target metag_elf32_vec; - if (link_info.output_bfd->xvec != &bfd_elf32_metag_vec) + if (link_info.output_bfd->xvec != &metag_elf32_vec) return; stub_file = lang_add_input_file ("linker stubs", diff --git a/ld/emultempl/nios2elf.em b/ld/emultempl/nios2elf.em index 6936f11..991a11b 100644 --- a/ld/emultempl/nios2elf.em +++ b/ld/emultempl/nios2elf.em @@ -41,10 +41,10 @@ static int need_laying_out = 0; static void nios2elf_create_output_section_statements (void) { - extern const bfd_target bfd_elf32_littlenios2_vec, bfd_elf32_bignios2_vec; + extern const bfd_target nios2_elf32_le_vec, nios2_elf32_be_vec; - if (link_info.output_bfd->xvec != &bfd_elf32_littlenios2_vec - && link_info.output_bfd->xvec != &bfd_elf32_bignios2_vec) + if (link_info.output_bfd->xvec != &nios2_elf32_le_vec + && link_info.output_bfd->xvec != &nios2_elf32_be_vec) return; /* If --no-relax was not explicitly specified by the user, enable diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em index 5167b35..1b4d72f 100644 --- a/ld/emultempl/spuelf.em +++ b/ld/emultempl/spuelf.em @@ -89,9 +89,9 @@ static const struct _ovl_stream icache_mgr_stream = { static int is_spu_target (void) { - extern const bfd_target bfd_elf32_spu_vec; + extern const bfd_target spu_elf32_vec; - return link_info.output_bfd->xvec == &bfd_elf32_spu_vec; + return link_info.output_bfd->xvec == &spu_elf32_vec; } /* Create our note section. */ diff --git a/ld/emultempl/tic6xdsbt.em b/ld/emultempl/tic6xdsbt.em index b6691fd..ca957c4 100644 --- a/ld/emultempl/tic6xdsbt.em +++ b/ld/emultempl/tic6xdsbt.em @@ -36,19 +36,19 @@ static int merge_exidx_entries = -1; static int is_tic6x_target (void) { - extern const bfd_target bfd_elf32_tic6x_le_vec; - extern const bfd_target bfd_elf32_tic6x_be_vec; - extern const bfd_target bfd_elf32_tic6x_linux_le_vec; - extern const bfd_target bfd_elf32_tic6x_linux_be_vec; - extern const bfd_target bfd_elf32_tic6x_elf_le_vec; - extern const bfd_target bfd_elf32_tic6x_elf_be_vec; - - return (link_info.output_bfd->xvec == &bfd_elf32_tic6x_le_vec - || link_info.output_bfd->xvec == &bfd_elf32_tic6x_be_vec - || link_info.output_bfd->xvec == &bfd_elf32_tic6x_linux_le_vec - || link_info.output_bfd->xvec == &bfd_elf32_tic6x_linux_be_vec - || link_info.output_bfd->xvec == &bfd_elf32_tic6x_elf_le_vec - || link_info.output_bfd->xvec == &bfd_elf32_tic6x_elf_be_vec); + extern const bfd_target tic6x_elf32_le_vec; + extern const bfd_target tic6x_elf32_be_vec; + extern const bfd_target tic6x_elf32_linux_le_vec; + extern const bfd_target tic6x_elf32_linux_be_vec; + extern const bfd_target tic6x_elf32_c6000_le_vec; + extern const bfd_target tic6x_elf32_c6000_be_vec; + + return (link_info.output_bfd->xvec == &tic6x_elf32_le_vec + || link_info.output_bfd->xvec == &tic6x_elf32_be_vec + || link_info.output_bfd->xvec == &tic6x_elf32_linux_le_vec + || link_info.output_bfd->xvec == &tic6x_elf32_linux_be_vec + || link_info.output_bfd->xvec == &tic6x_elf32_c6000_le_vec + || link_info.output_bfd->xvec == &tic6x_elf32_c6000_be_vec); } /* Pass params to backend. */ |