* gcc.dg/weak/weak.exp: Simplify.

	* gcc.dg/weak/typeof-2.c: Use dg-require-weak.
	* gcc.dg/weak/weak-1.c: Likewise.
	* gcc.dg/weak/weak-2.c: Likewise.
	* gcc.dg/weak/weak-3.c: Likewise.
	* gcc.dg/weak/weak-4.c: Likewise.
	* gcc.dg/weak/weak-5.c: Likewise.
	* gcc.dg/weak/weak-6.c: Likewise.
	* gcc.dg/weak/weak-7.c: Likewise.
	* gcc.dg/weak/weak-8.c: Likewise.
	* gcc.dg/weak/weak-9.c: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67571 138bc75d-0d04-0410-961f-82ee72b054a4

12 files changed, 29 insertions, 15 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 470d6967e33..6afa7fb5e54 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,17 @@
+2003-06-06  Mark Mitchell  <mark@codesourcery.com>
+
+	* gcc.dg/weak/weak.exp: Simplify.
+	* gcc.dg/weak/typeof-2.c: Use dg-require-weak.
+	* gcc.dg/weak/weak-1.c: Likewise.
+	* gcc.dg/weak/weak-2.c: Likewise.
+	* gcc.dg/weak/weak-3.c: Likewise.
+	* gcc.dg/weak/weak-4.c: Likewise.
+	* gcc.dg/weak/weak-5.c: Likewise.
+	* gcc.dg/weak/weak-6.c: Likewise.
+	* gcc.dg/weak/weak-7.c: Likewise.
+	* gcc.dg/weak/weak-8.c: Likewise.
+	* gcc.dg/weak/weak-9.c: Likewise.
+
 2003-06-06  Richard Earnshaw  <rearnsha@arm.com>
 
 	gcc.c-torture/execute/20030606-1.c: New.
diff --git a/gcc/testsuite/gcc.dg/weak/typeof-2.c b/gcc/testsuite/gcc.dg/weak/typeof-2.c
index f2c7c07f6d7..7e58bc8b9bb 100644
--- a/gcc/testsuite/gcc.dg/weak/typeof-2.c
+++ b/gcc/testsuite/gcc.dg/weak/typeof-2.c
@@ -1,5 +1,6 @@
 /* Test typeof with __asm redirection. */
 /* { dg-do compile } */
+/* { dg-require-weak "" } */
 /* { dg-options "-O2" } */
 
 extern int foo1 (int x) __asm ("baz1");
diff --git a/gcc/testsuite/gcc.dg/weak/weak-1.c b/gcc/testsuite/gcc.dg/weak/weak-1.c
index 52d7230ed04..078c3ef3615 100644
--- a/gcc/testsuite/gcc.dg/weak/weak-1.c
+++ b/gcc/testsuite/gcc.dg/weak/weak-1.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-weak "" } */
 /* { dg-options "-fno-common" } */
 
 /* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?a" } } */
diff --git a/gcc/testsuite/gcc.dg/weak/weak-2.c b/gcc/testsuite/gcc.dg/weak/weak-2.c
index 37fa19a1a65..7f9cde5d095 100644
--- a/gcc/testsuite/gcc.dg/weak/weak-2.c
+++ b/gcc/testsuite/gcc.dg/weak/weak-2.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-weak "" } */
 /* { dg-options "-fno-common" } */
 
 /* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?ffoo1a" } } */
diff --git a/gcc/testsuite/gcc.dg/weak/weak-3.c b/gcc/testsuite/gcc.dg/weak/weak-3.c
index 47359edcd09..d13df69bb67 100644
--- a/gcc/testsuite/gcc.dg/weak/weak-3.c
+++ b/gcc/testsuite/gcc.dg/weak/weak-3.c
@@ -1,3 +1,4 @@
+/* { dg-require-weak "" } */
 /* { dg-do compile } */
 /* { dg-options "-fno-common" } */
 
