Author: Brad Smith Date: 2023-07-10T22:26:12-04:00 New Revision: 4a1f8fd548f12a52f91b2856cb6880691f70190b
URL: https://github.com/llvm/llvm-project/commit/4a1f8fd548f12a52f91b2856cb6880691f70190b DIFF: https://github.com/llvm/llvm-project/commit/4a1f8fd548f12a52f91b2856cb6880691f70190b.diff LOG: [Driver] Default ToolChain::IsIntegratedAssemblerDefault to true Have ToolChain::IsIntegratedAssemblerDefault default to true. Almost all of the ToolChains are using IAS nowadays. There are a few exceptions like XCore, some NaCl archs, and NVPTX/XCore in Generic_GCC::IsIntegratedAssemblerDefault. Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D154902 Added: Modified: clang/include/clang/Driver/ToolChain.h clang/lib/Driver/ToolChains/AIX.h clang/lib/Driver/ToolChains/CrossWindows.h clang/lib/Driver/ToolChains/Darwin.h clang/lib/Driver/ToolChains/Fuchsia.h clang/lib/Driver/ToolChains/HIPSPV.h clang/lib/Driver/ToolChains/MSVC.cpp clang/lib/Driver/ToolChains/MSVC.h clang/lib/Driver/ToolChains/MinGW.cpp clang/lib/Driver/ToolChains/MinGW.h clang/lib/Driver/ToolChains/WebAssembly.cpp clang/lib/Driver/ToolChains/WebAssembly.h clang/lib/Driver/ToolChains/XCore.h clang/lib/Driver/ToolChains/ZOS.h Removed: ################################################################################ diff --git a/clang/include/clang/Driver/ToolChain.h b/clang/include/clang/Driver/ToolChain.h index 7b5c430aacc7e1..e3fcbd9322b0e4 100644 --- a/clang/include/clang/Driver/ToolChain.h +++ b/clang/include/clang/Driver/ToolChain.h @@ -412,7 +412,7 @@ class ToolChain { /// IsIntegratedAssemblerDefault - Does this tool chain enable -integrated-as /// by default. - virtual bool IsIntegratedAssemblerDefault() const { return false; } + virtual bool IsIntegratedAssemblerDefault() const { return true; } /// IsIntegratedBackendDefault - Does this tool chain enable /// -fintegrated-objemitter by default. diff --git a/clang/lib/Driver/ToolChains/AIX.h b/clang/lib/Driver/ToolChains/AIX.h index 245639d60c5f25..cc74e5ea85efca 100644 --- a/clang/lib/Driver/ToolChains/AIX.h +++ b/clang/lib/Driver/ToolChains/AIX.h @@ -68,7 +68,6 @@ class LLVM_LIBRARY_VISIBILITY AIX : public ToolChain { } bool isPICDefaultForced() const override { return true; } bool HasNativeLLVMSupport() const override { return true; } - bool IsIntegratedAssemblerDefault() const override { return true; } void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, diff --git a/clang/lib/Driver/ToolChains/CrossWindows.h b/clang/lib/Driver/ToolChains/CrossWindows.h index 165dcdfd5d3a47..0ba17bc3e305cd 100644 --- a/clang/lib/Driver/ToolChains/CrossWindows.h +++ b/clang/lib/Driver/ToolChains/CrossWindows.h @@ -54,7 +54,6 @@ class LLVM_LIBRARY_VISIBILITY CrossWindowsToolChain : public Generic_GCC { CrossWindowsToolChain(const Driver &D, const llvm::Triple &T, const llvm::opt::ArgList &Args); - bool IsIntegratedAssemblerDefault() const override { return true; } UnwindTableLevel getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const override; bool isPICDefault() const override; diff --git a/clang/lib/Driver/ToolChains/Darwin.h b/clang/lib/Driver/ToolChains/Darwin.h index f64e7180d0af98..42b72e53be1254 100644 --- a/clang/lib/Driver/ToolChains/Darwin.h +++ b/clang/lib/Driver/ToolChains/Darwin.h @@ -238,10 +238,6 @@ class LLVM_LIBRARY_VISIBILITY MachO : public ToolChain { // expected to use /usr/include/Block.h. return true; } - bool IsIntegratedAssemblerDefault() const override { - // Default integrated assembler to on for Apple's MachO targets. - return true; - } bool IsMathErrnoDefault() const override { return false; } diff --git a/clang/lib/Driver/ToolChains/Fuchsia.h b/clang/lib/Driver/ToolChains/Fuchsia.h index 20fb36ce57233d..ba0ec208fb1299 100644 --- a/clang/lib/Driver/ToolChains/Fuchsia.h +++ b/clang/lib/Driver/ToolChains/Fuchsia.h @@ -55,7 +55,6 @@ class LLVM_LIBRARY_VISIBILITY Fuchsia : public ToolChain { const llvm::opt::ArgList &Args); bool HasNativeLLVMSupport() const override { return true; } - bool IsIntegratedAssemblerDefault() const override { return true; } bool IsMathErrnoDefault() const override { return false; } bool useRelaxRelocations() const override { return true; }; RuntimeLibType GetDefaultRuntimeLibType() const override { diff --git a/clang/lib/Driver/ToolChains/HIPSPV.h b/clang/lib/Driver/ToolChains/HIPSPV.h index 8b0b30efcd34d1..1eaef432171ece 100644 --- a/clang/lib/Driver/ToolChains/HIPSPV.h +++ b/clang/lib/Driver/ToolChains/HIPSPV.h @@ -79,7 +79,6 @@ class LLVM_LIBRARY_VISIBILITY HIPSPVToolChain final : public ToolChain { void adjustDebugInfoKind(llvm::codegenoptions::DebugInfoKind &DebugInfoKind, const llvm::opt::ArgList &Args) const override; - bool IsIntegratedAssemblerDefault() const override { return true; } bool IsMathErrnoDefault() const override { return false; } bool useIntegratedAs() const override { return true; } bool isCrossCompiling() const override { return true; } diff --git a/clang/lib/Driver/ToolChains/MSVC.cpp b/clang/lib/Driver/ToolChains/MSVC.cpp index 4a6989d113f82b..a9fe9da4620f80 100644 --- a/clang/lib/Driver/ToolChains/MSVC.cpp +++ b/clang/lib/Driver/ToolChains/MSVC.cpp @@ -463,10 +463,6 @@ Tool *MSVCToolChain::buildAssembler() const { return nullptr; } -bool MSVCToolChain::IsIntegratedAssemblerDefault() const { - return true; -} - ToolChain::UnwindTableLevel MSVCToolChain::getDefaultUnwindTableLevel(const ArgList &Args) const { // Don't emit unwind tables by default for MachO targets. diff --git a/clang/lib/Driver/ToolChains/MSVC.h b/clang/lib/Driver/ToolChains/MSVC.h index 8883800760ebb8..0f687bc70ae477 100644 --- a/clang/lib/Driver/ToolChains/MSVC.h +++ b/clang/lib/Driver/ToolChains/MSVC.h @@ -50,7 +50,6 @@ class LLVM_LIBRARY_VISIBILITY MSVCToolChain : public ToolChain { TranslateArgs(const llvm::opt::DerivedArgList &Args, StringRef BoundArch, Action::OffloadKind DeviceOffloadKind) const override; - bool IsIntegratedAssemblerDefault() const override; UnwindTableLevel getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const override; bool isPICDefault() const override; diff --git a/clang/lib/Driver/ToolChains/MinGW.cpp b/clang/lib/Driver/ToolChains/MinGW.cpp index f0fe53a28528cf..b47041dcca7024 100644 --- a/clang/lib/Driver/ToolChains/MinGW.cpp +++ b/clang/lib/Driver/ToolChains/MinGW.cpp @@ -518,8 +518,6 @@ toolchains::MinGW::MinGW(const Driver &D, const llvm::Triple &Triple, .equals_insensitive("lld"); } -bool toolchains::MinGW::IsIntegratedAssemblerDefault() const { return true; } - Tool *toolchains::MinGW::getTool(Action::ActionClass AC) const { switch (AC) { case Action::PreprocessJobClass: diff --git a/clang/lib/Driver/ToolChains/MinGW.h b/clang/lib/Driver/ToolChains/MinGW.h index 2919d57e895702..6d5feeacdadda4 100644 --- a/clang/lib/Driver/ToolChains/MinGW.h +++ b/clang/lib/Driver/ToolChains/MinGW.h @@ -65,7 +65,6 @@ class LLVM_LIBRARY_VISIBILITY MinGW : public ToolChain { bool HasNativeLLVMSupport() const override; - bool IsIntegratedAssemblerDefault() const override; UnwindTableLevel getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const override; bool isPICDefault() const override; diff --git a/clang/lib/Driver/ToolChains/WebAssembly.cpp b/clang/lib/Driver/ToolChains/WebAssembly.cpp index fb9c8e4910e8b3..36bed3166ff3c6 100644 --- a/clang/lib/Driver/ToolChains/WebAssembly.cpp +++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp @@ -212,8 +212,6 @@ bool WebAssembly::isPIEDefault(const llvm::opt::ArgList &Args) const { bool WebAssembly::isPICDefaultForced() const { return false; } -bool WebAssembly::IsIntegratedAssemblerDefault() const { return true; } - bool WebAssembly::hasBlocksRuntime() const { return false; } // TODO: Support profiling. diff --git a/clang/lib/Driver/ToolChains/WebAssembly.h b/clang/lib/Driver/ToolChains/WebAssembly.h index 5b9b8a0fe4e616..39589ffc1e3b69 100644 --- a/clang/lib/Driver/ToolChains/WebAssembly.h +++ b/clang/lib/Driver/ToolChains/WebAssembly.h @@ -47,7 +47,6 @@ class LLVM_LIBRARY_VISIBILITY WebAssembly final : public ToolChain { bool isPICDefault() const override; bool isPIEDefault(const llvm::opt::ArgList &Args) const override; bool isPICDefaultForced() const override; - bool IsIntegratedAssemblerDefault() const override; bool hasBlocksRuntime() const override; bool SupportsProfiling() const override; bool HasNativeLLVMSupport() const override; diff --git a/clang/lib/Driver/ToolChains/XCore.h b/clang/lib/Driver/ToolChains/XCore.h index d9a05da3c67889..f2e66350243e58 100644 --- a/clang/lib/Driver/ToolChains/XCore.h +++ b/clang/lib/Driver/ToolChains/XCore.h @@ -57,6 +57,7 @@ class LLVM_LIBRARY_VISIBILITY XCoreToolChain : public ToolChain { Tool *buildLinker() const override; public: + bool IsIntegratedAssemblerDefault() const override { return false; } bool isPICDefault() const override; bool isPIEDefault(const llvm::opt::ArgList &Args) const override; bool isPICDefaultForced() const override; diff --git a/clang/lib/Driver/ToolChains/ZOS.h b/clang/lib/Driver/ToolChains/ZOS.h index 0c6d59394a185e..548b432ade7670 100644 --- a/clang/lib/Driver/ToolChains/ZOS.h +++ b/clang/lib/Driver/ToolChains/ZOS.h @@ -61,8 +61,6 @@ class LLVM_LIBRARY_VISIBILITY ZOS : public ToolChain { } bool isPICDefaultForced() const override { return false; } - bool IsIntegratedAssemblerDefault() const override { return true; } - void TryAddIncludeFromPath(llvm::SmallString<128> Path, const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
