[Driver] Remove unneeded *-suse-* triples

[MaskRay]

Summary

CollectLibDirsAndTriples has a number of *Triples elements (hack) so that
--target=aarch64-linux-gnu can auto detect lib/aarch64-suse-linux. IMO
trouble from the magic behavior outweighs its convenience.

For most users (who don't specify --target), the CMake
LLVM_DEFAULT_TARGET_TRIPLE variable should just point to the correct triple
(e.g. aarch64-suse-linux), and Clang driver will find the right
lib/aarch64-suse-linux directory without a hard coded element in AArch64LibDirs.

For people who specify --target for cross compilation, they should specify the
full target triple instead of relying on --target=riscv64 expanding to
--target=riscv64-suse-linux.

Also revert rL304670 (normalize gnueabi to gnueabihf)

Note: the test added by D63497 works even without riscv64-suse-linux
in RISCV64Triples

I have kept powerpc64-suse-linux in PPCTriples because it somehow uses the
multilib behavior for native Clang. That doesn't look right to me.

[luismarques]

Regarding D74399, cmake on a fedora RISC-V host still detects a generic triple:

-- LLVM host triple: riscv64-unknown-linux-gnu
-- LLVM default target triple: riscv64-unknown-linux-gnu

as opposed to the gcc -dumpmachine triple of riscv64-redhat-linux (with the vendor and no -gnu suffix), needed for a working toolchain. (I don't know if that cmake behaviour is uncommon or not).

Are you saying that it's fine for D74399 to remain because of that, or does your argument also imply that D74399 should be reverted? Would the answer change if cmake started detecting the "proper" triple? (and what would the deprecation path for that be, if any?).

clang/lib/Driver/ToolChains/Gnu.cpp

2108–2113

Ugh, these lines with multiple entries make mentally parsing the diff rather annoying.

[MaskRay]

In D109727#3003498, @luismarques wrote:

Regarding D74399, cmake on a fedora RISC-V host still detects a generic triple:

-- LLVM host triple: riscv64-unknown-linux-gnu
-- LLVM default target triple: riscv64-unknown-linux-gnu

as opposed to the gcc -dumpmachine triple of riscv64-redhat-linux (with the vendor and no -gnu suffix), needed for a working toolchain. (I don't know if that cmake behaviour is uncommon or not).

This is due to issues in config.guess. D109837 will fix it.

Are you saying that it's fine for D74399 to remain because of that, or does your argument also imply that D74399 should be reverted? Would the answer change if cmake started detecting the "proper" triple? (and what would the deprecation path for that be, if any?).

The code change of D74399 should be reverted. The test can stay, but I won't think we need too many riscv64-$distro-linux-gnu tests.

[luismarques]

In D109727#3004125, @MaskRay wrote:

The code change of D74399 should be reverted. The test can stay, but I won't think we need too many riscv64-$distro-linux-gnu tests.

Makes sense. Do you want to update this patch to also remove that?

[MaskRay]

@marxin Can you check this from Suse perspective? :)

[aaronpuchert]

The problem here is that triples are not just used to look up the GCC installation, but the individual components have some meaning. Changing the OS vendor from "unknown" to "suse" doesn't worry me, but dropping "-gnu" might lead us to the problems described in D109837#3034457. (I'll have to test that.)

Doesn't mean we can't have this change, but I think we need to add something like if (Vendor == Triple::SUSE) Environment = Triple::GNU; somewhere. Or perhaps it's there and I'm just missing it?

Regarding gnueabi[hf]: maybe the problem was that the GCC triple is different from the LLVM triple for some historic reason? So if we configure LLVM with target armv7-suse-linux-gnueabihf it might just not find the GCC installation, but if we leave it as is, LLVM will generate incompatible code?

[tstellar]

This patch should depend on D109837, otherwise clang builds will be broken on SUSE if you don't pass -DLLVM_DEFAULT_TARGET_TRIPLE to cmake when configuring, and I don't think we should require users to pass this option.

[aaronpuchert]

Basically this should be Ok. We set the LLVM_HOST_TRIPLE to match the GCC triple on almost all platforms now.

But we'll need to patch isGNUEnvironment like D110900 does and the previously mentioned config.guess changes.

clang/lib/Driver/ToolChains/Gnu.cpp

2091–2092

Not sure if we can remove them. We now use gnueabihf in the default triple, but I think the GCC installation is still at -gnueabi. Also we're using armv6kz instead of armv6hl for some reason that's beyond my understanding.

llvm/lib/Support/Triple.cpp

989–991

We have that included in out LLVM_HOST_TRIPLE now, so this should be fine. But this means we'll need to keep the translation to GCC triple alive.

clang/lib/Driver/ToolChains/Gnu.cpp

/*static*/ void Generic_GCC::GCCInstallationDetector::CollectLibDirsAndTriples(
     const llvm::Triple &TargetTriple, const llvm::Triple &BiarchTriple,
     SmallVectorImpl<StringRef> &LibDirs,
     SmallVectorImpl<StringRef> &TripleAliases,
     SmallVectorImpl<StringRef> &BiarchLibDirs,
     SmallVectorImpl<StringRef> &BiarchTripleAliases) {
   // Declare a bunch of static data sets that we'll select between below. These
   // are specifically designed to always refer to string literals to avoid any
   // lifetime or initialization issues.
+  //
+  // The *Triples variables hard code some triples so that --target=aarch64
+  // (incomplete triple) detects several lib/aarch64-linux-gnu.  They are not
+  // needed when the user has correct LLVM_DEFAULT_TARGET_TRIPLE and always uses
+  // the full --target (e.g. --target=aarch64-linux-gnu).  The lists should
+  // shrink over time. Please don't add more elements to *Triples.
   static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
   static const char *const AArch64Triples[] = {
       "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
-      "aarch64-suse-linux", "aarch64-linux-android"};
+      "aarch64-linux-android"};
   static const char *const AArch64beLibDirs[] = {"/lib"};
   static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
                                                  "aarch64_be-linux-gnu"};
 
   static const char *const ARMLibDirs[] = {"/lib"};
   static const char *const ARMTriples[] = {"arm-linux-gnueabi",
                                            "arm-linux-androideabi"};
   static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
