From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 7 Jan 2009 23:53:03 +0000 (+0000)
Subject: target-supports.exp (check_weak_override_available): New.
X-Git-Tag: releases/gcc-4.4.0~972
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a0963c32789e582dc5b60e71822ee6fe5db40e9;p=thirdparty%2Fgcc.git

target-supports.exp (check_weak_override_available): New.

	* lib/target-supports.exp (check_weak_override_available): New.
	* lib/target-supports-dg.exp (dg-require-weak-override): New.
	* gcc.dg/tree-ssa/pr27781.c, g++.dg/eh/weak1.C: Use
	dg-require-weak-override.

From-SVN: r143172
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ccd555e4c990..196f19136610 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-07  Joseph Myers  <joseph@codesourcery.com>
+
+	* lib/target-supports.exp (check_weak_override_available): New.
+	* lib/target-supports-dg.exp (dg-require-weak-override): New.
+	* gcc.dg/tree-ssa/pr27781.c, g++.dg/eh/weak1.C: Use
+	dg-require-weak-override.
+
 2009-01-07  Nathan Froyd  <froydnj@codesourcery.com>
 	    Alan Modra  <amodra@bigpond.net.au>
 
diff --git a/gcc/testsuite/g++.dg/eh/weak1.C b/gcc/testsuite/g++.dg/eh/weak1.C
index 4dd08d1e6b97..f78d1955b52b 100644
--- a/gcc/testsuite/g++.dg/eh/weak1.C
+++ b/gcc/testsuite/g++.dg/eh/weak1.C
@@ -1,6 +1,6 @@
 // PR target/29487
 // { dg-do run { xfail { hppa*-*-hpux* && { ! hppa*64*-*-* } } } }
-// { dg-require-weak "" }
+// { dg-require-weak-override "" }
 // { dg-additional-sources "weak1-a.cc" }
 // { dg-options "-O2" }
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr27781.c b/gcc/testsuite/gcc.dg/tree-ssa/pr27781.c
index 0e1a02a418b6..233c93dac388 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr27781.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr27781.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-weak "" } */
+/* { dg-require-weak-override "" } */
 /* { dg-options "-O2 -fdump-tree-optimized" } */
 
 void __attribute__((weak)) func(void)
diff --git a/gcc/testsuite/lib/target-supports-dg.exp b/gcc/testsuite/lib/target-supports-dg.exp
index 321daac32390..fe6453bad7df 100644
--- a/gcc/testsuite/lib/target-supports-dg.exp
+++ b/gcc/testsuite/lib/target-supports-dg.exp
@@ -45,6 +45,21 @@ proc dg-require-weak { args } {
     }
 }
 
+# If this target does not support overriding weak symbols, skip this
+# test.
+
+proc dg-require-weak-override { args } {
+    set weak_override_available [ check_weak_override_available ]
+    if { $weak_override_available == -1 } {
+	upvar name name
+	unresolved "$name"
+    }
+    if { $weak_override_available != 1 } {
+	upvar dg-do-what dg-do-what
+	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+    }
+}
+
 # If this target does not support the "visibility" attribute, skip this
 # test.
 
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 79e77f237d8b..0eb40c6714ca 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -250,6 +250,20 @@ proc check_weak_available { } {
     }
 }
 
+###############################
+# proc check_weak_override_available { }
+###############################
+
+# Like check_weak_available, but return 0 if weak symbol definitions
+# cannot be overridden.
+
+proc check_weak_override_available { } {
+    if { [istarget "*-*-mingw*"] } {
+	return 0
+    }
+    return [check_weak_available]
+}
+
 ###############################
 # proc check_visibility_available { what_kind }
 ###############################