From d0a7de7055d1ded39c4e0cfe0ed0411bcd69a1f9 Mon Sep 17 00:00:00 2001
From: Kai Tietz <ktietz@redhat.com>
Date: Fri, 15 Mar 2013 08:15:37 +0100
Subject: [PATCH] movti.c: Don't test for x64 mingw.

	* gcc.target/i386/movti.c: Don't test for x64 mingw.
	* gcc.target/i386/pr20020-1.c: Likewise.
	* gcc.target/i386/pr20020-2.c: Likewise.
	* gcc.target/i386/pr20020-3.c: Likewise.
	* gcc.target/i386/pr53425-1.c: Likewise.
	* gcc.target/i386/pr53425-2.c: Likewise.
	* gcc.target/i386/pr55093.c: Likewise.
	* gcc.target/i386/pr53907.c: Adjust test for LLP64 targets.

From-SVN: r196673
---
 gcc/testsuite/ChangeLog                   | 11 +++++++++++
 gcc/testsuite/gcc.target/i386/movti.c     |  2 +-
 gcc/testsuite/gcc.target/i386/pr20020-1.c |  1 +
 gcc/testsuite/gcc.target/i386/pr20020-2.c |  1 +
 gcc/testsuite/gcc.target/i386/pr20020-3.c |  1 +
 gcc/testsuite/gcc.target/i386/pr53425-1.c |  1 +
 gcc/testsuite/gcc.target/i386/pr53425-2.c |  1 +
 gcc/testsuite/gcc.target/i386/pr53907.c   |  4 +++-
 gcc/testsuite/gcc.target/i386/pr55093.c   |  1 +
 9 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index acd124a..8061867 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2013-03-15  Kai Tietz  <ktietz@redhat.com>
+
+	* gcc.target/i386/movti.c: Don't test for x64 mingw.
+	* gcc.target/i386/pr20020-1.c: Likewise.
+	* gcc.target/i386/pr20020-2.c: Likewise.
+	* gcc.target/i386/pr20020-3.c: Likewise.
+	* gcc.target/i386/pr53425-1.c: Likewise.
+	* gcc.target/i386/pr53425-2.c: Likewise.
+	* gcc.target/i386/pr55093.c: Likewise.
+	* gcc.target/i386/pr53907.c: Adjust test for LLP64 targets.
+
 2013-03-15  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/56307
diff --git a/gcc/testsuite/gcc.target/i386/movti.c b/gcc/testsuite/gcc.target/i386/movti.c
index e306c1e..86a0279 100644
--- a/gcc/testsuite/gcc.target/i386/movti.c
+++ b/gcc/testsuite/gcc.target/i386/movti.c
@@ -7,4 +7,4 @@ _Decimal128 test (void)
   return 1234123412341234.123412341234dl;
 }
 
-/* { dg-final { scan-assembler-not "movabs" } } */
+/* { dg-final { scan-assembler-not "movabs" { target { ! x86_64-*-mingw* } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr20020-1.c b/gcc/testsuite/gcc.target/i386/pr20020-1.c
index 3f10970..f36a8a0 100644
--- a/gcc/testsuite/gcc.target/i386/pr20020-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr20020-1.c
@@ -1,5 +1,6 @@
 /* Check that 128-bit struct's are represented as TImode values.  */
 /* { dg-do compile { target int128 } } */
+/* { dg-skip-if "different ABI" { x86_64-*-mingw* } } */
 /* { dg-options "-O2 -fdump-rtl-expand" } */
 
 struct shared_ptr_struct
diff --git a/gcc/testsuite/gcc.target/i386/pr20020-2.c b/gcc/testsuite/gcc.target/i386/pr20020-2.c
index e8c5b3d..fa5b6ed 100644
--- a/gcc/testsuite/gcc.target/i386/pr20020-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr20020-2.c
@@ -1,5 +1,6 @@
 /* Check that 128-bit struct's are represented as TImode values.  */
 /* { dg-do compile { target int128 } } */
+/* { dg-skip-if "different ABI" { x86_64-*-mingw* } } */
 /* { dg-options "-O2 -fdump-rtl-expand" } */
 
 struct shared_ptr_struct
diff --git a/gcc/testsuite/gcc.target/i386/pr20020-3.c b/gcc/testsuite/gcc.target/i386/pr20020-3.c
index b1cc926..a30fbc4 100644
--- a/gcc/testsuite/gcc.target/i386/pr20020-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr20020-3.c
@@ -1,5 +1,6 @@
 /* Check that 128-bit struct's are represented as TImode values.  */
 /* { dg-do compile { target int128 } } */
+/* { dg-skip-if "different ABI" { x86_64-*-mingw* } } */
 /* { dg-options "-O2 -fdump-rtl-expand" } */
 
 struct shared_ptr_struct
diff --git a/gcc/testsuite/gcc.target/i386/pr53425-1.c b/gcc/testsuite/gcc.target/i386/pr53425-1.c
index 2446c0f..00143f3 100644
--- a/gcc/testsuite/gcc.target/i386/pr53425-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr53425-1.c
@@ -1,6 +1,7 @@
 /* PR target/53425 */
 /* { dg-do compile { target { ! { ia32 } } } } */
 /* { dg-options "-O2 -mno-sse" } */
+/* { dg-skip-if "no SSE vector" { x86_64-*-mingw* } } */
 
 typedef double __v2df __attribute__ ((__vector_size__ (16)));
 
diff --git a/gcc/testsuite/gcc.target/i386/pr53425-2.c b/gcc/testsuite/gcc.target/i386/pr53425-2.c
index b89a5b1..97523f3 100644
--- a/gcc/testsuite/gcc.target/i386/pr53425-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr53425-2.c
@@ -1,6 +1,7 @@
 /* PR target/53425 */
 /* { dg-do compile { target { ! { ia32 } } } } */
 /* { dg-options "-O2 -mno-sse" } */
+/* { dg-skip-if "no SSE vector" { x86_64-*-mingw* } } */
 
 typedef float __v2sf __attribute__ ((__vector_size__ (8)));
 
diff --git a/gcc/testsuite/gcc.target/i386/pr53907.c b/gcc/testsuite/gcc.target/i386/pr53907.c
index 8de8f0d..27e2e02 100644
--- a/gcc/testsuite/gcc.target/i386/pr53907.c
+++ b/gcc/testsuite/gcc.target/i386/pr53907.c
@@ -3,10 +3,12 @@
 
 #include <emmintrin.h>
 
+__extension__ typedef __UINTPTR_TYPE__ uintptr_t;
+
 __m128i x(char *s)
 {
   __m128i sz,z,mvec;
-  s-=((unsigned long) s)%16;
+  s-=((uintptr_t) s)%16;
   sz=_mm_load_si128((__m128i *)s);
   return sz;
 }
diff --git a/gcc/testsuite/gcc.target/i386/pr55093.c b/gcc/testsuite/gcc.target/i386/pr55093.c
index 76b4042..3d32a57 100644
--- a/gcc/testsuite/gcc.target/i386/pr55093.c
+++ b/gcc/testsuite/gcc.target/i386/pr55093.c
@@ -1,5 +1,6 @@
 /* { dg-do compile { target { ! { ia32 } } } } */
 /* { dg-options "-O2 -mx32 -maddress-mode=long" } */
+/* { dg-skip-if "different ABI" { x86_64-*-mingw* } } */
 
 typedef union tree_node *tree;
 typedef const union tree_node *const_tree;
-- 
2.7.4