diff options
| author | Ahmed Bougacha <ahmed.bougacha@gmail.com> | 2015-04-11 00:10:44 +0000 |
|---|---|---|
| committer | Ahmed Bougacha <ahmed.bougacha@gmail.com> | 2015-04-11 00:10:44 +0000 |
| commit | 256a869d312b37ed7b5d131329050fcdadb11148 (patch) | |
| tree | 198317f386db220290d9f5653dd7d3d01b5797c8 /clang/lib/CodeGen/BackendUtil.cpp | |
| parent | 9638ff9b37ad1bc521bdf5b3a1d9996839dbda56 (diff) | |
| download | llvm-256a869d312b37ed7b5d131329050fcdadb11148.zip llvm-256a869d312b37ed7b5d131329050fcdadb11148.tar.gz llvm-256a869d312b37ed7b5d131329050fcdadb11148.tar.bz2 | |
[Driver] Properly support -mglobal-merge using explicit options.
Follow-up to r234666. With this, the -m[no-]global-merge options
have the expected behavior. Previously, -mglobal-merge was ignored,
and there was no way of enabling the optimization.
llvm-svn: 234668
Diffstat (limited to 'clang/lib/CodeGen/BackendUtil.cpp')
| -rw-r--r-- | clang/lib/CodeGen/BackendUtil.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 90f594f..7c443cc 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -436,8 +436,6 @@ TargetMachine *EmitAssemblyHelper::CreateTargetMachine(bool MustCreateTM) { BackendArgs.push_back("-time-passes"); 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("-enable-global-merge=false"); BackendArgs.push_back(nullptr); llvm::cl::ParseCommandLineOptions(BackendArgs.size() - 1, BackendArgs.data()); |