summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2015-03-27 19:01:14 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2015-03-27 19:01:14 +0000
commitd053d20d0d02e9c49406352b0d5f05a580cc8a81 (patch)
treeb0daaf2142d1ea75df1cf30026f1d99aa74ad5d8 /clang/lib/Driver
parentbf28d3aa335ece9c745b20dc2e4f93e2d80771a4 (diff)
downloadbcm5719-llvm-d053d20d0d02e9c49406352b0d5f05a580cc8a81.tar.gz
bcm5719-llvm-d053d20d0d02e9c49406352b0d5f05a580cc8a81.zip
Revert "Don't use unique section names by default if using the integrated as."
This reverts commit r233393 while a debug a bot failure. llvm-svn: 233398
Diffstat (limited to 'clang/lib/Driver')
-rw-r--r--clang/lib/Driver/Tools.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 318cd07c153..ed1bd3ef868 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -3087,10 +3087,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)) {
@@ -3334,8 +3332,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);
OpenPOWER on IntegriCloud