From 7ce8d82c4182b8b98d4b5c44f5258b9e9b2c1350 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 18 Mar 2013 17:58:22 +0000 Subject: [PATCH] Inline ShouldUseIntegratedAssembler and move the documentation to useIntegratedAs. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177300 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Driver/ToolChain.h | 1 + lib/Driver/Tools.cpp | 13 +++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/clang/Driver/ToolChain.h b/include/clang/Driver/ToolChain.h index b04dbe6198..32b739dc63 100644 --- a/include/clang/Driver/ToolChain.h +++ b/include/clang/Driver/ToolChain.h @@ -137,6 +137,7 @@ public: /// by default. virtual bool IsIntegratedAssemblerDefault() const { return false; } + /// \brief Check if the toolchain should use the integrated assembler. bool useIntegratedAs(const ArgList &Args) const; /// IsStrictAliasingDefault - Does this tool chain use -fstrict-aliasing by diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 96d10f53ae..a53e9f8147 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1414,20 +1414,13 @@ static void addExceptionArgs(const ArgList &Args, types::ID InputType, CmdArgs.push_back("-fexceptions"); } -/// \brief Check if the toolchain should use the integrated assembler. -static bool ShouldUseIntegratedAssembler(const ArgList &Args, - const ToolChain &TC) { - // FIXME: inline - return TC.useIntegratedAs(Args); -} - static bool ShouldDisableCFI(const ArgList &Args, const ToolChain &TC) { bool Default = true; if (TC.getTriple().isOSDarwin()) { // The native darwin assembler doesn't support cfi directives, so // we disable them if we think the .s file will be passed to it. - Default = ShouldUseIntegratedAssembler(Args, TC); + Default = TC.useIntegratedAs(Args); } return !Args.hasFlag(options::OPT_fdwarf2_cfi_asm, options::OPT_fno_dwarf2_cfi_asm, @@ -1438,7 +1431,7 @@ static bool ShouldDisableDwarfDirectory(const ArgList &Args, const ToolChain &TC) { bool UseDwarfDirectory = Args.hasFlag(options::OPT_fdwarf_directory_asm, options::OPT_fno_dwarf_directory_asm, - ShouldUseIntegratedAssembler(Args, TC)); + TC.useIntegratedAs(Args)); return !UseDwarfDirectory; } @@ -2813,7 +2806,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, // -fmodules-autolink (on by default when modules is enabled) automatically // links against libraries for imported modules. This requires the // integrated assembler. - if (HaveModules && ShouldUseIntegratedAssembler(Args, getToolChain()) && + if (HaveModules && getToolChain().useIntegratedAs(Args) && Args.hasFlag(options::OPT_fmodules_autolink, options::OPT_fno_modules_autolink, true)) { -- 2.40.0