weak.exp: Simplify.

	* 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.

From-SVN: r67571

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 470d6967e332a210b4b8d5ea232c7aabd941ee06..6afa7fb5e54a2781ccad867ddfa629a045c9e4c9 100644 (file)
--- 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 f2c7c07f6d74b0c6c5b244e4621c8c1f2ebc4578..7e58bc8b9bb9a17c64b815ed8fac6b096d08856f 100644 (file)
--- 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 52d7230ed04b61fd2e315b92ed800d14a475a5c6..078c3ef36151858b6275ba16471cc0256069abb0 100644 (file)
--- 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 37fa19a1a65d0a325bd94ac0e59f6002657334d4..7f9cde5d0951e0d1fdcf0b172f3075b9e588c158 100644 (file)
--- 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 47359edcd098e791d0703727f3d5677de96eb5c2..d13df69bb67cd1732f06f890c810f8e4a0063c05 100644 (file)
--- 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 bd530ab594020d3d509ef075f7015dda2ab9263e..622a1c6675eee63c38591a47091e39363425e1eb 100644 (file)
--- 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 c4f67e59c76df084f84421961d13464edfca0d45..d70f63304900cb943262a1f4fdbd612dd268d595 100644 (file)
--- 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 8f88a675d31df46db405971bbaac7071d917bbe3..531c581dc262a1ad28921d31aa1b9c5ff3d98d45 100644 (file)
--- 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 64d6155a890c6baaff02435a999dd9a4a25f5724..bf2bbb9563529bea4e648ff60c1d2058fc1e79bb 100644 (file)
--- 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 6e9c267bd213133bd353670f877f489df1641d58..3de2e1e2fa18c0c0bd45505c0d78e111e8d49c38 100644 (file)
--- 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 e5cbdb8bc8707b8baa6ca4e47690086454c19335..29a4e650d2b3fc212f52fab5d1d5b86c3277649f 100644 (file)
--- 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 595ca92c00568cd3cb4c2d42adc3bb081821fb75..8a53eecde7e2304b9c2768e3b587c3ab7f99ab37 100644 (file)
--- 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