aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJanis Johnson <janisjo@codesourcery.com>2011-06-10 18:22:02 +0000
committerJanis Johnson <janis@gcc.gnu.org>2011-06-10 18:22:02 +0000
commitf7ba183bc77b79458b151ea6b011040f46748757 (patch)
tree2ea97622c61f18fabb11c2e8225ac8bf7a710071 /gcc
parent7d9cb05400f69764e2f9c3065c8024795c7a9a69 (diff)
downloadgcc-f7ba183bc77b79458b151ea6b011040f46748757.zip
gcc-f7ba183bc77b79458b151ea6b011040f46748757.tar.gz
gcc-f7ba183bc77b79458b151ea6b011040f46748757.tar.bz2
* 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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/lib/target-supports.exp5
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7c18bb4..5c893e6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+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.
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 1f6f8b6..b0e69c1 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/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"} {