diff options
| author | Alan Modra <amodra@gmail.com> | 2016-10-07 10:58:35 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2016-10-07 11:24:21 +1030 |
| commit | 1047201fd0f402428bb3331638a198413f97f476 (patch) | |
| tree | 36aba61eb942e9795c947b85abb2629582c14e79 /bfd/elf32-microblaze.c | |
| parent | b62b1f7143c70caf5a14bd9684bbe50f51db706f (diff) | |
| download | binutils-gdb-1047201fd0f402428bb3331638a198413f97f476.tar.gz | |
bfd_merge_private_bfd_data tidy
bfd_merge_private_bfd_data and _bfd_generic_verify_endian_match are
linker functions, so move them to linker.c.
bfd/
* Makefile.am (LIBBFD_H_FILES): Update.
* doc/Makefile.am (LIBBFD_H_DEP): Likewise.
* cpu-sh.c (sh_merge_bfd_arch): Move to..
* elf32-sh.c: ..here, and make static.
* elf32-arc.c (arc_elf_merge_private_bfd_data): Delete extraneous
error.
* elf32-cris.c (cris_elf_merge_private_bfd_data): Don't call
_bfd_generic_verify_endian_match.
* elf32-microblaze.c (microblaze_elf_merge_private_bfd_data): Delete.
(bfd_elf32_bfd_merge_private_bfd_data): Define as
_bfd_generic_verify_endian_match.
* elf32-mt.c (mt_elf_merge_private_bfd_data): Don't test
boolean == FALSE.
* elf32-xgate.c (_bfd_xgate_elf_merge_private_bfd_data): Delete.
(bfd_elf32_bfd_merge_private_bfd_data): Don't define.
* elf32-xgate.h (_bfd_xgate_elf_merge_private_bfd_data): Delete.
* libbfd-in.h (_bfd_generic_verify_endian_match): Delete.
* libbfd.c (_bfd_generic_verify_endian_match): Move to..
* linker.c: ..here, and make internal.
* bfd.c (bfd_merge_private_bfd_data): Move to..
* linker.c: ..here.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
opcodes/
* sh-opc.h (sh_merge_bfd_arch): Delete prototype.
Diffstat (limited to 'bfd/elf32-microblaze.c')
| -rw-r--r-- | bfd/elf32-microblaze.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c index 778c6f04836..b29ac049edd 100644 --- a/bfd/elf32-microblaze.c +++ b/bfd/elf32-microblaze.c @@ -1596,21 +1596,6 @@ microblaze_elf_relocate_section (bfd *output_bfd, return ret; } - -/* Merge backend specific data from an object file to the output - object file when linking. - - Note: We only use this hook to catch endian mismatches. */ -static bfd_boolean -microblaze_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd) -{ - /* Check if we have the same endianess. */ - if (! _bfd_generic_verify_endian_match (ibfd, obfd)) - return FALSE; - - return TRUE; -} - /* Calculate fixup value for reference. */ @@ -3500,7 +3485,7 @@ microblaze_elf_add_symbol_hook (bfd *abfd, #define bfd_elf32_bfd_is_local_label_name microblaze_elf_is_local_label_name #define elf_backend_relocate_section microblaze_elf_relocate_section #define bfd_elf32_bfd_relax_section microblaze_elf_relax_section -#define bfd_elf32_bfd_merge_private_bfd_data microblaze_elf_merge_private_bfd_data +#define bfd_elf32_bfd_merge_private_bfd_data _bfd_generic_verify_endian_match #define bfd_elf32_bfd_reloc_name_lookup microblaze_elf_reloc_name_lookup #define elf_backend_gc_mark_hook microblaze_elf_gc_mark_hook |