]>
Commit | Line | Data |
---|---|---|
265e167c JB |
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 | |
6d245802 JP |
3 | @@ -1996,6 +1996,7 @@ |
4 | // lifetime or initialization issues. | |
5 | static const char *const AArch64LibDirs[] = {"/lib64", "/lib"}; | |
6 | static const char *const AArch64Triples[] = { | |
7 | + "aarch64-pld-linux", | |
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"}; | |
d92b4c2a JP |
11 | @@ -2056,9 +2056,13 @@ |
12 | "aarch64_be-linux-gnu"}; | |
13 | ||
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"}; | |
6d245802 | 27 | @@ -2020,6 +2021,7 @@ |
f981d747 | 28 | |
41876fe7 | 29 | static const char *const X86_64LibDirs[] = {"/lib64", "/lib"}; |
f981d747 | 30 | static const char *const X86_64Triples[] = { |
41876fe7 JR |
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", | |
6d245802 | 35 | @@ -2029,6 +2031,7 @@ |
41876fe7 JR |
36 | static const char *const X32LibDirs[] = {"/libx32"}; |
37 | static const char *const X86LibDirs[] = {"/lib32", "/lib"}; | |
f981d747 | 38 | static const char *const X86Triples[] = { |
41876fe7 JR |
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", | |
6d245802 | 43 | @@ -2069,6 +2072,7 @@ |
b883cf1e | 44 | |
41876fe7 | 45 | static const char *const PPCLibDirs[] = {"/lib32", "/lib"}; |
b883cf1e | 46 | static const char *const PPCTriples[] = { |
41876fe7 JR |
47 | + "powerpc-pld-linux", |
48 | "powerpc-linux-gnu", "powerpc-unknown-linux-gnu", "powerpc-linux-gnuspe", | |
6d245802 JP |
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"}; | |
b883cf1e | 53 | |
41876fe7 JR |
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", | |
57 | "sparcv8-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", | |
61 | "sparcv9-linux-gnu"}; | |
b883cf1e | 62 | |
41876fe7 | 63 | static const char *const SystemZLibDirs[] = {"/lib64", "/lib"}; |
b883cf1e | 64 | - static const char *const SystemZTriples[] = { |
41876fe7 JR |
65 | + static const char *const SystemZTriples[] = {"s390x-pld-linux", |
66 | "s390x-linux-gnu", "s390x-unknown-linux-gnu", "s390x-ibm-linux-gnu", | |
036156f1 | 67 | "s390x-suse-linux", "s390x-redhat-linux"}; |
4ad1976b | 68 | |
265e167c JB |
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 | |
5013c7ea JB |
71 | @@ -27,6 +27,7 @@ |
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(). | |
74 | ArchLinux, | |
75 | + PLDLinux, | |
76 | DebianLenny, | |
77 | DebianSqueeze, | |
78 | DebianWheezy, | |
265e167c JB |
79 | @@ -114,6 +115,10 @@ |
80 | return DistroVal >= UbuntuHardy && DistroVal <= UbuntuArtful; | |
5013c7ea | 81 | } |
265e167c JB |
82 | |
83 | + bool IsPLD() { | |
5013c7ea JB |
84 | + return DistroVal == PLDLinux; |
85 | + } | |
86 | + | |
87 | /// @} | |
88 | }; | |
89 | ||
265e167c JB |
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 | |
92 | @@ -129,6 +129,9 @@ | |
5013c7ea JB |
93 | if (VFS.exists("/etc/arch-release")) |
94 | return Distro::ArchLinux; | |
95 | ||
96 | + if (VFS.exists("/etc/pld-release")) | |
97 | + return Distro::PLDLinux; | |
98 | + | |
99 | return Distro::UnknownDistro; | |
100 | } | |
101 | ||
265e167c JB |
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 | |
104 | @@ -210,7 +210,7 @@ | |
0bc9c5c9 JP |
105 | ExtraOpts.push_back("now"); |
106 | } | |
265e167c | 107 | |
0bc9c5c9 JP |
108 | - if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || |
109 | + if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || Distro.IsPLD() || | |
110 | Triple.isAndroid()) { | |
265e167c JB |
111 | ExtraOpts.push_back("-z"); |
112 | ExtraOpts.push_back("relro"); | |
265e167c | 113 | @@ -232,7 +232,7 @@ |
0bc9c5c9 | 114 | // Android loader does not support .gnu.hash until API 23. |
265e167c | 115 | // Hexagon linker/loader does not support .gnu.hash |
0bc9c5c9 | 116 | if (!IsMips && !IsHexagon) { |
23ae6496 JP |
117 | - if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() || |
118 | + if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() || Distro.IsPLD() || | |
0bc9c5c9 JP |
119 | (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick) || |
120 | (IsAndroid && !Triple.isAndroidVersionLT(23))) | |
265e167c | 121 | ExtraOpts.push_back("--hash-style=gnu"); |