[llvm-branch-commits] [cfe-branch] r214262 - Merging r213993, 213998:

[Bob Wilson]

Author: bwilson
Date: Tue Jul 29 19:07:54 2014
New Revision: 214262

URL: http://llvm.org/viewvc/llvm-project?rev=214262&view=rev
Log:
Merging r213993,213998:

Modified:
    cfe/branches/release_35/   (props changed)
    cfe/branches/release_35/lib/CodeGen/BackendUtil.cpp

Propchange: cfe/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 29 19:07:54 2014
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:213741,214208
+/cfe/trunk:213741,213993,213998,214208
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_35/lib/CodeGen/BackendUtil.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/lib/CodeGen/BackendUtil.cpp?rev=214262&r1=214261&r2=214262&view=diff
==============================================================================
--- cfe/branches/release_35/lib/CodeGen/BackendUtil.cpp (original)
+++ cfe/branches/release_35/lib/CodeGen/BackendUtil.cpp Tue Jul 29 19:07:54 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());