i386.c (ix86_function_regparm): Added checking of ix86_force_align_arg_pointer to...

	* config/i386/i386.c (ix86_function_regparm): Added checking of
	ix86_force_align_arg_pointer to determine the number of
	register parameters.
	* gcc.target/i386/stack-realign.c: New.

From-SVN: r125173

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9c7429514dfe21b1b785f5a98aeda3a44a157300..8dca30713986e40a4a9be6e9048b81308c040412 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-29  Hui-May Chang  <hm.chang@apple.com>
+       * config/i386/i386.c (ix86_function_regparm): Added checking of 
+       ix86_force_align_arg_pointer to determine the number of
+       register parameters.
+
 2007-05-29  Zdenek Dvorak  <dvorakz@suse.cz>
 
        * tree-vectorizer.h (DR_MISALIGNMENT): Cast aux to integer.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index f68dc6aabd29d6448929631ddb510dac74183a79..51d7afe94bf445f74cf457da10c620d5ba9a15ec 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -2837,7 +2837,8 @@ ix86_function_regparm (tree type, tree decl)
          /* We can't use regparm(3) for nested functions as these use
             static chain pointer in third argument.  */
          if (local_regparm == 3
-             && decl_function_context (decl)
+             && (decl_function_context (decl)
+                  || ix86_force_align_arg_pointer)
              && !DECL_NO_STATIC_CHAIN (decl))
            local_regparm = 2;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6340ca4036eea8f3fa9a00bcabc385e3aa2d3dfb..8ed7efef2fab24f8f89f87d49433ef265269bffd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-29  Hui-May Chang  <hm.chang@apple.com>
+
+       * gcc.target/i386/stack-realign.c: New.
+
 2007-05-29  Zdenek Dvorak  <dvorakz@suse.cz>
 
        * gcc.dg/tree-ssa/prefetch-6.c: New test.

diff --git a/gcc/testsuite/gcc.target/i386/stack-realign.c b/gcc/testsuite/gcc.target/i386/stack-realign.c
new file mode 100644 (file)
index 0000000..75054e0
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/stack-realign.c
@@ -0,0 +1,16 @@
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-options "-mstackrealign -O2" } */
+
+extern void abort (void);
+
+__attribute__((noinline)) static void foo (int i1, int i2, int i3)
+{
+  if (i3 != 3)
+    abort ();
+}
+
+int main (int argc, char **argv)
+{
+  foo (1, 2, 3);
+  return 0;
+}