From 37e1a18f04e97714fa63d486bbce76e28e22baa3 Mon Sep 17 00:00:00 2001
From: Georg-Johann Lay <avr@gjlay.de>
Date: Tue, 14 Jun 2011 10:45:17 +0000
Subject: [PATCH] cmpsi-2.c: Undo 172757.

testsuite/
	* gcc.c-torture/execute/cmpsi-2.c: Undo 172757.
	* gcc.c-torture/execute/cmpsi-2.x: New file.
	* gcc.c-torture/execute/pr45262.c: Undo 172757.
	* gcc.c-torture/execute/pr45262.x: New file.
	* gcc.c-torture/compile/pr46534.c: Skip for AVR.
	* gcc.c-torture/compile/pr49029.c: Add dg-require-effective-target
	int32plus
	* gcc.c-torture/compile/pr49163.c: Ditto.

From-SVN: r175012
---
 gcc/testsuite/ChangeLog                       | 11 +++++++++++
 gcc/testsuite/gcc.c-torture/compile/pr46534.c |  2 +-
 gcc/testsuite/gcc.c-torture/compile/pr49029.c |  1 +
 gcc/testsuite/gcc.c-torture/compile/pr49163.c |  1 +
 gcc/testsuite/gcc.c-torture/execute/cmpsi-2.c |  2 --
 gcc/testsuite/gcc.c-torture/execute/cmpsi-2.x |  7 +++++++
 gcc/testsuite/gcc.c-torture/execute/pr45262.c |  1 -
 gcc/testsuite/gcc.c-torture/execute/pr45262.x |  7 +++++++
 8 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/gcc.c-torture/execute/cmpsi-2.x
 create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr45262.x

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ea38b829abc..a117e656430 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2011-06-14  Georg-Johann Lay  <avr@gjlay.de>
+
+	* gcc.c-torture/execute/cmpsi-2.c: Undo 172757.
+	* gcc.c-torture/execute/cmpsi-2.x: New file.
+	* gcc.c-torture/execute/pr45262.c: Undo 172757.
+	* gcc.c-torture/execute/pr45262.x: New file.
+	* gcc.c-torture/compile/pr46534.c: Skip for AVR.
+	* gcc.c-torture/compile/pr49029.c: Add dg-require-effective-target
+	int32plus
+	* gcc.c-torture/compile/pr49163.c: Ditto.
+
 2011-06-14  Ira Rosen  <ira.rosen@linaro.org>
 
 	* gcc.dg/vect/vect-16.c: Rename to...
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr46534.c b/gcc/testsuite/gcc.c-torture/compile/pr46534.c
index dc3c967cc2a..67c8ad21ebf 100644
--- a/gcc/testsuite/gcc.c-torture/compile/pr46534.c
+++ b/gcc/testsuite/gcc.c-torture/compile/pr46534.c
@@ -1,4 +1,4 @@
-/* { dg-skip-if "too big" { pdp11-*-* } { "*" } { "" } } */
+/* { dg-skip-if "too big" { avr-*-* pdp11-*-* } { "*" } { "" } } */
 /* PR middle-end/46534 */
 
 extern int printf (const char *, ...);
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr49029.c b/gcc/testsuite/gcc.c-torture/compile/pr49029.c
index ebe81b31b28..71199d44515 100644
--- a/gcc/testsuite/gcc.c-torture/compile/pr49029.c
+++ b/gcc/testsuite/gcc.c-torture/compile/pr49029.c
@@ -1,4 +1,5 @@
 /* PR middle-end/49029 */
+/* { dg-require-effective-target int32plus } */
 struct S { volatile unsigned f : 11; signed g : 30; } __attribute__((packed));
 struct T { volatile struct S h; } __attribute__((packed)) a;
 void foo (int);
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr49163.c b/gcc/testsuite/gcc.c-torture/compile/pr49163.c
index f14ab1531e6..4f3b056053e 100644
--- a/gcc/testsuite/gcc.c-torture/compile/pr49163.c
+++ b/gcc/testsuite/gcc.c-torture/compile/pr49163.c
@@ -1,4 +1,5 @@
 /* PR target/49163 */
+/* { dg-require-effective-target int32plus } */
 struct S1
 {
  unsigned f0:18;
diff --git a/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.c b/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.c
index 4378b719e83..62832a9bffc 100644
--- a/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.c
@@ -1,5 +1,3 @@
-/* { dg-require-effective-target int32plus } */
-
 #define F 140
 #define T 13
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.x b/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.x
new file mode 100644
index 00000000000..121fcfecc2c
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.x
@@ -0,0 +1,7 @@
+load_lib target-supports.exp
+
+if { [check_effective_target_int16] } {
+	return 1
+}
+
+return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr45262.c b/gcc/testsuite/gcc.c-torture/execute/pr45262.c
index e94f4ff29ec..72e186bf287 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr45262.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr45262.c
@@ -1,5 +1,4 @@
 /* PR middle-end/45262 */
-/* { dg-require-effective-target int32plus } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr45262.x b/gcc/testsuite/gcc.c-torture/execute/pr45262.x
new file mode 100644
index 00000000000..121fcfecc2c
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr45262.x
@@ -0,0 +1,7 @@
+load_lib target-supports.exp
+
+if { [check_effective_target_int16] } {
+	return 1
+}
+
+return 0;
-- 
2.30.2