asm1.c: Check for IBM1047 code set, not IBM-1047.

	* g++.dg/charset/asm1.c: Check for IBM1047 code set, not IBM-1047.
	* g++.dg/charset/asm2.c: Likewise.
	* g++.dg/charset/asm3.c: Likewise.
	* g++.dg/charset/asm4.c: Likewise.
	* g++.dg/charset/asm5.c: Likewise.
	* g++.dg/charset/attribute1.c: Likewise.
	* g++.dg/charset/attribute2.c: Likewise.
	* g++.dg/charset/extern1.cc: Likewise.
	* g++.dg/charset/extern2.cc: Likewise.
	* g++.dg/charset/extern3.cc: Likewise.
	* g++.dg/charset/function.cc: Likewise.
	* g++.dg/charset/string.c: Likewise.
	* g++.dg/charset/charset.exp: Likewise.
	* lib/target-supports.exp (check_iconv_available): Fix comment.

From-SVN: r95388

14 files changed, 31 insertions, 14 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9186109..e8661bf 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,22 @@
 2005-02-22  Uros Bizjak  <uros@kss-loka.si>
 
+	* g++.dg/charset/asm1.c: Check for IBM1047 code set, not IBM-1047.
+	* g++.dg/charset/asm2.c: Likewise.
+	* g++.dg/charset/asm3.c: Likewise.
+	* g++.dg/charset/asm4.c: Likewise.
+	* g++.dg/charset/asm5.c: Likewise.
+	* g++.dg/charset/attribute1.c: Likewise.
+	* g++.dg/charset/attribute2.c: Likewise.
+	* g++.dg/charset/extern1.cc: Likewise.
+	* g++.dg/charset/extern2.cc: Likewise.
+	* g++.dg/charset/extern3.cc: Likewise.
+	* g++.dg/charset/function.cc: Likewise.
+	* g++.dg/charset/string.c: Likewise.
+	* g++.dg/charset/charset.exp: Likewise.
+	* lib/target-supports.exp (check_iconv_available): Fix comment.
+
+2005-02-22  Uros Bizjak  <uros@kss-loka.si>
+
 	* gcc.dg/charset/builtin1.c: Use dg-require-iconv "IBM1047".
 	* gcc.dg/charset/asm1.c: Check for IBM1047 code set, not IBM-1047.
 	* gcc.dg/charset/asm2.c: Likewise.
@@ -13,7 +30,7 @@
 	* gcc.dg/charset/extern.c: Likewise.
 	* gcc.dg/charset/function.c: Likewise.
 	* gcc.dg/charset/string.c: Likewise.
-	* gcc.dg/charset/charset.exp:Likewise.
+	* gcc.dg/charset/charset.exp: Likewise.
 
 2005-02-21  Bud Davis  <bdavis9659@comcast.net>
 
diff --git a/gcc/testsuite/g++.dg/charset/asm1.c b/gcc/testsuite/g++.dg/charset/asm1.c
index 9c0ff28..7076d12 100644
--- a/gcc/testsuite/g++.dg/charset/asm1.c
+++ b/gcc/testsuite/g++.dg/charset/asm1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target *-*-* } }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler ".ascii bar" } }
    { dg-final { scan-assembler ".ascii foo" } }
  */
diff --git a/gcc/testsuite/g++.dg/charset/asm2.c b/gcc/testsuite/g++.dg/charset/asm2.c
index 8d8dbbb..8ae2212 100644
--- a/gcc/testsuite/g++.dg/charset/asm2.c
+++ b/gcc/testsuite/g++.dg/charset/asm2.c
@@ -1,7 +1,7 @@
 /* Test for complex asm statements. Make sure it compiles
    then test for some of the asm statements not being translated.  */
 /* { dg-do compile { target i?86-*-* } }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler "std" } }
    { dg-final { scan-assembler "cld" } }
    { dg-final { scan-assembler "rep" } }
diff --git a/gcc/testsuite/g++.dg/charset/asm3.c b/gcc/testsuite/g++.dg/charset/asm3.c
index cd850c3..59c8d59 100644
--- a/gcc/testsuite/g++.dg/charset/asm3.c
+++ b/gcc/testsuite/g++.dg/charset/asm3.c
@@ -1,6 +1,6 @@
 /* Simple asm test.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler "foo" } } */
 extern int bar;
 
