From 0717c5b0655fada57f4e0726265ad6354fa0bb22 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Sat, 28 Feb 2004 00:28:55 +0000 Subject: [PATCH] charset.exp: Change CFLAGS to CHARSETCFLAGS. 2004-02-27 Eric Christopher * 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 --- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/charset/asm2.c | 2 +- gcc/testsuite/g++.dg/charset/charset.exp | 8 ++++---- gcc/testsuite/gcc.dg/charset/asm3.c | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b1ef10f6ec98..980fc9fc06f5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2004-02-27 Eric Christopher + + * 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 * 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 7cc1379a8a99..8d8dbbb524d5 100644 --- 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 096dc3ec2ea9..dc11c3ff5a2d 100644 --- 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 7cc1379a8a99..8d8dbbb524d5 100644 --- 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" } } -- 2.47.2