charset.exp: Change CFLAGS to CHARSETCFLAGS.

2004-02-27  Eric Christopher  <echristo@redhat.com>

	* g++.dg/charset/charset.exp: Change CFLAGS to CHARSETCFLAGS.
	* g++.dg/charset/asm2.c: Run only x86.
	* gcc.dg/charset/asm3.c: Ditto.

From-SVN: r78596

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b1ef10f6ec98678cecee27c79870e72151dfd43c..980fc9fc06f57f22879e65d478f2e88c26ea566d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-27  Eric Christopher  <echristo@redhat.com>
+
+       * g++.dg/charset/charset.exp: Change CFLAGS to CHARSETCFLAGS.
+       * g++.dg/charset/asm2.c: Run only x86.
+       * gcc.dg/charset/asm3.c: Ditto.
+
 2004-02-27  Aldy Hernandez  <aldyh@redhat.com>
 
        * lib/g++.exp (g++_link_flags): Append LD_LIBRARY_PATH to

diff --git a/gcc/testsuite/g++.dg/charset/asm2.c b/gcc/testsuite/g++.dg/charset/asm2.c
index 7cc1379a8a99d6c5ac58db05b0039e0d285a7e45..8d8dbbb524d560e9b05139a374c1933497b1b691 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/asm2.c
+++ b/gcc/testsuite/g++.dg/charset/asm2.c
@@ -1,6 +1,6 @@
 /* Test for complex asm statements. Make sure it compiles
    then test for some of the asm statements not being translated.  */
-/* { dg-do compile }
+/* { dg-do compile { target i?86-*-* } }
    { dg-require-iconv "IBM-1047" }
    { dg-final { scan-assembler "std" } }
    { dg-final { scan-assembler "cld" } }

diff --git a/gcc/testsuite/g++.dg/charset/charset.exp b/gcc/testsuite/g++.dg/charset/charset.exp
index 096dc3ec2ea93e5bfdc2f69edbeef33853e5454b..dc11c3ff5a2d8939acb396fe801423ae3f8271d0 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/charset.exp
+++ b/gcc/testsuite/g++.dg/charset/charset.exp
@@ -28,9 +28,9 @@ load_lib g++-dg.exp
 load_lib target-supports.exp
 
 # If a testcase doesn't have special options, use these.
-global DEFAULT_CFLAGS
-if ![info exists DEFAULT_CFLAGS] then {
-    set DEFAULT_CFLAGS "-fexec-charset=IBM-1047"
+global DEFAULT_CHARSETCFLAGS
+if ![info exists DEFAULT_CHARSETCFLAGS] then {
+    set DEFAULT_CHARSETCFLAGS "-fexec-charset=IBM-1047"
 }
 
 # Initialize `dg'.
@@ -38,7 +38,7 @@ dg-init
 
 # Main loop.
 dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{c,S} ]] \
-        "" $DEFAULT_CFLAGS
+        "" $DEFAULT_CHARSETCFLAGS
 
 # All done.
 dg-finish

diff --git a/gcc/testsuite/gcc.dg/charset/asm3.c b/gcc/testsuite/gcc.dg/charset/asm3.c
index 7cc1379a8a99d6c5ac58db05b0039e0d285a7e45..8d8dbbb524d560e9b05139a374c1933497b1b691 100644 (file)
--- a/gcc/testsuite/gcc.dg/charset/asm3.c
+++ b/gcc/testsuite/gcc.dg/charset/asm3.c
@@ -1,6 +1,6 @@
 /* Test for complex asm statements. Make sure it compiles
    then test for some of the asm statements not being translated.  */
-/* { dg-do compile }
+/* { dg-do compile { target i?86-*-* } }
    { dg-require-iconv "IBM-1047" }
    { dg-final { scan-assembler "std" } }
    { dg-final { scan-assembler "cld" } }