-                                             "armv7hl-redhat-linux-gnueabi",
-                                             "armv6hl-suse-linux-gnueabi",
-                                             "armv7hl-suse-linux-gnueabi"};
+                                             "armv7hl-redhat-linux-gnueabi"};
   static const char *const ARMebLibDirs[] = {"/lib"};
   static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
                                              "armeb-linux-androideabi"};
   static const char *const ARMebHFTriples[] = {
       "armeb-linux-gnueabihf", "armebv7hl-redhat-linux-gnueabi"};
 
   static const char *const AVRLibDirs[] = {"/lib"};
   static const char *const AVRTriples[] = {"avr"};
 
   static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
   static const char *const X86_64Triples[] = {
-      "x86_64-linux-gnu",       "x86_64-unknown-linux-gnu",
-      "x86_64-pc-linux-gnu",    "x86_64-redhat-linux6E",
-      "x86_64-redhat-linux",    "x86_64-suse-linux",
-      "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
-      "x86_64-slackware-linux", "x86_64-unknown-linux",
-      "x86_64-amazon-linux",    "x86_64-linux-android"};
+      "x86_64-linux-gnu",     "x86_64-unknown-linux-gnu",
+      "x86_64-pc-linux-gnu",  "x86_64-redhat-linux6E",
+      "x86_64-redhat-linux",  "x86_64-manbo-linux-gnu",
+      "x86_64-linux-gnu",     "x86_64-slackware-linux",
+      "x86_64-unknown-linux", "x86_64-amazon-linux",
+      "x86_64-linux-android"};
   static const char *const X32Triples[] = {"x86_64-linux-gnux32",
                                            "x86_64-pc-linux-gnux32"};
   static const char *const X32LibDirs[] = {"/libx32", "/lib"};
   static const char *const X86LibDirs[] = {"/lib32", "/lib"};
   static const char *const X86Triples[] = {
-      "i586-linux-gnu",     "i686-linux-gnu",
-      "i686-pc-linux-gnu",  "i386-redhat-linux6E",
-      "i686-redhat-linux",  "i386-redhat-linux",
-      "i586-suse-linux",    "i686-montavista-linux",
-      "i686-linux-android", "i686-gnu",
+      "i586-linux-gnu",        "i686-linux-gnu",     "i686-pc-linux-gnu",
+      "i386-redhat-linux6E",   "i686-redhat-linux",  "i386-redhat-linux",
+      "i686-montavista-linux", "i686-linux-android", "i686-gnu",
   };
 
   static const char *const M68kLibDirs[] = {"/lib"};
