From 2bb6b0c846dc7a6fd4e92018c336c56900f033ad Mon Sep 17 00:00:00 2001
From: Bob Wilson <bob.wilson@apple.com>
Date: Sat, 26 Jul 2014 00:37:28 +0000
Subject: [PATCH] Use -enable-global-merge option to match llvm r210639.
<rdar://problem/17803206>
llvm revision 210639 renamed the -global-merge backend option to
-enable-global-merge. This change simply updates clang to match that.
Patch by Steven Wu!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@213993 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/CodeGen/BackendUtil.cpp | 2 +-
test/Driver/mno-global-merge.c | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp
index a1521dce39..cec48f35a2 100644
--- a/lib/CodeGen/BackendUtil.cpp
+++ b/lib/CodeGen/BackendUtil.cpp
@@ -383,7 +383,7 @@ TargetMachine *EmitAssemblyHelper::CreateTargetMachine(bool MustCreateTM) {
for (unsigned i = 0, e = CodeGenOpts.BackendOptions.size(); i != e; ++i)
BackendArgs.push_back(CodeGenOpts.BackendOptions[i].c_str());
if (CodeGenOpts.NoGlobalMerge)
- BackendArgs.push_back("-global-merge=false");
+ BackendArgs.push_back("-enable-global-merge=false");
BackendArgs.push_back(nullptr);
llvm::cl::ParseCommandLineOptions(BackendArgs.size() - 1,
BackendArgs.data());
diff --git a/test/Driver/mno-global-merge.c b/test/Driver/mno-global-merge.c
index a17848f04d..daf029e873 100644
--- a/test/Driver/mno-global-merge.c
+++ b/test/Driver/mno-global-merge.c
@@ -18,3 +18,8 @@
// CHECK-GM-NOT: "-mglobal-merge"
+// RUN: %clang -target armv7-apple-darwin10 \
+// RUN: -mno-global-merge -c %s
+
+// RUN: %clang -target armv7-apple-darwin10 \
+// RUN: -mglobal-merge -c %s
--
2.40.0