Author: Rainer Orth Date: 2023-09-01T21:45:22+02:00 New Revision: 1bc7b753a5cd1599ecf0575d629460ba08f7121e
URL: https://github.com/llvm/llvm-project/commit/1bc7b753a5cd1599ecf0575d629460ba08f7121e DIFF: https://github.com/llvm/llvm-project/commit/1bc7b753a5cd1599ecf0575d629460ba08f7121e.diff LOG: [clang] Consistently use isOSSolaris() While looking over the Solaris GNU ld patch (D85309 <https://reviews.llvm.org/D85309>), I noticed that we weren't using `isOSSolaris()` consistenly in `clang`. This patch fixes this. Tested on `amd64-pc-solaris2.11`. Differential Revision: https://reviews.llvm.org/D159222 Added: Modified: clang/lib/Basic/Targets/Sparc.cpp clang/lib/Driver/ToolChains/CommonArgs.cpp clang/lib/Driver/ToolChains/Gnu.cpp Removed: ################################################################################ diff --git a/clang/lib/Basic/Targets/Sparc.cpp b/clang/lib/Basic/Targets/Sparc.cpp index 8b9e14cccc9037..d1a891092b0f5c 100644 --- a/clang/lib/Basic/Targets/Sparc.cpp +++ b/clang/lib/Basic/Targets/Sparc.cpp @@ -141,7 +141,7 @@ void SparcTargetInfo::getTargetDefines(const LangOptions &Opts, void SparcV8TargetInfo::getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const { SparcTargetInfo::getTargetDefines(Opts, Builder); - if (getTriple().getOS() == llvm::Triple::Solaris) + if (getTriple().isOSSolaris()) Builder.defineMacro("__sparcv8"); else { switch (getCPUGeneration(CPU)) { @@ -168,7 +168,7 @@ void SparcV9TargetInfo::getTargetDefines(const LangOptions &Opts, Builder.defineMacro("__sparcv9"); Builder.defineMacro("__arch64__"); // Solaris doesn't need these variants, but the BSDs do. - if (getTriple().getOS() != llvm::Triple::Solaris) { + if (!getTriple().isOSSolaris()) { Builder.defineMacro("__sparc64__"); Builder.defineMacro("__sparc_v9__"); Builder.defineMacro("__sparcv9__"); diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index 37db5a2740011d..1db05b47e11ba6 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -998,7 +998,7 @@ static bool addSanitizerDynamicList(const ToolChain &TC, const ArgList &Args, // Solaris ld defaults to --export-dynamic behaviour but doesn't support // the option, so don't try to pass it. - if (TC.getTriple().getOS() == llvm::Triple::Solaris && !LinkerIsGnuLd) + if (TC.getTriple().isOSSolaris() && !LinkerIsGnuLd) return true; SmallString<128> SanRT(TC.getCompilerRT(Args, Sanitizer)); if (llvm::sys::fs::exists(SanRT + ".syms")) { diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index f81a9a4982d4ca..d215dd77921778 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -1838,7 +1838,7 @@ static bool findBiarchMultilibs(const Driver &D, StringRef Suff64 = "/64"; // Solaris uses platform-specific suffixes instead of /64. - if (TargetTriple.getOS() == llvm::Triple::Solaris) { + if (TargetTriple.isOSSolaris()) { switch (TargetTriple.getArch()) { case llvm::Triple::x86: case llvm::Triple::x86_64: @@ -2220,7 +2220,7 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const { void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( const llvm::Triple &TargetTriple, SmallVectorImpl<std::string> &Prefixes, StringRef SysRoot) { - if (TargetTriple.getOS() == llvm::Triple::Solaris) { + if (TargetTriple.isOSSolaris()) { // Solaris is a special case. // The GCC installation is under // /usr/gcc/<major>.<minor>/lib/gcc/<triple>/<major>.<minor>.<patch>/ @@ -2422,7 +2422,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( using std::begin; using std::end; - if (TargetTriple.getOS() == llvm::Triple::Solaris) { + if (TargetTriple.isOSSolaris()) { static const char *const SolarisLibDirs[] = {"/lib"}; static const char *const SolarisSparcV8Triples[] = { "sparc-sun-solaris2.11"}; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
