2011-06-07  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.

Index: gcc/testsuite/lib/target-supports.exp
===================================================================
--- gcc/testsuite/lib/target-supports.exp	(revision 174764)
+++ gcc/testsuite/lib/target-supports.exp	(working copy)
@@ -1954,6 +1954,11 @@
     global et_arm_neon_fp16_flags
     set et_arm_neon_fp16_flags ""
     if { [check_effective_target_arm32] } {
+	# Multilib flags that include -mfpu would override the flags set here;
+	# skip them.
+	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"} {