diff --git a/gcc/testsuite/gcc.dg/weak/weak-4.c b/gcc/testsuite/gcc.dg/weak/weak-4.c
index bd530ab5940..622a1c6675e 100644
--- a/gcc/testsuite/gcc.dg/weak/weak-4.c
+++ b/gcc/testsuite/gcc.dg/weak/weak-4.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-weak "" } */
 /* { dg-options "-fno-common" } */
 
 /* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?vfoo1a" } } */
diff --git a/gcc/testsuite/gcc.dg/weak/weak-5.c b/gcc/testsuite/gcc.dg/weak/weak-5.c
index c4f67e59c76..d70f6330490 100644
--- a/gcc/testsuite/gcc.dg/weak/weak-5.c
+++ b/gcc/testsuite/gcc.dg/weak/weak-5.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-weak "" } */
 /* { dg-options "-fno-common" } */
 
 /* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?vfoo1a" } } */
diff --git a/gcc/testsuite/gcc.dg/weak/weak-6.c b/gcc/testsuite/gcc.dg/weak/weak-6.c
index 8f88a675d31..531c581dc26 100644
--- a/gcc/testsuite/gcc.dg/weak/weak-6.c
+++ b/gcc/testsuite/gcc.dg/weak/weak-6.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-weak "" } */
 
 extern void * foo (void);
 void * foo (void) { return (void *)foo; } /* { dg-error "precede" } */
diff --git a/gcc/testsuite/gcc.dg/weak/weak-7.c b/gcc/testsuite/gcc.dg/weak/weak-7.c
index 64d6155a890..bf2bbb95635 100644
--- a/gcc/testsuite/gcc.dg/weak/weak-7.c
+++ b/gcc/testsuite/gcc.dg/weak/weak-7.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-weak "" } */
 
 extern void * foo (void);
 void * foo (void) { return (void *)foo; } /* { dg-error "precede" } */
diff --git a/gcc/testsuite/gcc.dg/weak/weak-8.c b/gcc/testsuite/gcc.dg/weak/weak-8.c
index 6e9c267bd21..3de2e1e2fa1 100644
--- a/gcc/testsuite/gcc.dg/weak/weak-8.c
+++ b/gcc/testsuite/gcc.dg/weak/weak-8.c
@@ -1,4 +1,5 @@
 /* { dg-do assemble } */
+/* { dg-require-weak "" } */
 
 __attribute__ ((weak)) int i;
 
diff --git a/gcc/testsuite/gcc.dg/weak/weak-9.c b/gcc/testsuite/gcc.dg/weak/weak-9.c
index e5cbdb8bc87..29a4e650d2b 100644
--- a/gcc/testsuite/gcc.dg/weak/weak-9.c
+++ b/gcc/testsuite/gcc.dg/weak/weak-9.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-weak "" } */
 /* { dg-options "-fno-common" } */
 
 /* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?f1" } } */
diff --git a/gcc/testsuite/gcc.dg/weak/weak.exp b/gcc/testsuite/gcc.dg/weak/weak.exp
index 595ca92c005..8a53eecde7e 100644
--- a/gcc/testsuite/gcc.dg/weak/weak.exp
+++ b/gcc/testsuite/gcc.dg/weak/weak.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 1997 Free Software Foundation, Inc.
+#   Copyright (C) 1997, 2003 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,17 +25,7 @@ if ![info exists DEFAULT_CFLAGS] then {
     set DEFAULT_CFLAGS " -ansi -pedantic-errors"
 }
 
-if { [ check_weak_available ] == 1 } {
-
-    dg-init
-
-    dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] \
-	"" $DEFAULT_CFLAGS
-
-    dg-finish
-
-} elseif { [ check_weak_available ] == 0 } {
-    unsupported "gcc.dg/weak"
-} else {
-    unresolved "gcc.dg/weak"
-}
+dg-init
+dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] \
+    "" $DEFAULT_CFLAGS
+dg-finish