-  static const char *const M68kTriples[] = {
-      "m68k-linux-gnu", "m68k-unknown-linux-gnu", "m68k-suse-linux"};
+  static const char *const M68kTriples[] = {"m68k-linux-gnu",
+                                            "m68k-unknown-linux-gnu"};
 
   static const char *const MIPSLibDirs[] = {"/lib"};
   static const char *const MIPSTriples[] = {
       "mips-linux-gnu", "mips-mti-linux", "mips-mti-linux-gnu",
       "mips-img-linux-gnu", "mipsisa32r6-linux-gnu"};
   static const char *const MIPSELLibDirs[] = {"/lib"};
   static const char *const MIPSELTriples[] = {
       "mipsel-linux-gnu", "mips-img-linux-gnu", "mipsisa32r6el-linux-gnu",
static const char *const PPCTriples[] = {
       // 64-bit compiler which defaults to "-m32", hence "powerpc64-suse-linux".
       "powerpc64-suse-linux", "powerpc-montavista-linuxspe"};
   static const char *const PPCLELibDirs[] = {"/lib32", "/lib"};
   static const char *const PPCLETriples[] = {"powerpcle-linux-gnu",
                                              "powerpcle-unknown-linux-gnu",
                                              "powerpcle-linux-musl"};
 
   static const char *const PPC64LibDirs[] = {"/lib64", "/lib"};
-  static const char *const PPC64Triples[] = {
-      "powerpc64-linux-gnu", "powerpc64-unknown-linux-gnu",
-      "powerpc64-suse-linux", "ppc64-redhat-linux"};
+  static const char *const PPC64Triples[] = {"powerpc64-linux-gnu",
+                                             "powerpc64-unknown-linux-gnu",
+                                             "ppc64-redhat-linux"};
   static const char *const PPC64LELibDirs[] = {"/lib64", "/lib"};
   static const char *const PPC64LETriples[] = {
       "powerpc64le-linux-gnu", "powerpc64le-unknown-linux-gnu",
-      "powerpc64le-none-linux-gnu", "powerpc64le-suse-linux",
-      "ppc64le-redhat-linux"};
+      "powerpc64le-none-linux-gnu", "ppc64le-redhat-linux"};
 
   static const char *const RISCV32LibDirs[] = {"/lib32", "/lib"};
   static const char *const RISCV32Triples[] = {"riscv32-unknown-linux-gnu",
                                                "riscv32-linux-gnu",
                                                "riscv32-unknown-elf"};
   static const char *const RISCV64LibDirs[] = {"/lib64", "/lib"};
