]> granicus.if.org Git - clang/commitdiff
Revert "Revert "Revert "Don't use unique section names by default if using the integr...
authorRafael Espindola <rafael.espindola@gmail.com>
Sat, 4 Apr 2015 19:32:41 +0000 (19:32 +0000)
committerRafael Espindola <rafael.espindola@gmail.com>
Sat, 4 Apr 2015 19:32:41 +0000 (19:32 +0000)
This reverts commit r234101. I will debug what went wrong with ARM.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@234104 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/Tools.cpp
test/Driver/function-sections.c

index 7b661a7c886692a17c0f70fed16dada4881502d4..6f8751d5ca74eeb3305128210781637d9f0bfe2c 100644 (file)
@@ -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);
index 6c243195f6266aa20ce1b8c401415288655c9835..ba065b1367a3fdae55c9ab3eea6ef934a6b85f52 100644 (file)
 // RUN:     -target i386-unknown-linux \
 // RUN:     -fno-unique-section-names \
 // RUN:   | FileCheck --check-prefix=CHECK-NOUS %s
-
-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1        \
-// RUN:     -target i386-unknown-linux \
-// RUN:     -fno-integrated-as \
-// RUN:   | FileCheck --check-prefix=CHECK-US %s
-
-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1        \
-// RUN:     -target i386-unknown-linux \
-// RUN:     -fintegrated-as \
-// RUN:   | FileCheck --check-prefix=CHECK-NOUS %s