From: Uros Bizjak <ubizjak@gmail.com>
Date: Tue, 11 Feb 2014 18:59:24 +0000 (+0100)
Subject: re PR target/59927 (ICE sorry, unimplemented: ms_abi attribute requires -maccumulate... 
X-Git-Tag: releases/gcc-4.9.0~959
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe89bba406fc34c89cee08b8ea9d5a283f71ca9e;p=thirdparty%2Fgcc.git

re PR target/59927 (ICE sorry, unimplemented: ms_abi attribute requires -maccumulate-outgoing-args or subtarget optimization implying it)

	PR target/59927
	Revert
	2013-12-15  Uros Bizjak  <ubizjak@gmail.com>

	PR testsuite/58630
	* gcc.target/i386/pr43662.c (dg-options):
	Add -maccumulate-outgoing-args.
	* gcc.target/i386/pr43869.c (dg-options): Ditto.
	* gcc.target/i386/pr57003.c (dg-options): Ditto.
	* gcc.target/i386/avx-vzeroupper-16.c (dg-options):
	Remove -mtune=generic and add -maccumulate-outgoing-args instead.
	* gcc.target/i386/avx-vzeroupper-17.c (dg-options): Ditto.
	* gcc.target/i386/avx-vzeroupper-18.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/func-1.c (dg-options):
	Add -maccumulate-outgoing-args.
	* gcc.target/x86_64/abi/callabi/func-2a.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/func-2b.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/func-indirect.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/func-indirect-2a.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/func-indirect-2b.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/leaf-1.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/leaf-2.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/pr38891.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/vaarg-1.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/vaarg-2.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/vaarg-3.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/vaarg-4a.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/vaarg-4b.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/vaarg-5a.c (dg-options): Ditto.
	* gcc.target/x86_64/abi/callabi/vaarg-5b.c (dg-options): Ditto.

From-SVN: r207697
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 66436ec2f72f..6d3743afddb7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,36 @@
+2014-02-11  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR target/59927
+	Revert
+	2013-12-15  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR testsuite/58630
+	* gcc.target/i386/pr43662.c (dg-options):
+	Add -maccumulate-outgoing-args.
+	* gcc.target/i386/pr43869.c (dg-options): Ditto.
+	* gcc.target/i386/pr57003.c (dg-options): Ditto.
+	* gcc.target/i386/avx-vzeroupper-16.c (dg-options):
+	Remove -mtune=generic and add -maccumulate-outgoing-args instead.
+	* gcc.target/i386/avx-vzeroupper-17.c (dg-options): Ditto.
+	* gcc.target/i386/avx-vzeroupper-18.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/func-1.c (dg-options):
+	Add -maccumulate-outgoing-args.
+	* gcc.target/x86_64/abi/callabi/func-2a.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/func-2b.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/func-indirect.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/func-indirect-2a.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/func-indirect-2b.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/leaf-1.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/leaf-2.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/pr38891.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/vaarg-1.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/vaarg-2.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/vaarg-3.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/vaarg-4a.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/vaarg-4b.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/vaarg-5a.c (dg-options): Ditto.
+	* gcc.target/x86_64/abi/callabi/vaarg-5b.c (dg-options): Ditto.
+
 2014-02-11  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* gcc.dg/vect/pr56787.c: Mark as xfail for vect_no_align.
diff --git a/gcc/testsuite/gcc.target/i386/avx-vzeroupper-16.c b/gcc/testsuite/gcc.target/i386/avx-vzeroupper-16.c
index b64add14e6bf..66c8446686cf 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vzeroupper-16.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vzeroupper-16.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target lp64 } } */
-/* { dg-options "-O2 -mavx -mabi=ms -maccumulate-outgoing-args -dp" } */
+/* { dg-options "-O2 -mavx -mabi=ms -dp" } */
 
 typedef float __m256 __attribute__ ((__vector_size__ (32), __may_alias__));
 
diff --git a/gcc/testsuite/gcc.target/i386/avx-vzeroupper-17.c b/gcc/testsuite/gcc.target/i386/avx-vzeroupper-17.c
index 16d29958c7eb..acb432945ec1 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vzeroupper-17.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vzeroupper-17.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target lp64 } } */
-/* { dg-options "-O2 -mavx -mabi=ms -maccumulate-outgoing-args -dp" } */
+/* { dg-options "-O2 -mavx -mabi=ms -dp" } */
 
 typedef float __m256 __attribute__ ((__vector_size__ (32), __may_alias__));
 
diff --git a/gcc/testsuite/gcc.target/i386/avx-vzeroupper-18.c b/gcc/testsuite/gcc.target/i386/avx-vzeroupper-18.c
index 4dcb00f6f114..6f67f3ee322f 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vzeroupper-18.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vzeroupper-18.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target lp64 } } */
-/* { dg-options "-O0 -mavx -mabi=ms -maccumulate-outgoing-args -dp" } */
+/* { dg-options "-O0 -mavx -mabi=ms -dp" } */
 
 typedef float __m256 __attribute__ ((__vector_size__ (32), __may_alias__));
 
diff --git a/gcc/testsuite/gcc.target/i386/pr43662.c b/gcc/testsuite/gcc.target/i386/pr43662.c
index 2d87ddfb5d96..2896a1a52c37 100644
--- a/gcc/testsuite/gcc.target/i386/pr43662.c
+++ b/gcc/testsuite/gcc.target/i386/pr43662.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target lp64 } } */
-/* { dg-options "-O2 -maccumulate-outgoing-args" } */
+/* { dg-options "-O2" } */
 
 void __attribute__ ((ms_abi)) foo (void)
 {
diff --git a/gcc/testsuite/gcc.target/i386/pr43869.c b/gcc/testsuite/gcc.target/i386/pr43869.c
index fbcd4d97ad98..4157db1d1685 100644
--- a/gcc/testsuite/gcc.target/i386/pr43869.c
+++ b/gcc/testsuite/gcc.target/i386/pr43869.c
@@ -1,5 +1,4 @@
 /* { dg-do compile { target lp64 } } */
-/* { dg-options "-maccumulate-outgoing-args" } */
 
 int __attribute__((__noinline__))
 bugged(float f1, float f2, float f3, float f4,
diff --git a/gcc/testsuite/gcc.target/i386/pr57003.c b/gcc/testsuite/gcc.target/i386/pr57003.c
index 91b4f5402e66..dfa6b8b50959 100644
--- a/gcc/testsuite/gcc.target/i386/pr57003.c
+++ b/gcc/testsuite/gcc.target/i386/pr57003.c
@@ -1,6 +1,6 @@
 /* PR rtl-optimization/57003 */
 /* { dg-do run } */
-/* { dg-options "-O2 -maccumulate-outgoing-args" } */
+/* { dg-options "-O2" } */
 
 #define N 2001
 unsigned short *b, *c, *d;
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-1.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-1.c
index 36645bdc3316..7d0b5063637b 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-1.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-1.c
@@ -2,7 +2,7 @@
 */
 /* Origin: Kai Tietz <kai.tietz@onevision.com> */
 /* { dg-do run } */
-/* { dg-options "-std=gnu99 -ffast-math -maccumulate-outgoing-args" } */
+/* { dg-options "-std=gnu99 -ffast-math" } */
 #include "callabi.h"
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-2a.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-2a.c
index c41354942830..513f5619a2ee 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-2a.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-2a.c
@@ -1,6 +1,6 @@
 /* Test for cross x86_64<->w64 abi standard calls.  */
 /* { dg-do run } */
-/* { dg-options "-O2 -mabi=ms -std=gnu99 -ffast-math -fno-builtin -maccumulate-outgoing-args" } */
+/* { dg-options "-O2 -mabi=ms -std=gnu99 -ffast-math -fno-builtin" } */
 /* { dg-additional-sources "func-2b.c" } */
 
 extern void __attribute__ ((sysv_abi)) abort (void);
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-2b.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-2b.c
index 0665665e44a9..fe85dd1860d2 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-2b.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-2b.c
@@ -1,5 +1,5 @@
 /* Test for cross x86_64<->w64 abi standard calls.  */
-/* { dg-options "-mabi=ms -std=gnu99 -ffast-math -fno-builtin -maccumulate-outgoing-args" } */
+/* { dg-options "-mabi=ms -std=gnu99 -ffast-math -fno-builtin" } */
 
 long double func_cross (long double a, double b, float c, long d, int e,
 			char f)
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect-2a.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect-2a.c
index f8a4d78b619f..e1ff8f833746 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect-2a.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect-2a.c
@@ -1,6 +1,6 @@
 /* Test for cross x86_64<->w64 abi standard calls via variable.  */
 /* { dg-do run } */
-/* { dg-options "-O2 -mabi=ms -std=gnu99 -ffast-math -fno-builtin -maccumulate-outgoing-args" } */
+/* { dg-options "-O2 -mabi=ms -std=gnu99 -ffast-math -fno-builtin" } */
 /* { dg-additional-sources "func-indirect-2b.c" } */
 
 extern void __attribute__ ((sysv_abi)) abort (void);
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect-2b.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect-2b.c
index 6d154364a773..1a9fccd97f6a 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect-2b.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect-2b.c
@@ -1,5 +1,5 @@
 /* Test for cross x86_64<->w64 abi standard calls via variable.  */
-/* { dg-options "-O2 -mabi=ms -std=gnu99 -ffast-math -fno-builtin -maccumulate-outgoing-args" } */
+/* { dg-options "-O2 -mabi=ms -std=gnu99 -ffast-math -fno-builtin" } */
 
 typedef int (*func)(void *, char *, char *, short, long long);
 
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect.c
index 1b77a00db672..0c0cbb271cad 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect.c
@@ -2,7 +2,7 @@
 */
 /* Origin: Kai Tietz <kai.tietz@onevision.com> */
 /* { dg-do run } */
-/* { dg-options "-std=gnu99 -ffast-math -maccumulate-outgoing-args" } */
+/* { dg-options "-std=gnu99 -ffast-math" } */
 #include "callabi.h"
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/leaf-1.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/leaf-1.c
index 027134f6c5b5..35f8b53cac1e 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/leaf-1.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/leaf-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mabi=sysv -maccumulate-outgoing-args" } */
+/* { dg-options "-O2 -mabi=sysv" } */
 
 __attribute__ ((ms_abi))
 int foo (void)
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/leaf-2.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/leaf-2.c
index 93b1f64d65ab..2a54bc89cfc2 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/leaf-2.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/leaf-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mabi=sysv -maccumulate-outgoing-args" } */
+/* { dg-options "-O2 -mabi=sysv" } */
 
 extern int glb1, gbl2, gbl3;
 
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/pr38891.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/pr38891.c
index e3503d3582ac..d31b8c3774cb 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/pr38891.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/pr38891.c
@@ -1,7 +1,7 @@
 /* Test for cross x86_64<->w64 abi standard calls.
 */
 /* { dg-do compile } */
-/* { dg-options "-mno-sse -maccumulate-outgoing-args" } */
+/* { dg-options "-mno-sse" } */
 #include "callabi.h"
 
 long double
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-1.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-1.c
index 2be8a9900906..a6d8463ed5c3 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-1.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-1.c
@@ -2,7 +2,7 @@
 */
 /* Origin: Kai Tietz <kai.tietz@onevision.com> */
 /* { dg-do run } */
-/* { dg-options "-std=gnu99 -maccumulate-outgoing-args" } */
+/* { dg-options "-std=gnu99" } */
 #include "callabi.h"
 
 extern __SIZE_TYPE__ strlen (const char *);
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-2.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-2.c
index c6399457918f..e281e860f780 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-2.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-2.c
@@ -2,7 +2,7 @@
 */
 /* Origin: Kai Tietz <kai.tietz@onevision.com> */
 /* { dg-do run } */
-/* { dg-options "-std=gnu99 -maccumulate-outgoing-args" } */
+/* { dg-options "-std=gnu99" } */
 #include "callabi.h"
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-3.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-3.c
index 366d696cf326..7cca7ac87180 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-3.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-3.c
@@ -2,7 +2,7 @@
 */
 /* Origin: Kai Tietz <kai.tietz@onevision.com> */
 /* { dg-do run } */
-/* { dg-options "-std=gnu99 -maccumulate-outgoing-args" } */
+/* { dg-options "-std=gnu99" } */
 #include "callabi.h"
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-4a.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-4a.c
index 94f287d964b3..36bd3483f6af 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-4a.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-4a.c
@@ -1,6 +1,6 @@
 /* Test for cross x86_64<->w64 abi va_list calls.  */
 /* { dg-do run } */
-/* { dg-options "-O2 -mabi=ms -std=gnu99 -fno-builtin -maccumulate-outgoing-args" } */
+/* { dg-options "-O2 -mabi=ms -std=gnu99 -fno-builtin" } */
 /* { dg-additional-sources "vaarg-4b.c" } */
 
 extern __SIZE_TYPE__ __attribute__ ((sysv_abi)) strlen (const char *);
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-4b.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-4b.c
index 444d19039ccd..f33906bd2935 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-4b.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-4b.c
@@ -1,5 +1,5 @@
 /* Test for cross x86_64<->w64 abi va_list calls.  */
-/* { dg-options "-O2 -mabi=ms -std=gnu99 -fno-builtin -maccumulate-outgoing-args" } */
+/* { dg-options "-O2 -mabi=ms -std=gnu99 -fno-builtin" } */
 
 #include <stdarg.h>
 
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-5a.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-5a.c
index fc79877d174e..fa85677797b8 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-5a.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-5a.c
@@ -1,6 +1,6 @@
 /* Test for cross x86_64<->w64 abi va_list calls.  */
 /* { dg-do run } */
-/* { dg-options "-O2 -mabi=ms -std=gnu99 -fno-builtin -maccumulate-outgoing-args" } */
+/* { dg-options "-O2 -mabi=ms -std=gnu99 -fno-builtin" } */
 /* { dg-additional-sources "vaarg-5b.c" } */
 
 extern void __attribute__ ((sysv_abi)) abort (void);
diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-5b.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-5b.c
index c3de7143d448..e5dd4727bdd4 100644
--- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-5b.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-5b.c
@@ -1,5 +1,5 @@
 /* Test for cross x86_64<->w64 abi va_list calls.  */
-/* { dg-options "-O2 -mabi=ms -std=gnu99 -fno-builtin -maccumulate-outgoing-args" } */
+/* { dg-options "-O2 -mabi=ms -std=gnu99 -fno-builtin" } */
 
 #include <stdarg.h>