summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorAmara Emerson <amara.emerson@arm.com>2014-02-12 10:22:35 +0000
committerAmara Emerson <amara.emerson@arm.com>2014-02-12 10:22:35 +0000
commitecbe18e01dc42fb5e60fdac361ce74f9ab8c5307 (patch)
tree9fd2fadb2cb097aae9f64bf4a4deca5781049aab /clang/lib
parent53f9df4c93b4bddfa7dddd559129998bf08cb954 (diff)
downloadbcm5719-llvm-ecbe18e01dc42fb5e60fdac361ce74f9ab8c5307.tar.gz
bcm5719-llvm-ecbe18e01dc42fb5e60fdac361ce74f9ab8c5307.zip
[ARM] Fix NEON wrongly being enabled with soft-float when targeting armv8/Cortex-A53/A57.
This was caused by r200708 which enabled the crypto feature for these cores. llvm-svn: 201223
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Driver/Tools.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 5087ce6816c..9e71c31c623 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -718,8 +718,11 @@ static void getARMTargetFeatures(const Driver &D, const llvm::Triple &Triple,
// Setting -msoft-float effectively disables NEON because of the GCC
// implementation, although the same isn't true of VFP or VFP3.
- if (FloatABI == "soft")
+ if (FloatABI == "soft") {
Features.push_back("-neon");
+ // Also need to explicitly disable features which imply NEON.
+ Features.push_back("-crypto");
+ }
// En/disable crc
if (Arg *A = Args.getLastArg(options::OPT_mcrc,
OpenPOWER on IntegriCloud