ro created this revision. ro added a reviewer: MaskRay. ro added a project: clang. Herald added a subscriber: fedor.sergeev. Herald added a project: All. ro requested review of this revision.
Solaris 12 was re-christened as Solaris 11.4 while still in beta, so all references are long obsolete and can be removed. Tested on `amd64-pc-solaris2.11`. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D156861 Files: clang/lib/Driver/ToolChains/Gnu.cpp Index: clang/lib/Driver/ToolChains/Gnu.cpp =================================================================== --- clang/lib/Driver/ToolChains/Gnu.cpp +++ clang/lib/Driver/ToolChains/Gnu.cpp @@ -2407,13 +2407,11 @@ 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"}; + "sparc-sun-solaris2.11"}; static const char *const SolarisSparcV9Triples[] = { - "sparcv9-sun-solaris2.11", "sparcv9-sun-solaris2.12"}; - static const char *const SolarisX86Triples[] = {"i386-pc-solaris2.11", - "i386-pc-solaris2.12"}; - static const char *const SolarisX86_64Triples[] = {"x86_64-pc-solaris2.11", - "x86_64-pc-solaris2.12"}; + "sparcv9-sun-solaris2.11"}; + static const char *const SolarisX86Triples[] = {"i386-pc-solaris2.11"}; + static const char *const SolarisX86_64Triples[] = {"x86_64-pc-solaris2.11"}; LibDirs.append(begin(SolarisLibDirs), end(SolarisLibDirs)); BiarchLibDirs.append(begin(SolarisLibDirs), end(SolarisLibDirs)); switch (TargetTriple.getArch()) {
Index: clang/lib/Driver/ToolChains/Gnu.cpp =================================================================== --- clang/lib/Driver/ToolChains/Gnu.cpp +++ clang/lib/Driver/ToolChains/Gnu.cpp @@ -2407,13 +2407,11 @@ 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"}; + "sparc-sun-solaris2.11"}; static const char *const SolarisSparcV9Triples[] = { - "sparcv9-sun-solaris2.11", "sparcv9-sun-solaris2.12"}; - static const char *const SolarisX86Triples[] = {"i386-pc-solaris2.11", - "i386-pc-solaris2.12"}; - static const char *const SolarisX86_64Triples[] = {"x86_64-pc-solaris2.11", - "x86_64-pc-solaris2.12"}; + "sparcv9-sun-solaris2.11"}; + static const char *const SolarisX86Triples[] = {"i386-pc-solaris2.11"}; + static const char *const SolarisX86_64Triples[] = {"x86_64-pc-solaris2.11"}; LibDirs.append(begin(SolarisLibDirs), end(SolarisLibDirs)); BiarchLibDirs.append(begin(SolarisLibDirs), end(SolarisLibDirs)); switch (TargetTriple.getArch()) {
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits