From: H.J. Lu <hongjiu.lu@intel.com>
Date: Wed, 18 Feb 2009 21:40:08 +0000 (+0000)
Subject: re PR target/39224 (ABI attribute doesn't work with long double)
X-Git-Tag: releases/gcc-4.4.0~501
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd7b26033c5b16781681c08e3a5e8888b6abd560;p=thirdparty%2Fgcc.git

re PR target/39224 (ABI attribute doesn't work with long double)

2009-02-18  H.J. Lu  <hongjiu.lu@intel.com>

	PR target/39224
	* config/i386/i386.c (ix86_return_in_memory): Properly check
	ABI.

From-SVN: r144272
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8f44f45a292a..b6b912439bc7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/39224
+	* config/i386/i386.c (ix86_return_in_memory): Properly check
+	ABI.
+
 2009-02-18  Jason Merrill  <jason@redhat.com>
 
 	PR target/39179
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index da36f17671a7..e41f501c35ac 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -6211,10 +6211,13 @@ ix86_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED)
 #else
   const enum machine_mode mode = type_natural_mode (type, NULL);
  
-  if (TARGET_64BIT_MS_ABI)
-    return return_in_memory_ms_64 (type, mode);
-  else if (TARGET_64BIT)
-    return return_in_memory_64 (type, mode);
+  if (TARGET_64BIT)
+    {
+      if (ix86_function_type_abi (fntype) == MS_ABI)
+	return return_in_memory_ms_64 (type, mode);
+      else
+	return return_in_memory_64 (type, mode);
+    }
   else
     return return_in_memory_32 (type, mode);
 #endif