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-cris.c | |
| parent | b62b1f7143c70caf5a14bd9684bbe50f51db706f (diff) | |
| download | gdb-1047201fd0f402428bb3331638a198413f97f476.zip gdb-1047201fd0f402428bb3331638a198413f97f476.tar.gz gdb-1047201fd0f402428bb3331638a198413f97f476.tar.bz2 | |
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-cris.c')
| -rw-r--r-- | bfd/elf32-cris.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c index 1722b75..255a9fd 100644 --- a/bfd/elf32-cris.c +++ b/bfd/elf32-cris.c @@ -4233,18 +4233,14 @@ cris_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) static bfd_boolean cris_elf_copy_private_bfd_data (bfd *ibfd, bfd *obfd) { - /* Call the base function. */ - if (!_bfd_elf_copy_private_bfd_data (ibfd, obfd)) - return FALSE; - - /* If output is big-endian for some obscure reason, stop here. */ - if (_bfd_generic_verify_endian_match (ibfd, obfd) == FALSE) - return FALSE; - if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) return TRUE; + /* Call the base function. */ + if (!_bfd_elf_copy_private_bfd_data (ibfd, obfd)) + return FALSE; + /* Do what we really came here for. */ return bfd_set_arch_mach (obfd, bfd_arch_cris, bfd_get_mach (ibfd)); } |