Correct powerpc-linux linker file flavour checks
Alan Modra
amodra@bigpond.net.au
Mon Mar 21 13:40:00 GMT 2005
Applying mainline and branch. Testing the bfd flavour isn't sufficient
to know that we have a powerpc elf input. We could have another elf
object (without relocs, otherwise the linker would complain elsewhere).
* elf32-ppc.c (is_ppc_elf_target): New function.
(ppc_elf_merge_private_bfd_data): Use it rather than just testing
for bfd_target_elf_flavour. Do this test before endian check.
(ppc_elf_add_symbol_hook): Use is_pcc_elf_target.
(ppc_elf_size_dynamic_sections): Likewise.
Index: bfd/elf32-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-ppc.c,v
retrieving revision 1.139
diff -u -p -r1.139 elf32-ppc.c
--- bfd/elf32-ppc.c 20 Mar 2005 23:36:16 -0000 1.139
+++ bfd/elf32-ppc.c 21 Mar 2005 11:07:33 -0000
@@ -1594,6 +1594,17 @@ ppc_elf_set_private_flags (bfd *abfd, fl
return TRUE;
}
+/* Return 1 if target is one of ours. */
+
+static bfd_boolean
+is_ppc_elf_target (const struct bfd_target *targ)
+{
+ extern const bfd_target bfd_elf32_powerpc_vec;
+ extern const bfd_target bfd_elf32_powerpcle_vec;
+
+ return targ == &bfd_elf32_powerpc_vec || targ == &bfd_elf32_powerpcle_vec;
+}
+
/* Merge backend specific data from an object file to the output
object file when linking. */
@@ -1604,14 +1615,14 @@ ppc_elf_merge_private_bfd_data (bfd *ibf
flagword new_flags;
bfd_boolean error;
+ if (!is_ppc_elf_target (ibfd->xvec)
+ || !is_ppc_elf_target (obfd->xvec))
+ return TRUE;
+
/* Check if we have the same endianess. */
if (! _bfd_generic_verify_endian_match (ibfd, obfd))
return FALSE;
- if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
- || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
- return TRUE;
-
new_flags = elf_elfheader (ibfd)->e_flags;
old_flags = elf_elfheader (obfd)->e_flags;
if (!elf_flags_init (obfd))
@@ -2444,8 +2455,7 @@ ppc_elf_add_symbol_hook (bfd *abfd,
if (sym->st_shndx == SHN_COMMON
&& !info->relocatable
&& sym->st_size <= elf_gp_size (abfd)
- && (info->hash->creator == abfd->xvec
- || info->hash->creator == abfd->xvec->alternative_target))
+ && is_ppc_elf_target (info->hash->creator))
{
/* Common symbols less than or equal to -G nn bytes are automatically
put into .sbss. */
@@ -4047,7 +4057,7 @@ ppc_elf_size_dynamic_sections (bfd *outp
Elf_Internal_Shdr *symtab_hdr;
asection *srel;
- if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
+ if (!is_ppc_elf_target (ibfd->xvec))
continue;
for (s = ibfd->sections; s != NULL; s = s->next)
--
Alan Modra
IBM OzLabs - Linux Technology Centre
More information about the Binutils
mailing list