2010-03-11 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>

	    Jack Howarth <howarth@bromo.med.uc.edu>

	PR target/36399
	* gcc/config/i386/i386.h: Fix ABI on darwin x86-32.
	* gcc/testsuite/gcc.target/i386/push-1.c: Don't xfail
	  scan-assembler-not "movups" on darwin.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157553 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 018d94c..02be2ca 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-11  Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
+           Jack Howarth <howarth@bromo.med.uc.edu>
+
+       PR target/36399
+       * gcc/config/i386/i386.h: Fix ABI on darwin x86-32.
+
 2010-03-18  Aldy Hernandez  <aldyh@redhat.com>
 
        * tree.h: Declare make_decl_rtl_for_debug.

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 962a14c..fa94091 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -1810,7 +1810,7 @@ typedef struct ix86_args {
 #define X86_64_SSE_REGPARM_MAX 8
 #define X86_64_MS_SSE_REGPARM_MAX 4
 
-#define X86_32_SSE_REGPARM_MAX (TARGET_SSE ? 3 : 0)
+#define X86_32_SSE_REGPARM_MAX (TARGET_SSE ? (TARGET_MACHO ? 4 : 3) : 0)
 
 #define SSE_REGPARM_MAX                                                        \
   (TARGET_64BIT ? (TARGET_64BIT_MS_ABI ? X86_64_MS_SSE_REGPARM_MAX     \

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 62554cd..ef33f4c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-11  Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
+           Jack Howarth <howarth@bromo.med.uc.edu>
+
+       PR target/36399
+       * gcc/testsuite/gcc.target/i386/push-1.c: Don't xfail
+         scan-assembler-not "movups" on darwin.
+
 2010-03-18  Jakub Jelinek  <jakub@redhat.com>
 
        PR debug/43058

diff --git a/gcc/testsuite/gcc.target/i386/push-1.c b/gcc/testsuite/gcc.target/i386/push-1.c
index da9b39e..09464bf 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/push-1.c
+++ b/gcc/testsuite/gcc.target/i386/push-1.c
@@ -12,4 +12,4 @@ bar (void)
   foo (x, x, x, x, 5);
 }
 
-/* { dg-final { scan-assembler-not "movups" { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-not "movups" { xfail { ! *-*-darwin* } } } } */