commit d053d20d0d02e9c49406352b0d5f05a580cc8a81
author Rafael Espindola <rafael.espindola@gmail.com> Fri Mar 27 19:01:14 2015 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Fri Mar 27 19:01:14 2015 +0000
tree b0daaf2142d1ea75df1cf30026f1d99aa74ad5d8
parent bf28d3aa335ece9c745b20dc2e4f93e2d80771a4

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

clang/lib/Driver/Tools.cpp

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 318cd07..ed1bd3e 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -3087,10 +3087,8 @@
       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 @@
   }
 
   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);