summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/Tools.cpp
diff options
context:
space:
mode:
authorFrederic Riss <friss@apple.com>2017-01-17 03:38:45 +0000
committerFrederic Riss <friss@apple.com>2017-01-17 03:38:45 +0000
commit1633f68fe1b4d0f180635c32acee5b2492dfa6a2 (patch)
tree5de4712ffaa041a5d6844f3d3fbf31f44c6e713f /clang/lib/Driver/Tools.cpp
parent9e5a085cf122e3da3766cd9a35b72ed2413c559d (diff)
downloadbcm5719-llvm-1633f68fe1b4d0f180635c32acee5b2492dfa6a2.tar.gz
bcm5719-llvm-1633f68fe1b4d0f180635c32acee5b2492dfa6a2.zip
Fix AArch64 global-merge backend option name.
-mglobal-merge is translated to the appropriate backend option in the driver. r277322 changed the AArch64 option name in the backend, but the driver was never updated. llvm-svn: 292192
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
-rw-r--r--clang/lib/Driver/Tools.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index b4a83347def..78672b2544f 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -1363,9 +1363,9 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args,
options::OPT_mno_global_merge)) {
CmdArgs.push_back("-backend-option");
if (A->getOption().matches(options::OPT_mno_global_merge))
- CmdArgs.push_back("-aarch64-global-merge=false");
+ CmdArgs.push_back("-aarch64-enable-global-merge=false");
else
- CmdArgs.push_back("-aarch64-global-merge=true");
+ CmdArgs.push_back("-aarch64-enable-global-merge=true");
}
}
OpenPOWER on IntegriCloud