---- llvm-3.3.src/tools/clang/lib/Driver/ToolChains.cpp.orig 2014-09-16 11:54:43.000000000 +0000
-+++ llvm-3.3.src/tools/clang/lib/Driver/ToolChains.cpp 2014-09-16 11:53:47.000000000 +0000
-@@ -1091,6 +1091,7 @@
+--- llvm-5.0.0.src.orig/tools/clang/lib/Driver/ToolChains/Gnu.cpp 2016-08-18 19:56:48.000000000 +0200
++++ llvm-5.0.0.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp 2016-11-03 12:18:35.000000000 +0100
+@@ -1498,6 +1498,7 @@
- static const char *const X86_64LibDirs[] = { "/lib64", "/lib" };
+ static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
static const char *const X86_64Triples[] = {
-+ "x86_64-tld-linux",
- "x86_64-linux-gnu",
- "x86_64-unknown-linux-gnu",
- "x86_64-pc-linux-gnu",
-@@ -1103,6 +1104,7 @@
- };
- static const char *const X86LibDirs[] = { "/lib32", "/lib" };
++ "x86_64-tld-linux",
+ "x86_64-linux-gnu", "x86_64-unknown-linux-gnu",
+ "x86_64-pc-linux-gnu", "x86_64-redhat-linux6E",
+ "x86_64-redhat-linux", "x86_64-suse-linux",
+@@ -1558,6 +1559,7 @@
+ static const char *const X32LibDirs[] = {"/libx32"};
+ static const char *const X86LibDirs[] = {"/lib32", "/lib"};
static const char *const X86Triples[] = {
-+ "i686-tld-linux",
- "i686-linux-gnu",
- "i686-pc-linux-gnu",
- "i486-linux-gnu",
-@@ -1981,6 +1983,7 @@
-
- enum Distro {
- ArchLinux,
-+ TLDLinux,
- DebianLenny,
- DebianSqueeze,
- DebianWheezy,
-@@ -2029,6 +2032,10 @@
- return Distro >= UbuntuHardy && Distro <= UbuntuRaring;
- }
++ "i686-tld-linux",
+ "i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu",
+ "i386-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux",
+ "i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux",
+--- llvm-5.0.0.src/tools/clang/include/clang/Driver/Distro.h.orig 2017-05-04 14:46:38.000000000 +0200
++++ llvm-5.0.0.src/tools/clang/include/clang/Driver/Distro.h 2017-12-01 22:44:57.785429043 +0100
+@@ -27,6 +27,7 @@
+ // in this enum, because some tests are done by integer comparison against
+ // the first and last known member in the family, e.g. IsRedHat().
+ ArchLinux,
++ TLDLinux,
+ DebianLenny,
+ DebianSqueeze,
+ DebianWheezy,
+@@ -114,6 +115,10 @@
+ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuArtful;
+ }
-+static bool IsTLD(enum LinuxDistro Distro) {
-+ return Distro == TLDLinux;
-+}
++ bool IsTLD() {
++ return DistroVal == TLDLinux;
++ }
+
- static Distro DetectDistro(llvm::Triple::ArchType Arch) {
- OwningPtr<llvm::MemoryBuffer> File;
- if (!llvm::MemoryBuffer::getFile("/etc/lsb-release", File)) {
-@@ -2109,6 +2116,9 @@
- if (!llvm::sys::fs::exists("/etc/arch-release", Exists) && Exists)
- return ArchLinux;
+ /// @}
+ };
+
+--- llvm-5.0.0.src/tools/clang/lib/Driver/Distro.cpp.orig 2017-05-04 14:46:38.000000000 +0200
++++ llvm-5.0.0.src/tools/clang/lib/Driver/Distro.cpp 2017-12-01 22:47:15.155427475 +0100
+@@ -129,6 +129,9 @@
+ if (VFS.exists("/etc/arch-release"))
+ return Distro::ArchLinux;
-+ if (!llvm::sys::fs::exists("/etc/tld-release", Exists) && Exists)
-+ return TLDLinux;
++ if (VFS.exists("/etc/tld-release"))
++ return Distro::TLDLinux;
+
- return UnknownDistro;
+ return Distro::UnknownDistro;
}
-@@ -2224,7 +2234,7 @@
-
- Distro Distro = DetectDistro(Arch);
+--- llvm-5.0.0.src/tools/clang/lib/Driver/ToolChains/Linux.cpp.orig 2017-12-01 22:14:03.462116884 +0100
++++ llvm-5.0.0.src/tools/clang/lib/Driver/ToolChains/Linux.cpp 2017-12-01 22:51:38.678757801 +0100
+@@ -210,7 +210,7 @@
+ ExtraOpts.push_back("now");
+ }
-- if (IsOpenSuse(Distro) || IsUbuntu(Distro)) {
-+ if (IsOpenSuse(Distro) || IsUbuntu(Distro) || IsTLD(Distro)) {
+- if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() ||
++ if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || Distro.IsTLD() ||
+ Triple.isAndroid()) {
ExtraOpts.push_back("-z");
ExtraOpts.push_back("relro");
- }
-@@ -2244,7 +2254,7 @@
- // ABI requires a mapping between the GOT and the symbol table.
- // Android loader does not support .gnu.hash.
- if (!IsMips && !IsAndroid) {
-- if (IsRedhat(Distro) || IsOpenSuse(Distro) ||
-+ if (IsRedhat(Distro) || IsOpenSuse(Distro) || IsTLD(Distro) ||
- (IsUbuntu(Distro) && Distro >= UbuntuMaverick))
+@@ -232,7 +232,7 @@
+ // Android loader does not support .gnu.hash until API 23.
+ // Hexagon linker/loader does not support .gnu.hash
+ if (!IsMips && !IsHexagon) {
+- if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() ||
++ if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() || Distro.IsTLD() ||
+ (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick) ||
+ (IsAndroid && !Triple.isAndroidVersionLT(23)))
ExtraOpts.push_back("--hash-style=gnu");
-
-@@ -2253,11 +2263,11 @@
+@@ -241,7 +241,7 @@
ExtraOpts.push_back("--hash-style=both");
}
-- if (IsRedhat(Distro))
-+ if (IsRedhat(Distro) || IsTLD(Distro))
+- if (Distro.IsRedhat() && Distro != Distro::RHEL5 && Distro != Distro::RHEL6)
++ if ((Distro.IsRedhat() && Distro != Distro::RHEL5 && Distro != Distro::RHEL6) || Distro.IsTLD())
ExtraOpts.push_back("--no-add-needed");
- if (Distro == DebianSqueeze || Distro == DebianWheezy ||
-- Distro == DebianJessie || IsOpenSuse(Distro) ||
-+ Distro == DebianJessie || IsOpenSuse(Distro) || IsTLD(Distro) ||
- (IsRedhat(Distro) && Distro != RHEL4 && Distro != RHEL5) ||
- (IsUbuntu(Distro) && Distro >= UbuntuKarmic))
- ExtraOpts.push_back("--build-id");
+ #ifdef ENABLE_LINKER_BUILD_ID
TLD / packages / llvm.git / blobdiff