1 --- llvm-5.0.0.src.orig/tools/clang/lib/Driver/ToolChains/Gnu.cpp 2016-08-18 19:56:48.000000000 +0200
2 +++ llvm-5.0.0.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp 2016-11-03 12:18:35.000000000 +0100
4 // lifetime or initialization issues.
5 static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
6 static const char *const AArch64Triples[] = {
8 "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
9 "aarch64-suse-linux", "aarch64-linux-android"};
10 static const char *const AArch64beLibDirs[] = {"/lib"};
11 @@ -2056,9 +2056,13 @@
12 "aarch64_be-linux-gnu"};
14 static const char *const ARMLibDirs[] = {"/lib"};
15 - static const char *const ARMTriples[] = {"arm-linux-gnueabi",
16 + static const char *const ARMTriples[] = {"arm-pld-linux-gnueabi",
17 + "arm-linux-gnueabi",
18 "arm-linux-androideabi"};
19 - static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
20 + static const char *const ARMHFTriples[] = {"arm-pld-linux-gnueabihf",
21 + "armv6hl-pld-linux-gnueabi",
22 + "armv7hl-pld-linux-gnueabi",
23 + "arm-linux-gnueabihf",
24 "armv7hl-redhat-linux-gnueabi",
25 "armv6hl-suse-linux-gnueabi",
26 "armv7hl-suse-linux-gnueabi"};
29 static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
30 static const char *const X86_64Triples[] = {
31 + "x86_64-pld-linux", "amd64-pld-linux",
32 "x86_64-linux-gnu", "x86_64-unknown-linux-gnu",
33 "x86_64-pc-linux-gnu", "x86_64-redhat-linux6E",
34 "x86_64-redhat-linux", "x86_64-suse-linux",
36 static const char *const X32LibDirs[] = {"/libx32"};
37 static const char *const X86LibDirs[] = {"/lib32", "/lib"};
38 static const char *const X86Triples[] = {
39 + "i686-pld-linux", "i586-pld-linux", "i486-pld-linux", "i386-pld-linux", "athlon-pld-linux",
40 "i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu",
41 "i386-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux",
42 "i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux",
45 static const char *const PPCLibDirs[] = {"/lib32", "/lib"};
46 static const char *const PPCTriples[] = {
47 + "powerpc-pld-linux",
48 "powerpc-linux-gnu", "powerpc-unknown-linux-gnu", "powerpc-linux-gnuspe",
49 // On 32-bit PowerPC systems running SUSE Linux, gcc is configured as a
50 // 64-bit compiler which defaults to "-m32", hence "powerpc64-suse-linux".
51 @@ -2093,14 +2097,14 @@
52 "riscv64-suse-linux"};
54 static const char *const SPARCv8LibDirs[] = {"/lib32", "/lib"};
55 - static const char *const SPARCv8Triples[] = {"sparc-linux-gnu",
56 + static const char *const SPARCv8Triples[] = {"sparc-pld-linux", "sparc-linux-gnu",
58 static const char *const SPARCv9LibDirs[] = {"/lib64", "/lib"};
59 - static const char *const SPARCv9Triples[] = {"sparc64-linux-gnu",
60 + static const char *const SPARCv9Triples[] = {"sparc64-pld-linux", "sparc64-linux-gnu",
63 static const char *const SystemZLibDirs[] = {"/lib64", "/lib"};
64 - static const char *const SystemZTriples[] = {
65 + static const char *const SystemZTriples[] = {"s390x-pld-linux",
66 "s390x-linux-gnu", "s390x-unknown-linux-gnu", "s390x-ibm-linux-gnu",
67 "s390x-suse-linux", "s390x-redhat-linux"};
69 --- llvm-5.0.0.src/tools/clang/include/clang/Driver/Distro.h.orig 2017-05-04 14:46:38.000000000 +0200
70 +++ llvm-5.0.0.src/tools/clang/include/clang/Driver/Distro.h 2017-12-01 22:44:57.785429043 +0100
72 // in this enum, because some tests are done by integer comparison against
73 // the first and last known member in the family, e.g. IsRedHat().
80 return DistroVal >= UbuntuHardy && DistroVal <= UbuntuArtful;
84 + return DistroVal == PLDLinux;
90 --- llvm-5.0.0.src/tools/clang/lib/Driver/Distro.cpp.orig 2017-05-04 14:46:38.000000000 +0200
91 +++ llvm-5.0.0.src/tools/clang/lib/Driver/Distro.cpp 2017-12-01 22:47:15.155427475 +0100
93 if (VFS.exists("/etc/arch-release"))
94 return Distro::ArchLinux;
96 + if (VFS.exists("/etc/pld-release"))
97 + return Distro::PLDLinux;
99 return Distro::UnknownDistro;
102 --- llvm-5.0.0.src/tools/clang/lib/Driver/ToolChains/Linux.cpp.orig 2017-12-01 22:14:03.462116884 +0100
103 +++ llvm-5.0.0.src/tools/clang/lib/Driver/ToolChains/Linux.cpp 2017-12-01 22:51:38.678757801 +0100
105 ExtraOpts.push_back("now");
108 - if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() ||
109 + if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || Distro.IsPLD() ||
110 Triple.isAndroid()) {
111 ExtraOpts.push_back("-z");
112 ExtraOpts.push_back("relro");
114 // Android loader does not support .gnu.hash until API 23.
115 // Hexagon linker/loader does not support .gnu.hash
116 if (!IsMips && !IsHexagon) {
117 - if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() ||
118 + if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() || Distro.IsPLD() ||
119 (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick) ||
120 (IsAndroid && !Triple.isAndroidVersionLT(23)))
121 ExtraOpts.push_back("--hash-style=gnu");