backport 2008-10-10 Nathan Froyd <froydnj@codesourcery.com>

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c25d0eca7cc3aad9321f99b189d08f09322688d7..1f6f1fe66e592651ab12d4a8701935184855dee7 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,9 @@
 2009-03-02  Alan Modra  <amodra@bigpond.net.au>
 
+       2008-10-10  Nathan Froyd  <froydnj@codesourcery.com>
+       * elf32-ppc.c (ppc_elf_merge_obj_attributes): Merge
+       Tag_GNU_Power_ABI_Struct_Return.
+
        2008-10-03  Alan Modra  <amodra@bigpond.net.au>
        * elf.c (bfd_elf_set_group_contents): Assign sh_info for ld -r when
        the signature symbol is global.

diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index 3caf66a910c1f40f6a6283e53c73af77d8a32d37..55348aefa3990e049f0a614d1dc843092075ef26 100644 (file)
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -3964,6 +3964,33 @@ ppc_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
           ibfd, obfd, in_abi, out_abi);
     }
 
+  /* Check for conflicting Tag_GNU_Power_ABI_Struct_Return attributes
+     and merge non-conflicting ones.  */
+  in_attr = &in_attrs[Tag_GNU_Power_ABI_Struct_Return];
+  out_attr = &out_attrs[Tag_GNU_Power_ABI_Struct_Return];
+  if (in_attr->i != out_attr->i)
+    {
+      out_attr->type = 1;
+      if (out_attr->i == 0)
+       out_attr->i = in_attr->i;
+      else if (in_attr->i == 0)
+       ;
+      else if (out_attr->i == 1 && in_attr->i == 2)
+       _bfd_error_handler
+         (_("Warning: %B uses r3/r4 for small structure returns, %B uses memory"), obfd, ibfd);
+      else if (out_attr->i == 2 && in_attr->i == 1)
+       _bfd_error_handler
+         (_("Warning: %B uses r3/r4 for small structure returns, %B uses memory"), ibfd, obfd);
+      else if (in_attr->i > 2)
+       _bfd_error_handler
+         (_("Warning: %B uses unknown small structure return convention %d"), ibfd,
+          in_attr->i);
+      else
+       _bfd_error_handler
+         (_("Warning: %B uses unknown small structure return convention %d"), obfd,
+          out_attr->i);
+    }
+
   /* Merge Tag_compatibility attributes and any common GNU ones.  */
   _bfd_elf_merge_object_attributes (ibfd, obfd);
 

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index a458bbd5b9eed3342a546979ecdb0188ee54d74e..23d697af6bc84c658682d0a4e4da6c24b2dd555f 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,9 @@
 2009-03-02  Alan Modra  <amodra@bigpond.net.au>
 
+       2008-10-10  Nathan Froyd  <froydnj@codesourcery.com>
+       * readelf.c (display_power_gnu_attribute): Decode
+       Tag_GNU_Power_ABI_Struct_Return.
+
        2008-09-28  Alan Modra  <amodra@bigpond.net.au>
        * objcopy.c (setup_section): Set elf_group_id.
 

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 2d356a696261de8e4a6bd5185695f6cdbaac6b3c..b7740ecad01598ff3f49ff62830d2b27fdf0f911 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -9062,6 +9062,29 @@ display_power_gnu_attribute (unsigned char *p, int tag)
       return p;
    }
 
+  if (tag == Tag_GNU_Power_ABI_Struct_Return)
+    {
+      val = read_uleb128 (p, &len);
+      p += len;
+      printf ("  Tag_GNU_Power_ABI_Struct_Return: ");
+      switch (val)
+       {
+       case 0:
+         printf ("Any\n");
+         break;
+       case 1:
+         printf ("r3/r4\n");
+         break;
+       case 2:
+         printf ("Memory\n");
+         break;
+       default:
+         printf ("??? (%d)\n", val);
+         break;
+       }
+      return p;
+    }
+
   if (tag & 1)
     type = 1; /* String.  */
   else

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index ae259dcbc3c75c032108b66192df8428ed40d2b3..ba5645fbafa75b77c948aaf6833c2ac135be0ba3 100644 (file)
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-02  Alan Modra  <amodra@bigpond.net.au>
+
+       2008-10-10  Nathan Froyd  <froydnj@codesourcery.com>
+       * ppc.h: Add Tag_GNU_Power_ABI_Struct_Return.
+
 2008-08-20  Bob Wilson  <bob.wilson@acm.org>
 
        * xtensa.h (R_XTENSA_TLSDESC_FN, R_XTENSA_TLSDESC_ARG)

diff --git a/include/elf/ppc.h b/include/elf/ppc.h
index 95cccce24819232075dbdeadcb6e272d6ffbae54..a0c16f1a7c843acdeb2e6c1953add7ef7d7129f2 100644 (file)
--- a/include/elf/ppc.h
+++ b/include/elf/ppc.h
@@ -186,6 +186,11 @@ enum
      registers, 3 for SPE registers; 0 for not tagged or not using any
      ABIs affected by the differences.  */
   Tag_GNU_Power_ABI_Vector = 8,
+
+  /* Value 1 for ABIs using r3/r4 for returning structures <= 8 bytes,
+     2 for ABIs using memory; 0 for not tagged or not using any ABIs
+     affected by the differences.  */
+  Tag_GNU_Power_ABI_Struct_Return = 12
 };
 
 #endif /* _ELF_PPC_H */

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index f67cfbd0556f474ae005ba10937287bb25cc8134..3060d3f9ebfffa22d14a9089fb26c400b5d6fd0c 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-02  Alan Modra  <amodra@bigpond.net.au>
+
+       2008-10-10  Nathan Froyd  <froydnj@codesourcery.com>
+       * ld-powerpc/attr-gnu-12-1.s: New file.
+       * ld-powerpc/attr-gnu-12-2.s: New file.
+       * ld-powerpc/attr-gnu-12-11.d: New file.
+       * ld-powerpc/attr-gnu-12-21.d: New file.
+       * ld-powerpc/powerpc.exp: Run new dump tests.
+
 2009-01-14  Joseph Myers  <joseph@codesourcery.com>
 
        * ld-arm/thumb2-bl-undefweak.d, ld-arm/thumb2-bl-undefweak.s: New.

diff --git a/ld/testsuite/ld-powerpc/powerpc.exp b/ld/testsuite/ld-powerpc/powerpc.exp
index 4e03cf6fb3c2dd2bc5f4b5ef8ed591e60f69593c..af812a042c12b3f3fb555476f3cccdf11cb9b943 100644 (file)
--- a/ld/testsuite/ld-powerpc/powerpc.exp
+++ b/ld/testsuite/ld-powerpc/powerpc.exp
@@ -177,3 +177,6 @@ run_dump_test "attr-gnu-4-41"
 run_dump_test "attr-gnu-8-11"
 run_dump_test "attr-gnu-8-23"
 run_dump_test "attr-gnu-8-31"
+
+run_dump_test "attr-gnu-12-11"
+run_dump_test "attr-gnu-12-21"