target-supports.exp (check_effective_target_arm_hard_vfp_ok): Return 0 if already...

	* lib/target-supports.exp (check_effective_target_arm_hard_vfp_ok):
	Return 0 if already specifying -mfloat-abi other than hard.

From-SVN: r192409

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cabf57c9b6c76864eb5ae0523253543d3eef978f..2a107a3e19827daf9a113c9edec1531faef41ec5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-12  Janis Johnson  <janisjo@codesourcery.com>
+
+       * lib/target-supports.exp (check_effective_target_arm_hard_vfp_ok):
+       Return 0 if already specifying -mfloat-abi other than hard.
+
 2012-10-12  Joe Seymour  <jseymour@codesourcery.com>
 
        * gcc.dg/pr53060.c: Prune irrelevant warning.

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 9098285267fc23c608d8bcd67557020482c39381..f8e416c70908a1f92f4ea7fd02aa5abeac4547a6 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -2053,7 +2053,8 @@ proc check_effective_target_arm_vfp_ok { } {
 # options.
 
 proc check_effective_target_arm_hard_vfp_ok { } {
-    if { [check_effective_target_arm32] } {
+    if { [check_effective_target_arm32] 
+        && ! [check-flags [list "" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=hard" }]] } {
        return [check_no_compiler_messages arm_hard_vfp_ok executable {
            int main() { return 0;}
        } "-mfpu=vfp -mfloat-abi=hard"]