From: Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
Date: Sat, 3 Dec 2005 16:45:14 +0000 (+0000)
Subject: backport: [multiple changes]
X-Git-Tag: releases/gcc-3.4.6~278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9851904f1c0b4e47f4c7982cf29cb3b54749fcd2;p=thirdparty%2Fgcc.git

backport: [multiple changes]

2005-12-03  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

	* gcc.dg/loop-3.c: Skip if ix86 and -m64.
	* gcc.dg/i386-local.c: Likewise.  Also skip if x86_64 and -m32.

	Backport:

	2005-08-25  Alan Modra  <amodra@bigpond.net.au>
        * gcc.dg/20020103-1.c: Scan for LC[0-9], not LC.

	2004-12-09  Richard Henderson  <rth@redhat.com>
        * gcc.dg/loop-3.c: Don't use i386 tuning for amd64.

	2004-11-17  Janis Johnson  <janis187@us.ibm.com>
	* gcc.dg/i386-sse-8.c: Use dg-skip-if i?86 -m64.

	2004-04-06  Jakub Jelinek  <jakub@redhat.com>
        * gcc.dg/i386-sse-8.c: Don't use -march=pentium3 on x86_64.
        * gcc.dg/i386-local.c: Expect %edi, not %eax register on x86_64.
        * gcc.dg/20020103-1.c: Add -fno-asynchronous-unwind-tables to options.

From-SVN: r108000
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3a315d52b3e2..9d91df6d9682 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,24 @@
+2005-12-03  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* gcc.dg/loop-3.c: Skip if ix86 and -m64.
+	* gcc.dg/i386-local.c: Likewise.  Also skip if x86_64 and -m32.
+	
+	Backport:
+	
+	2005-08-25  Alan Modra  <amodra@bigpond.net.au>
+        * gcc.dg/20020103-1.c: Scan for LC[0-9], not LC.
+
+	2004-12-09  Richard Henderson  <rth@redhat.com>
+        * gcc.dg/loop-3.c: Don't use i386 tuning for amd64.
+
+	2004-11-17  Janis Johnson  <janis187@us.ibm.com>
+	* gcc.dg/i386-sse-8.c: Use dg-skip-if i?86 -m64.
+
+	2004-04-06  Jakub Jelinek  <jakub@redhat.com>
+        * gcc.dg/i386-sse-8.c: Don't use -march=pentium3 on x86_64.
+        * gcc.dg/i386-local.c: Expect %edi, not %eax register on x86_64.
+        * gcc.dg/20020103-1.c: Add -fno-asynchronous-unwind-tables to options.
+
 2005-12-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* g++.old-deja/g++.other/enum5.C: Change from "run" to "compile".
diff --git a/gcc/testsuite/gcc.dg/20020103-1.c b/gcc/testsuite/gcc.dg/20020103-1.c
index 5197fa67e1f8..54ad83c21e52 100644
--- a/gcc/testsuite/gcc.dg/20020103-1.c
+++ b/gcc/testsuite/gcc.dg/20020103-1.c
@@ -1,8 +1,8 @@
 /* Verify that constant equivalences get reloaded properly, either by being
    spilled to the stack, or regenerated, but not dropped to memory.  */
 /* { dg-do compile { target i?86-*-* powerpc-*-* rs6000-*-* alpha*-*-* x86_64-*-*} } */
-/* { dg-options "-O2 -fpic -fno-omit-frame-pointer" } */
-/* { dg-final { scan-assembler-not "LC" } } */
+/* { dg-options "-O2 -fpic -fno-omit-frame-pointer -fno-asynchronous-unwind-tables" } */
+/* { dg-final { scan-assembler-not "LC\[0-9\]" } } */
 
 /* Clobber all call-saved registers that can hold a pointer value.  */
 #if defined(__i386__)
diff --git a/gcc/testsuite/gcc.dg/i386-local.c b/gcc/testsuite/gcc.dg/i386-local.c
index 0c3103007cfc..1ff6b53b66df 100644
--- a/gcc/testsuite/gcc.dg/i386-local.c
+++ b/gcc/testsuite/gcc.dg/i386-local.c
@@ -1,6 +1,9 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -funit-at-a-time" } */
-/* { dg-final { scan-assembler "magic\[^\\n\]*eax" } } */
+/* { dg-final { scan-assembler "magic\[^\\n\]*eax" { target i?86-*-* } } } */
+/* { dg-final { scan-assembler "magic\[^\\n\]*edi" { target x86_64-*-* } } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-skip-if "" { x86_64-*-* } { "-m32" } { "" } } */
 
 /* Verify that local calling convention is used.  */
 static t(int) __attribute__ ((noinline));
diff --git a/gcc/testsuite/gcc.dg/i386-sse-8.c b/gcc/testsuite/gcc.dg/i386-sse-8.c
index d6e1056c0a9b..ffaa5fa93900 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-8.c
+++ b/gcc/testsuite/gcc.dg/i386-sse-8.c
@@ -2,7 +2,8 @@
 /* Origin: <Pawe Sikora <pluto@ds14.agh.edu.pl> */
 
 /* { dg-do compile } */
-/* { dg-options "-march=pentium3" { target i?86-*-* x86_64-*-* } } */
+/* { dg-options "-march=pentium3" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 int main() 
 { 
diff --git a/gcc/testsuite/gcc.dg/loop-3.c b/gcc/testsuite/gcc.dg/loop-3.c
index ba6fe5563158..8c7b1a4cffc9 100644
--- a/gcc/testsuite/gcc.dg/loop-3.c
+++ b/gcc/testsuite/gcc.dg/loop-3.c
@@ -3,7 +3,8 @@
 
 /* { dg-do compile } */
 /* { dg-options "-O3" } */
-/* { dg-options "-O3 -mtune=i386" { target i?86-*-* x86_64-*-* } } */
+/* { dg-options "-O3 -mtune=i386" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 #if defined(STACK_SIZE) && (STACK_SIZE < 65536)
 # define BYTEMEM_SIZE 10000L