2009-01-30 Julian Brown <julian@codesourcery.com>

	* elf32-arm.c (bfd_elf32_arm_vfp11_erratum_scan): Skip BFDs with
	EXEC_P or DYNAMIC flags, and skip sections which are being linked
	with --just-symbols (-R).

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 16f061d77ebeb49287f862bd00c73f3dc376b46b..d47fbe25b01d95e2eabbd58aa94e680c739c3962 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-30  Julian Brown  <julian@codesourcery.com>
+
+       * elf32-arm.c (bfd_elf32_arm_vfp11_erratum_scan): Skip BFDs with
+       EXEC_P or DYNAMIC flags, and skip sections which are being linked
+       with --just-symbols (-R).
+
 2009-01-29  Adam Nemet  <anemet@caviumnetworks.com>
 
        * dwarf2.c (read_rangelist): Use read_address to read low_pc and

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 48421795f1dcd2dd6b372e06ee0531558e35a15e..de063e6126b482607d127545744c1a823880873f 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -4998,6 +4998,10 @@ bfd_elf32_arm_vfp11_erratum_scan (bfd *abfd, struct bfd_link_info *link_info)
   if (globals->vfp11_fix == BFD_ARM_VFP11_FIX_NONE)
     return TRUE;
 
+  /* Skip this BFD if it corresponds to an executable or dynamic object.  */
+  if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0)
+    return TRUE;
+
   for (sec = abfd->sections; sec != NULL; sec = sec->next)
     {
       unsigned int i, span, first_fmac = 0, veneer_of_insn = 0;
@@ -5008,6 +5012,8 @@ bfd_elf32_arm_vfp11_erratum_scan (bfd *abfd, struct bfd_link_info *link_info)
       if (elf_section_type (sec) != SHT_PROGBITS
           || (elf_section_flags (sec) & SHF_EXECINSTR) == 0
           || (sec->flags & SEC_EXCLUDE) != 0
+         || sec->sec_info_type == ELF_INFO_TYPE_JUST_SYMS
+         || sec->output_section == bfd_abs_section_ptr
           || strcmp (sec->name, VFP11_ERRATUM_VENEER_SECTION_NAME) == 0)
         continue;