Blame SOURCES/0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch

dca0b3
From d68a5a7817dc0d43853d8b84c9185dc24338664f Mon Sep 17 00:00:00 2001
dca0b3
From: Tom Stellard <tstellar@redhat.com>
dca0b3
Date: Wed, 6 Oct 2021 05:32:44 +0000
dca0b3
Subject: [PATCH] Driver: Add a gcc equivalent triple to the list of triples to
dca0b3
 search
dca0b3
dca0b3
There are some gcc triples, like x86_64-redhat-linux, that provide the
dca0b3
same behavior as a clang triple with a similar name (e.g.
dca0b3
x86_64-redhat-linux-gnu).  When searching for a gcc install, also search
dca0b3
for a gcc equivalent triple if one exists.
dca0b3
dca0b3
Differential Revision: https://reviews.llvm.org/D111207
dca0b3
---
dca0b3
 clang/lib/Driver/ToolChains/Gnu.cpp | 22 ++++++++++++++++++++++
dca0b3
 1 file changed, 22 insertions(+)
dca0b3
dca0b3
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
dca0b3
index fe5bda5c6605..fd4a7f72be14 100644
dca0b3
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
dca0b3
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
dca0b3
@@ -1884,6 +1884,18 @@ static llvm::StringRef getGCCToolchainDir(const ArgList &Args,
dca0b3
   return GCC_INSTALL_PREFIX;
dca0b3
 }
dca0b3
 
dca0b3
+/// This function takes a 'clang' triple and converts it to an equivalent gcc
dca0b3
+/// triple.
dca0b3
+static const char *ConvertToGccTriple(StringRef CandidateTriple) {
dca0b3
+  return llvm::StringSwitch<const char *>(CandidateTriple)
dca0b3
+      .Case("aarch64-redhat-linux-gnu", "aarch64-redhat-linux")
dca0b3
+      .Case("i686-redhat-linux-gnu", "i686-redhat-linux")
dca0b3
+      .Case("ppc64le-redhat-linux-gnu", "ppc64le-redhat-linux")
dca0b3
+      .Case("s390x-redhat-linux-gnu", "s390x-redhat-linux")
dca0b3
+      .Case("x86_64-redhat-linux-gnu", "x86_64-redhat-linux")
dca0b3
+      .Default(NULL);
dca0b3
+}
dca0b3
+
dca0b3
 /// Initialize a GCCInstallationDetector from the driver.
dca0b3
 ///
dca0b3
 /// This performs all of the autodetection and sets up the various paths.
dca0b3
@@ -1904,6 +1916,16 @@ void Generic_GCC::GCCInstallationDetector::init(
dca0b3
   // The compatible GCC triples for this particular architecture.
dca0b3
   SmallVector<StringRef, 16> CandidateTripleAliases;
dca0b3
   SmallVector<StringRef, 16> CandidateBiarchTripleAliases;
dca0b3
+
dca0b3
+  // In some cases gcc uses a slightly different triple than clang for the
dca0b3
+  // same target.  Convert the clang triple to the gcc equivalent and use that
dca0b3
+  // to search for the gcc install.
dca0b3
+  const char *ConvertedTriple = ConvertToGccTriple(TargetTriple.str());
dca0b3
+  if (ConvertedTriple) {
dca0b3
+    CandidateTripleAliases.push_back(ConvertedTriple);
dca0b3
+    CandidateBiarchTripleAliases.push_back(ConvertedTriple);
dca0b3
+  }
dca0b3
+
dca0b3
   CollectLibDirsAndTriples(TargetTriple, BiarchVariantTriple, CandidateLibDirs,
dca0b3
                            CandidateTripleAliases, CandidateBiarchLibDirs,
dca0b3
                            CandidateBiarchTripleAliases);
dca0b3
-- 
dca0b3
2.26.2
dca0b3