daily update

[deliverable/binutils-gdb.git] / bfd / elf32-arm.c

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 85ed8d7d6fb14c1da0889f29f9b7170d5b724966..ed877f7ce3fa4013083789b95ab5214872826a9a 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -6,7 +6,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,7 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
 #include "sysdep.h"
 #include "bfd.h"
@@ -6933,6 +6934,23 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
        default: /* All known attributes should be explicitly covered.   */
          abort ();
        }
+
+      if (in_attr[i].type && !out_attr[i].type)
+       switch (in_attr[i].type)
+         {
+         case 1:
+           if (out_attr[i].i)
+             out_attr[i].type = 1;
+           break;
+
+         case 2:
+           if (out_attr[i].s)
+             out_attr[i].type = 2;
+           break;
+
+         default:
+           abort ();
+         }
     }
 
   /* Merge Tag_compatibility attributes and any common GNU ones.  */
@@ -10115,6 +10133,7 @@ const struct elf_size_info elf32_arm_size_info = {
   ELFCLASS32, EV_CURRENT,
   bfd_elf32_write_out_phdrs,
   bfd_elf32_write_shdrs_and_ehdr,
+  bfd_elf32_checksum_contents,
   bfd_elf32_write_relocs,
   elf32_arm_swap_symbol_in,
   elf32_arm_swap_symbol_out,