diff --git a/gcc/testsuite/g++.dg/charset/asm4.c b/gcc/testsuite/g++.dg/charset/asm4.c
index fa93f40..a4bb014 100644
--- a/gcc/testsuite/g++.dg/charset/asm4.c
+++ b/gcc/testsuite/g++.dg/charset/asm4.c
@@ -1,6 +1,6 @@
 /* Test for string translation.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler-not "translate" } } */
 void foo (void)
 {
diff --git a/gcc/testsuite/g++.dg/charset/asm5.c b/gcc/testsuite/g++.dg/charset/asm5.c
index 9131622..ae2ec48 100644
--- a/gcc/testsuite/g++.dg/charset/asm5.c
+++ b/gcc/testsuite/g++.dg/charset/asm5.c
@@ -1,6 +1,6 @@
 /* Test for string translation.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" } 
+   { dg-require-iconv "IBM1047" } 
    { dg-final { scan-assembler "foo" } } */
 int main()
 {
diff --git a/gcc/testsuite/g++.dg/charset/attribute1.c b/gcc/testsuite/g++.dg/charset/attribute1.c
index 993c793..7996300 100644
--- a/gcc/testsuite/g++.dg/charset/attribute1.c
+++ b/gcc/testsuite/g++.dg/charset/attribute1.c
@@ -1,6 +1,6 @@
 /* Test for attribute non-translation.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler "foo" } } */
 int walrus __attribute__ ((section (".foo")));
 
diff --git a/gcc/testsuite/g++.dg/charset/attribute2.c b/gcc/testsuite/g++.dg/charset/attribute2.c
index 3cb766a..dcb28f2 100644
--- a/gcc/testsuite/g++.dg/charset/attribute2.c
+++ b/gcc/testsuite/g++.dg/charset/attribute2.c
@@ -2,7 +2,7 @@
    If error recovery is ever testable then "foobar" should be
    translated.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
 */
 int foo __attribute__ ((walrus)); /* { dg-error "walrus" "ignored" } */
 char x[] = "foobar";
diff --git a/gcc/testsuite/g++.dg/charset/charset.exp b/gcc/testsuite/g++.dg/charset/charset.exp
index 7a74217..6bb1959 100644
--- a/gcc/testsuite/g++.dg/charset/charset.exp
+++ b/gcc/testsuite/g++.dg/charset/charset.exp
@@ -30,7 +30,7 @@ load_lib target-supports.exp
 # If a testcase doesn't have special options, use these.
 global DEFAULT_CHARSETCFLAGS
 if ![info exists DEFAULT_CHARSETCFLAGS] then {
-    set DEFAULT_CHARSETCFLAGS "-fexec-charset=IBM-1047"
+    set DEFAULT_CHARSETCFLAGS "-fexec-charset=IBM1047"
 }
 
 # Initialize `dg'.
diff --git a/gcc/testsuite/g++.dg/charset/extern1.cc b/gcc/testsuite/g++.dg/charset/extern1.cc
index 2a68ab7..09284ad 100644
--- a/gcc/testsuite/g++.dg/charset/extern1.cc
+++ b/gcc/testsuite/g++.dg/charset/extern1.cc
@@ -1,6 +1,6 @@
 /* Test extern statments not being translated. */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
 */
 
 extern  "C" {
diff --git a/gcc/testsuite/g++.dg/charset/extern2.cc b/gcc/testsuite/g++.dg/charset/extern2.cc
index 82157a6..3a8f4e8 100644
--- a/gcc/testsuite/g++.dg/charset/extern2.cc
+++ b/gcc/testsuite/g++.dg/charset/extern2.cc
@@ -1,5 +1,5 @@
 /* Check that we push the declaration and then continue translation.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler-not "foobar" } } */
 extern "C" { char *foo = "foobar"; }
diff --git a/gcc/testsuite/g++.dg/charset/extern3.cc b/gcc/testsuite/g++.dg/charset/extern3.cc
index 5e46ca6..05a0c3e 100644
--- a/gcc/testsuite/g++.dg/charset/extern3.cc
+++ b/gcc/testsuite/g++.dg/charset/extern3.cc
@@ -1,5 +1,5 @@
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler-not "abcdefghijklmnopqrstuvwxyz" } } */
 
 extern char *bar;
diff --git a/gcc/testsuite/g++.dg/charset/function.cc b/gcc/testsuite/g++.dg/charset/function.cc
index ab4c2bc..5aba651 100644
--- a/gcc/testsuite/g++.dg/charset/function.cc
+++ b/gcc/testsuite/g++.dg/charset/function.cc
@@ -1,5 +1,5 @@
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler-not "\"foobar\"" } } */
 
 const char *str;
diff --git a/gcc/testsuite/g++.dg/charset/string.c b/gcc/testsuite/g++.dg/charset/string.c
index 375e28a..f720773 100644
--- a/gcc/testsuite/g++.dg/charset/string.c
+++ b/gcc/testsuite/g++.dg/charset/string.c
@@ -1,5 +1,5 @@
 /* Simple character translation test.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler-not "string foobar" } } */
 char *foo = "string foobar";