diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2014-07-30 00:07:54 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2014-07-30 00:07:54 +0000 |
| commit | 2631339ebf29726c108a33f228c0908b1470412c (patch) | |
| tree | 19016dc408eeb28e2086f6a633f1b6adee3acef5 | |
| parent | c5e90ae43a74fc42979e2522ac367a1be6bc74cb (diff) | |
Merging r213993,213998:
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_35@214262 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/BackendUtil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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()); |