Check ia32 instead of ilp32 for ia32 tests.

2011-07-28  H.J. Lu  <hongjiu.lu@intel.com>

	* testsuite/lib/libgomp.exp (libgomp_init): Add -march=i486
	for ia32 instead of ilp32.

	* testsuite/libgomp.c/atomic-1.c: Require ia32 instead of ilp32.
	* testsuite/libgomp.c/atomic-6.c: Likewise.

From-SVN: r176893

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index b9455b416384c7a5ead869f72553b8c6ec890772..19c88fbb8fb9bb6d7d97521fdedea31bafc6b8f8 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * testsuite/lib/libgomp.exp (libgomp_init): Add -march=i486
+       for ia32 instead of ilp32.
+
+       * testsuite/libgomp.c/atomic-1.c: Require ia32 instead of ilp32.
+       * testsuite/libgomp.c/atomic-6.c: Likewise.
+
 2011-07-23  Sebastian Pop  <sebastian.pop@amd.com>
 
        * testsuite/libgomp.graphite/force-parallel-1.c: Un-xfail.

diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 976543dab17cb8720637b263820f5e6f57f280d3..a75e22f7899699cc06299b92a54e7442fffe815b 100644 (file)
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -140,7 +140,7 @@ proc libgomp_init { args } {
 
     # We use atomic operations in the testcases to validate results.
     if { ([istarget i?86-*-*] || [istarget x86_64-*-*])
-        && [check_effective_target_ilp32] } {
+        && [check_effective_target_ia32] } {
        lappend ALWAYS_CFLAGS "additional_flags=-march=i486"
     }
 

diff --git a/libgomp/testsuite/libgomp.c/atomic-1.c b/libgomp/testsuite/libgomp.c/atomic-1.c
index b2be8f022ea11bba74e7c8d1133eb6940db9ba63..4725b7de2513ec8936bc5540d52cb35af1158842 100644 (file)
--- a/libgomp/testsuite/libgomp.c/atomic-1.c
+++ b/libgomp/testsuite/libgomp.c/atomic-1.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=pentium" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-options "-O2 -march=pentium" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
 
 #ifdef __i386__
 #include "cpuid.h"

diff --git a/libgomp/testsuite/libgomp.c/atomic-6.c b/libgomp/testsuite/libgomp.c/atomic-6.c
index 59baf7dd3e20b744980748c5386384f7f0ec2a6a..f8ab75e6a88a0205cca3fb3c2183157c914fc519 100644 (file)
--- a/libgomp/testsuite/libgomp.c/atomic-6.c
+++ b/libgomp/testsuite/libgomp.c/atomic-6.c
@@ -1,7 +1,7 @@
 /* PR middle-end/36106 */
 /* { dg-options "-O2" } */
 /* { dg-options "-O2 -mieee" { target alpha*-*-* } } */
-/* { dg-options "-O2 -march=i586" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-options "-O2 -march=i586" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
 
 #ifdef __i386__
 # include "cpuid.h"