-  static const char *const RISCV64Triples[] = {"riscv64-unknown-linux-gnu",
-                                               "riscv64-linux-gnu",
-                                               "riscv64-unknown-elf",
-                                               "riscv64-redhat-linux",
-                                               "riscv64-suse-linux"};
+  static const char *const RISCV64Triples[] = {
+      "riscv64-unknown-linux-gnu", "riscv64-linux-gnu", "riscv64-unknown-elf",
+      "riscv64-redhat-linux"};
 
   static const char *const SPARCv8LibDirs[] = {"/lib32", "/lib"};
   static const char *const SPARCv8Triples[] = {"sparc-linux-gnu",
                                                "sparcv8-linux-gnu"};
   static const char *const SPARCv9LibDirs[] = {"/lib64", "/lib"};
   static const char *const SPARCv9Triples[] = {"sparc64-linux-gnu",
                                                "sparcv9-linux-gnu"};
 
   static const char *const SystemZLibDirs[] = {"/lib64", "/lib"};
   static const char *const SystemZTriples[] = {
       "s390x-linux-gnu", "s390x-unknown-linux-gnu", "s390x-ibm-linux-gnu",
-      "s390x-suse-linux", "s390x-redhat-linux"};
-
+      "s390x-redhat-linux"};
 
   using std::begin;
   using std::end;
 
   if (TargetTriple.getOS() == llvm::Triple::Solaris) {
     static const char *const SolarisLibDirs[] = {"/lib"};
     static const char *const SolarisSparcV8Triples[] = {
         "sparc-sun-solaris2.11", "sparc-sun-solaris2.12"};

clang/test/Driver/linux-header-search.cpp

 
 // CHECK-OE-AARCH64: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
 // CHECK-OE-AARCH64: "-isysroot" "[[SYSROOT:[^"]+]]"
 // CHECK-OE-AARCH64: "-internal-isystem" "[[SYSROOT]]/usr/lib64/aarch64-oe-linux/6.3.0/../../../include/c++/6.3.0"
 // CHECK-OE-AARCH64: "-internal-isystem" "[[SYSROOT]]/usr/lib64/aarch64-oe-linux/6.3.0/../../../include/c++/6.3.0/backward"
 
 // Check header search with Cray's gcc package.
 // RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
-// RUN:     -target x86_64-unknown-linux-gnu -stdlib=libstdc++ \
+// RUN:     -target x86_64-suse-linux -stdlib=libstdc++ \
 // RUN:     --sysroot=%S/Inputs/cray_suse_gcc_tree \
 // RUN:     --gcc-toolchain="%S/Inputs/cray_suse_gcc_tree/opt/gcc/8.2.0/snos" \
 // RUN:   | FileCheck --check-prefix=CHECK-CRAY-X86 %s
 
 // CHECK-CRAY-X86: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
 // CHECK-CRAY-X86: "-isysroot" "[[SYSROOT:[^"]+]]"
 // CHECK-CRAY-X86: "-internal-isystem" "[[SYSROOT]]/opt/gcc/8.2.0/snos/lib/gcc/x86_64-suse-linux/8.2.0/../../../../include/g++"
 // CHECK-CRAY-X86: "-internal-isystem" "[[SYSROOT]]/opt/gcc/8.2.0/snos/lib/gcc/x86_64-suse-linux/8.2.0/../../../../include/g++/backward"

clang/test/Driver/linux-ld.c

 // CHECK-SUSE-10-3-PPC64: "{{.*}}/usr/lib/gcc/powerpc64-suse-linux/4.1.2/64{{/|\\\\}}crtbegin.o"
 // CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-suse-linux/4.1.2/64"
 // CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-suse-linux/4.1.2/../../../../lib64"
 // CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/lib/../lib64"
 // CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/usr/lib/../lib64"
 //
 // Check openSuse Leap 42.2 on AArch64
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN:     --target=arm64-unknown-linux-gnu -rtlib=platform \
+// RUN:     --target=aarch64-suse-linux -rtlib=platform \
 // RUN:     --gcc-toolchain="" \
 // RUN:     --sysroot=%S/Inputs/opensuse_42.2_aarch64_tree \
 // RUN:   | FileCheck --check-prefix=CHECK-OPENSUSE-42-2-AARCH64 %s
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN:     --target=aarch64-unknown-linux-gnu -rtlib=platform \
+// RUN:     --target=aarch64-suse-linux -rtlib=platform \
 // RUN:     --gcc-toolchain="" \
 // RUN:     --sysroot=%S/Inputs/opensuse_42.2_aarch64_tree \
 // RUN:   | FileCheck --check-prefix=CHECK-OPENSUSE-42-2-AARCH64 %s
 // CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
 // CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8/../../../../lib64{{/|\\\\}}crt1.o"
 // CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8/../../../../lib64{{/|\\\\}}crti.o"
 // CHECK-OPENSUSE-42-2-AARCH64: "{{.*}}/usr/lib64/gcc/aarch64-suse-linux/4.8{{/|\\\\}}crtbegin.o"
 // CHECK-OPENSUSE-42-2-AARCH64: "-L[[SYSROOT]]/usr/lib64/gcc/aarch64-suse-linux/4.8"

 // CHECK-OPENSUSE-TW-RISCV64: "{{.*}}/usr/lib64/gcc/riscv64-suse-linux/9{{/|\\\\}}crtbegin.o"
 // CHECK-OPENSUSE-TW-RISCV64: "-L[[SYSROOT]]/usr/lib64/gcc/riscv64-suse-linux/9"
 // CHECK-OPENSUSE-TW-RISCV64: "-L[[SYSROOT]]/usr/lib64/gcc/riscv64-suse-linux/9/../../../../lib64"
 // CHECK-OPENSUSE-TW-RISCV64: "{{.*}}/usr/lib64/gcc/riscv64-suse-linux/9{{/|\\\\}}crtend.o"
 // CHECK-OPENSUSE-TW-RISCV64: "{{.*}}/usr/lib64/gcc/riscv64-suse-linux/9/../../../../lib64{{/|\\\\}}crtn.o"
 //
 // Check openSUSE Tumbleweed on ppc
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN:     --target=powerpc-unknown-linux-gnu -rtlib=platform \
+// RUN:     --target=powerpc-suse-linux -rtlib=platform \
 // RUN:     --gcc-toolchain="" \
 // RUN:     --sysroot=%S/Inputs/opensuse_tumbleweed_ppc_tree \
 // RUN:   | FileCheck --check-prefix=CHECK-OPENSUSE-TW-PPC %s
 // CHECK-OPENSUSE-TW-PPC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
 // CHECK-OPENSUSE-TW-PPC: "{{.*}}/usr/lib{{/|\\\\}}crt1.o"
 // CHECK-OPENSUSE-TW-PPC: "{{.*}}/usr/lib{{/|\\\\}}crti.o"
 // CHECK-OPENSUSE-TW-PPC: "{{.*}}/usr/lib/gcc/powerpc64-suse-linux/9{{/|\\\\}}crtbegin.o"
 // CHECK-OPENSUSE-TW-PPC: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-suse-linux/9"

llvm/lib/Support/Triple.cpp

if (Environment == Triple::Android && Components[3].startswith("androideabi")) {
     if (AndroidVersion.empty()) {
       Components[3] = "android";
     } else {
       NormalizedEnvironment = Twine("android", AndroidVersion).str();
       Components[3] = NormalizedEnvironment;
     }
   }
 
-  // SUSE uses "gnueabi" to mean "gnueabihf"
-  if (Vendor == Triple::SUSE && Environment == llvm::Triple::GNUEABI)
-    Components[3] = "gnueabihf";
-
   if (OS == Triple::Win32) {
     Components.resize(4);
     Components[2] = "windows";
     if (Environment == UnknownEnvironment) {
       if (ObjectFormat == UnknownObjectFormat || ObjectFormat == Triple::COFF)
         Components[3] = "msvc";
       else
         Components[3] = getObjectFormatTypeName(ObjectFormat);

llvm/unittests/ADT/TripleTest.cpp

EXPECT_EQ("armv6-unknown-netbsd-eabihf",
             Triple::normalize("armv6-netbsd-eabihf"));
   EXPECT_EQ("armv7-unknown-netbsd-eabihf",
             Triple::normalize("armv7-netbsd-eabihf"));
   EXPECT_EQ("armv6eb-unknown-netbsd-eabihf",
             Triple::normalize("armv6eb-netbsd-eabihf"));
   EXPECT_EQ("armv7eb-unknown-netbsd-eabihf",
             Triple::normalize("armv7eb-netbsd-eabihf"));
 
-  EXPECT_EQ("armv7-suse-linux-gnueabihf",
-            Triple::normalize("armv7-suse-linux-gnueabi"));
-
   Triple T;
   T = Triple("armv6--netbsd-eabi");
   EXPECT_EQ(Triple::arm, T.getArch());
   T = Triple("armv6eb--netbsd-eabi");
   EXPECT_EQ(Triple::armeb, T.getArch());
   T = Triple("armv7-suse-linux-gnueabihf");
   EXPECT_EQ(Triple::GNUEABIHF, T.getEnvironment());
 }