1 diff -urNp -x '*.orig' llvm-11.0.1.src.org/tools/clang/include/clang/Driver/Distro.h llvm-11.0.1.src/tools/clang/include/clang/Driver/Distro.h
2 --- llvm-11.0.1.src.org/tools/clang/include/clang/Driver/Distro.h 2020-12-18 20:57:38.000000000 +0100
3 +++ llvm-11.0.1.src/tools/clang/include/clang/Driver/Distro.h 2021-03-25 22:27:39.173689051 +0100
4 @@ -28,6 +28,7 @@ public:
5 // the first and last known member in the family, e.g. IsRedHat().
12 @@ -132,6 +133,10 @@ public:
14 bool IsGentoo() const { return DistroVal == Gentoo; }
17 + return DistroVal == PLDLinux;
23 diff -urNp -x '*.orig' llvm-11.0.1.src.org/tools/clang/lib/Driver/Distro.cpp llvm-11.0.1.src/tools/clang/lib/Driver/Distro.cpp
24 --- llvm-11.0.1.src.org/tools/clang/lib/Driver/Distro.cpp 2020-12-18 20:57:38.000000000 +0100
25 +++ llvm-11.0.1.src/tools/clang/lib/Driver/Distro.cpp 2021-03-25 22:27:39.173689051 +0100
26 @@ -165,6 +165,9 @@ static Distro::DistroType DetectDistro(l
27 if (VFS.exists("/etc/gentoo-release"))
28 return Distro::Gentoo;
30 + if (VFS.exists("/etc/pld-release"))
31 + return Distro::PLDLinux;
33 return Distro::UnknownDistro;
36 diff -urNp -x '*.orig' llvm-11.0.1.src.org/tools/clang/lib/Driver/ToolChains/Gnu.cpp llvm-11.0.1.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp
37 --- llvm-11.0.1.src.org/tools/clang/lib/Driver/ToolChains/Gnu.cpp 2020-12-18 20:57:38.000000000 +0100
38 +++ llvm-11.0.1.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp 2021-03-25 22:27:39.173689051 +0100
39 @@ -2048,6 +2048,7 @@ void Generic_GCC::GCCInstallationDetecto
40 // lifetime or initialization issues.
41 static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
42 static const char *const AArch64Triples[] = {
43 + "aarch64-pld-linux",
44 "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
45 "aarch64-suse-linux", "aarch64-linux-android"};
46 static const char *const AArch64beLibDirs[] = {"/lib"};
47 @@ -2055,9 +2056,14 @@ void Generic_GCC::GCCInstallationDetecto
48 "aarch64_be-linux-gnu"};
50 static const char *const ARMLibDirs[] = {"/lib"};
51 - static const char *const ARMTriples[] = {"arm-linux-gnueabi",
52 + static const char *const ARMTriples[] = {"arm-pld-linux-gnueabi",
53 + "arm-linux-gnueabi",
54 "arm-linux-androideabi"};
55 - static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
56 + static const char *const ARMHFTriples[] = {"arm-pld-linux-gnueabihf",
57 + "armv6hl-pld-linux-gnueabi",
58 + "armv7hl-pld-linux-gnueabi",
59 + "armv7hnl-pld-linux-gnueabi",
60 + "arm-linux-gnueabihf",
61 "armv7hl-redhat-linux-gnueabi",
62 "armv6hl-suse-linux-gnueabi",
63 "armv7hl-suse-linux-gnueabi"};
64 @@ -2072,6 +2077,7 @@ void Generic_GCC::GCCInstallationDetecto
66 static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
67 static const char *const X86_64Triples[] = {
68 + "x86_64-pld-linux", "amd64-pld-linux",
69 "x86_64-linux-gnu", "x86_64-unknown-linux-gnu",
70 "x86_64-pc-linux-gnu", "x86_64-redhat-linux6E",
71 "x86_64-redhat-linux", "x86_64-suse-linux",
72 @@ -2081,6 +2087,7 @@ void Generic_GCC::GCCInstallationDetecto
73 static const char *const X32LibDirs[] = {"/libx32", "/lib"};
74 static const char *const X86LibDirs[] = {"/lib32", "/lib"};
75 static const char *const X86Triples[] = {
76 + "i686-pld-linux", "i586-pld-linux", "i486-pld-linux", "i386-pld-linux", "athlon-pld-linux",
77 "i586-linux-gnu", "i686-linux-gnu",
78 "i686-pc-linux-gnu", "i386-redhat-linux6E",
79 "i686-redhat-linux", "i386-redhat-linux",
80 @@ -2121,6 +2128,7 @@ void Generic_GCC::GCCInstallationDetecto
82 static const char *const PPCLibDirs[] = {"/lib32", "/lib"};
83 static const char *const PPCTriples[] = {
84 + "powerpc-pld-linux",
85 "powerpc-linux-gnu", "powerpc-unknown-linux-gnu", "powerpc-linux-gnuspe",
86 // On 32-bit PowerPC systems running SUSE Linux, gcc is configured as a
87 // 64-bit compiler which defaults to "-m32", hence "powerpc64-suse-linux".
88 @@ -2146,14 +2154,14 @@ void Generic_GCC::GCCInstallationDetecto
89 "riscv64-suse-linux"};
91 static const char *const SPARCv8LibDirs[] = {"/lib32", "/lib"};
92 - static const char *const SPARCv8Triples[] = {"sparc-linux-gnu",
93 + static const char *const SPARCv8Triples[] = {"sparc-pld-linux", "sparc-linux-gnu",
95 static const char *const SPARCv9LibDirs[] = {"/lib64", "/lib"};
96 - static const char *const SPARCv9Triples[] = {"sparc64-linux-gnu",
97 + static const char *const SPARCv9Triples[] = {"sparc64-pld-linux", "sparc64-linux-gnu",
100 static const char *const SystemZLibDirs[] = {"/lib64", "/lib"};
101 - static const char *const SystemZTriples[] = {
102 + static const char *const SystemZTriples[] = {"s390x-pld-linux",
103 "s390x-linux-gnu", "s390x-unknown-linux-gnu", "s390x-ibm-linux-gnu",
104 "s390x-suse-linux", "s390x-redhat-linux"};
106 diff -urNp -x '*.orig' llvm-11.0.1.src.org/tools/clang/lib/Driver/ToolChains/Linux.cpp llvm-11.0.1.src/tools/clang/lib/Driver/ToolChains/Linux.cpp
107 --- llvm-11.0.1.src.org/tools/clang/lib/Driver/ToolChains/Linux.cpp 2020-12-18 20:57:38.000000000 +0100
108 +++ llvm-11.0.1.src/tools/clang/lib/Driver/ToolChains/Linux.cpp 2021-03-25 22:27:39.173689051 +0100
109 @@ -226,7 +226,7 @@ Linux::Linux(const Driver &D, const llvm
110 ExtraOpts.push_back("now");
113 - if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() ||
114 + if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || Distro.IsPLD() ||
115 Triple.isAndroid()) {
116 ExtraOpts.push_back("-z");
117 ExtraOpts.push_back("relro");
118 @@ -266,7 +266,7 @@ Linux::Linux(const Driver &D, const llvm
119 // Android loader does not support .gnu.hash until API 23.
120 // Hexagon linker/loader does not support .gnu.hash
121 if (!IsMips && !IsHexagon) {
122 - if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() ||
123 + if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() || Distro.IsPLD() ||
124 (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick) ||
125 (IsAndroid && !Triple.isAndroidVersionLT(23)))
126 ExtraOpts.push_back("--hash-style=gnu");