2006-02-22 Roland McGrath <roland@redhat.com>

	* ppc64_retval.c (SVR4_STRUCT_RETURN): New macro.
	(ppc64_return_value_location): Use registers for aggregate conditional
	on that.
	* ppc_retval.c (SVR4_STRUCT_RETURN): New macro.
	(ppc_return_value_location): Use registers for aggregate conditional
	on that.

diff --git a/backends/ChangeLog b/backends/ChangeLog
index 84515e51d97b3a1ca9d10586f101cd22447d2a84..33d52a2f8f2f380b2b964dc4a9fad8e1e8d52f1e 100644 (file)
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-22  Roland McGrath  <roland@redhat.com>
+
+       * ppc64_retval.c (SVR4_STRUCT_RETURN): New macro.
+       (ppc64_return_value_location): Use registers for aggregate conditional
+       on that.
+       * ppc_retval.c (SVR4_STRUCT_RETURN): New macro.
+       (ppc_return_value_location): Use registers for aggregate conditional
+       on that.
+
 2006-01-12  Roland McGrath  <roland@redhat.com>
 
        * s390_retval.c: New file.

diff --git a/backends/ppc64_retval.c b/backends/ppc64_retval.c
index 81852915754d440af530b2c8701697844ecaa718..797b22a2563c594d3da97ad22a0d91cb32adac56 100644 (file)
--- a/backends/ppc64_retval.c
+++ b/backends/ppc64_retval.c
@@ -1,5 +1,5 @@
 /* Function return value location for Linux/PPC64 ABI.
-   Copyright (C) 2005 Red Hat, Inc.
+   Copyright (C) 2005, 2006 Red Hat, Inc.
 
    This program is Open Source software; you can redistribute it and/or
    modify it under the terms of the Open Software License version 1.0 as
@@ -22,6 +22,10 @@
 #include "libebl_CPU.h"
 
 
+/* This is the SVR4 ELF ABI convention, but AIX and Linux do not use it.  */
+#define SVR4_STRUCT_RETURN 0
+
+
 /* r3.  */
 static const Dwarf_Op loc_intreg[] =
   {
@@ -121,7 +125,7 @@ ppc64_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp)
                return nloc_fp4regs;
            }
        }
-      if (size <= 8)
+      if (size <= 8 && SVR4_STRUCT_RETURN)
        {
        intreg:
          *locp = loc_intreg;

diff --git a/backends/ppc_retval.c b/backends/ppc_retval.c
index 369c5997a734cebcebef142358e400481a3313ee..99458eb523049869540da8869c5e050eb3f0956c 100644 (file)
--- a/backends/ppc_retval.c
+++ b/backends/ppc_retval.c
@@ -1,5 +1,5 @@
 /* Function return value location for Linux/PPC ABI.
-   Copyright (C) 2005 Red Hat, Inc.
+   Copyright (C) 2005, 2006 Red Hat, Inc.
 
    This program is Open Source software; you can redistribute it and/or
    modify it under the terms of the Open Software License version 1.0 as
@@ -22,6 +22,10 @@
 #include "libebl_CPU.h"
 
 
+/* This is the SVR4 ELF ABI convention, but AIX and Linux do not use it.  */
+#define SVR4_STRUCT_RETURN 0
+
+
 /* r3, or pair r3, r4.  */
 static const Dwarf_Op loc_intreg[] =
   {
@@ -47,6 +51,7 @@ static const Dwarf_Op loc_aggregate[] =
   };
 #define nloc_aggregate 1
 
+
 int
 ppc_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp)
 {
@@ -127,7 +132,8 @@ ppc_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp)
     case DW_TAG_class_type:
     case DW_TAG_union_type:
     case DW_TAG_array_type:
-      if (dwarf_formudata (dwarf_attr (typedie, DW_AT_byte_size,
+      if (SVR4_STRUCT_RETURN
+         && dwarf_formudata (dwarf_attr (typedie, DW_AT_byte_size,
                                       &attr_mem), &size) == 0
          && size > 0 && size <= 8)
        goto intreg;