* lib/target-supports.exp

	(check_effective_target_arm_neon_fp16_ok_nocache): Return 0 if
	multilib flags use -mfpu with a value other than neon-fp16.

From-SVN: r174919

gcc/testsuite/ChangeLog

+2011-06-10  Janis Johnson  <janisjo@codesourcery.com>
+
+	* lib/target-supports.exp
+	(check_effective_target_arm_neon_fp16_ok_nocache): Return 0 if
+	multilib flags use -mfpu with a value other than neon-fp16.
+
 2011-06-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* gcc.dg/torture/tls/tls.exp: Load torture-options.exp.

gcc/testsuite/lib/target-supports.exp

@@ -1956,7 +1956,7 @@ proc add_options_for_arm_neon_fp16 { flags } {
 }
 
 # Return 1 if this is an ARM target supporting -mfpu=neon-fp16
-# -mfloat-abi=softfp or equivalent options.  Some multilibs may be
+# -mfloat-abi=softfp or equivalent options.  Skip multilibs that are
 # incompatible with these options.  Also set et_arm_neon_flags to the
 # best options to add.
 
@@ -1964,6 +1964,9 @@ proc check_effective_target_arm_neon_fp16_ok_nocache { } {
     global et_arm_neon_fp16_flags
     set et_arm_neon_fp16_flags ""
     if { [check_effective_target_arm32] } {
+	if [check-flags [list "" { *-*-* } { "-mfpu=*" } { "-mfpu=neon-fp16*" } ]] {
+	    return 0
+	}
 	# Always add -mfpu=neon-fp16, since there is no preprocessor
 	# macro for FP16 support.
 	foreach flags {"-mfpu=neon-fp16" "-mfpu=neon-fp16 -mfloat-abi=softfp"} {