From: Mark Shinwell <shinwell@codesourcery.com>
Date: Wed, 9 May 2007 13:02:10 +0000 (+0000)
Subject:         bfd/
X-Git-Tag: binutils-2_16-branchpoint~557
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4b7a96cfc9d7eb7be09dfd51792f40d8ed210f64;p=pf3gnuchains%2Fpf3gnuchains4x.git

    bfd/
        * elf32-arm.c (bfd_elf32_arm_vfp11_erratum_scan): Don't
        attempt to scan if the bfd doesn't correspond to an ELF image.
        (bfd_elf32_arm_vfp11_fix_veneer_locations): Likewise.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 60d9d647af..2fe431b0ff 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-09  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* elf32-arm.c (bfd_elf32_arm_vfp11_erratum_scan): Don't
+	attempt to scan if the bfd doesn't correspond to an ELF image.
+	(bfd_elf32_arm_vfp11_fix_veneer_locations): Likewise.
+
 2007-05-08  Alexandre Oliva  <aoliva@redhat.com>
 
 	* elf32-frv.c (elf32_frv_relocate_section): Discard dynamic relocs
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 97f4fd0858..3fc47a9fa6 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -3648,6 +3648,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 if this bfd does not correspond to an ELF image.  */
+  if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+    return TRUE;
   
   for (sec = abfd->sections; sec != NULL; sec = sec->next)
     {
@@ -3819,7 +3823,11 @@ bfd_elf32_arm_vfp11_fix_veneer_locations (bfd *abfd,
   
   if (link_info->relocatable)
     return;
-  
+
+  /* Skip if this bfd does not correspond to an ELF image.  */
+  if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+    return;
+
   globals = elf32_arm_hash_table (link_info);
   
   tmp_name = bfd_malloc ((bfd_size_type) strlen