From 326442a32231880339419bfea101f2887cc8b43b Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 27 Mar 2015 19:01:14 +0000 Subject: [PATCH] Revert "Don't use unique section names by default if using the integrated as." This reverts commit r233393 while a debug a bot failure. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@233398 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 9 +++------ test/Driver/function-sections.c | 10 ---------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 318cd07c15..ed1bd3ef86 100644 --- a/lib/Driver/Tools.cpp +++ b/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); diff --git a/test/Driver/function-sections.c b/test/Driver/function-sections.c index 6c243195f6..ba065b1367 100644 --- a/test/Driver/function-sections.c +++ b/test/Driver/function-sections.c @@ -72,13 +72,3 @@ // 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 -- 2.40.0