[clang] a6a15dd - [Driver] Delete toplevel i386-gnu/gcc detection in favor of i386-gnu alias triple detection

[Fangrui Song via cfe-commits]

Author: Fangrui Song
Date: 2021-03-19T22:50:36-07:00
New Revision: a6a15dde5a870f0ce6be0ea26d36cec60e846a2d

URL: https://github.com/llvm/llvm-project/commit/a6a15dde5a870f0ce6be0ea26d36cec60e846a2d
DIFF: https://github.com/llvm/llvm-project/commit/a6a15dde5a870f0ce6be0ea26d36cec60e846a2d.diff

LOG: [Driver] Delete toplevel i386-gnu/gcc detection in favor of i386-gnu alias triple detection

This is used by hurd.c (usr/lib/gcc/i386-gnu/4.6.0) but we can leverage
the existing alias triple detection.

Added: 
    

Modified: 
    clang/lib/Driver/ToolChains/Gnu.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
index 906bac57fa77..3c1fc87d7896 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -2537,9 +2537,6 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple(
       // FIXME: It may be worthwhile to generalize this and look for a second
       // triple.
       {"i386-linux-gnu/gcc/" + CandidateTriple.str(), "../../..",
-       (TargetArch == llvm::Triple::x86 &&
-        TargetTriple.getOS() != llvm::Triple::Solaris)},
-      {"i386-gnu/gcc/" + CandidateTriple.str(), "../../..",
        (TargetArch == llvm::Triple::x86 &&
         TargetTriple.getOS() != llvm::Triple::Solaris)}};