diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-04-04 19:32:41 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-04-04 19:32:41 +0000 |
commit | d7329ef99f23d8697aa80d58d45f0afbcec0ea17 (patch) | |
tree | f08f2fc6b007544cfeba33fb2123addba6f33440 /clang/lib/Driver/Tools.cpp | |
parent | c3899d22342fcaef6b02b22c136b3e06ea918f95 (diff) | |
download | llvm-d7329ef99f23d8697aa80d58d45f0afbcec0ea17.zip llvm-d7329ef99f23d8697aa80d58d45f0afbcec0ea17.tar.gz llvm-d7329ef99f23d8697aa80d58d45f0afbcec0ea17.tar.bz2 |
Revert "Revert "Revert "Don't use unique section names by default if using the integrated as."""
This reverts commit r234101. I will debug what went wrong with ARM.
llvm-svn: 234104
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
-rw-r--r-- | clang/lib/Driver/Tools.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 7b661a7..6f8751d 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -3104,10 +3104,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, Args.hasArg(options::OPT_dA)) CmdArgs.push_back("-masm-verbose"); - bool UsingIntegratedAssembler = - Args.hasFlag(options::OPT_fintegrated_as, options::OPT_fno_integrated_as, - IsIntegratedAssemblerDefault); - if (!UsingIntegratedAssembler) + if (!Args.hasFlag(options::OPT_fintegrated_as, options::OPT_fno_integrated_as, + IsIntegratedAssemblerDefault)) CmdArgs.push_back("-no-integrated-as"); if (Args.hasArg(options::OPT_fdebug_pass_structure)) { @@ -3351,8 +3349,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, } if (!Args.hasFlag(options::OPT_funique_section_names, - options::OPT_fno_unique_section_names, - !UsingIntegratedAssembler)) + options::OPT_fno_unique_section_names, true)) CmdArgs.push_back("-fno-unique-section-names"); Args.AddAllArgs(CmdArgs, options::OPT_finstrument_functions); |