r213993 - Use -enable-global-merge option to match llvm r210639. <rdar://problem/17803206>

[Bob Wilson]

Author: bwilson
Date: Fri Jul 25 19:37:28 2014
New Revision: 213993

URL: http://llvm.org/viewvc/llvm-project?rev=213993&view=rev
Log:
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!

Modified:
    cfe/trunk/lib/CodeGen/BackendUtil.cpp
    cfe/trunk/test/Driver/mno-global-merge.c

Modified: cfe/trunk/lib/CodeGen/BackendUtil.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/BackendUtil.cpp?rev=213993&r1=213992&r2=213993&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/BackendUtil.cpp (original)
+++ cfe/trunk/lib/CodeGen/BackendUtil.cpp Fri Jul 25 19:37:28 2014
@@ -383,7 +383,7 @@ TargetMachine *EmitAssemblyHelper::Creat
   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());

Modified: cfe/trunk/test/Driver/mno-global-merge.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mno-global-merge.c?rev=213993&r1=213992&r2=213993&view=diff
==============================================================================
--- cfe/trunk/test/Driver/mno-global-merge.c (original)
+++ cfe/trunk/test/Driver/mno-global-merge.c Fri Jul 25 19:37:28 2014
@@ -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