Skip to content

Commit 1bc7b75

Browse files
committed
[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
1 parent d39a9e3 commit 1bc7b75

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

clang/lib/Basic/Targets/Sparc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void SparcTargetInfo::getTargetDefines(const LangOptions &Opts,
141141
void SparcV8TargetInfo::getTargetDefines(const LangOptions &Opts,
142142
MacroBuilder &Builder) const {
143143
SparcTargetInfo::getTargetDefines(Opts, Builder);
144-
if (getTriple().getOS() == llvm::Triple::Solaris)
144+
if (getTriple().isOSSolaris())
145145
Builder.defineMacro("__sparcv8");
146146
else {
147147
switch (getCPUGeneration(CPU)) {
@@ -168,7 +168,7 @@ void SparcV9TargetInfo::getTargetDefines(const LangOptions &Opts,
168168
Builder.defineMacro("__sparcv9");
169169
Builder.defineMacro("__arch64__");
170170
// Solaris doesn't need these variants, but the BSDs do.
171-
if (getTriple().getOS() != llvm::Triple::Solaris) {
171+
if (!getTriple().isOSSolaris()) {
172172
Builder.defineMacro("__sparc64__");
173173
Builder.defineMacro("__sparc_v9__");
174174
Builder.defineMacro("__sparcv9__");

clang/lib/Driver/ToolChains/CommonArgs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ static bool addSanitizerDynamicList(const ToolChain &TC, const ArgList &Args,
998998

999999
// Solaris ld defaults to --export-dynamic behaviour but doesn't support
10001000
// the option, so don't try to pass it.
1001-
if (TC.getTriple().getOS() == llvm::Triple::Solaris && !LinkerIsGnuLd)
1001+
if (TC.getTriple().isOSSolaris() && !LinkerIsGnuLd)
10021002
return true;
10031003
SmallString<128> SanRT(TC.getCompilerRT(Args, Sanitizer));
10041004
if (llvm::sys::fs::exists(SanRT + ".syms")) {

clang/lib/Driver/ToolChains/Gnu.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,7 +1838,7 @@ static bool findBiarchMultilibs(const Driver &D,
18381838

18391839
StringRef Suff64 = "/64";
18401840
// Solaris uses platform-specific suffixes instead of /64.
1841-
if (TargetTriple.getOS() == llvm::Triple::Solaris) {
1841+
if (TargetTriple.isOSSolaris()) {
18421842
switch (TargetTriple.getArch()) {
18431843
case llvm::Triple::x86:
18441844
case llvm::Triple::x86_64:
@@ -2220,7 +2220,7 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const {
22202220
void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
22212221
const llvm::Triple &TargetTriple, SmallVectorImpl<std::string> &Prefixes,
22222222
StringRef SysRoot) {
2223-
if (TargetTriple.getOS() == llvm::Triple::Solaris) {
2223+
if (TargetTriple.isOSSolaris()) {
22242224
// Solaris is a special case.
22252225
// The GCC installation is under
22262226
// /usr/gcc/<major>.<minor>/lib/gcc/<triple>/<major>.<minor>.<patch>/
@@ -2422,7 +2422,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
24222422
using std::begin;
24232423
using std::end;
24242424

2425-
if (TargetTriple.getOS() == llvm::Triple::Solaris) {
2425+
if (TargetTriple.isOSSolaris()) {
24262426
static const char *const SolarisLibDirs[] = {"/lib"};
24272427
static const char *const SolarisSparcV8Triples[] = {
24282428
"sparc-sun-solaris2.11"};

0 commit comments

Comments
 (0)