- merged 3.5.1 from PLD, TLDized

[packages/llvm.git] / llvm-tld.patch

diff --git a/llvm-tld.patch b/llvm-tld.patch
index b9ee46f24443d8be42e2358c59c880ac9eea4fb4..fb62e20c6bbaeb7068f672720c96c855088f1fc3 100644 (file)
--- a/llvm-tld.patch
+++ b/llvm-tld.patch
@@ -1,22 +1,22 @@
---- 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-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp.orig  2014-10-01 21:07:02.242822402 +0200
++++ llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp       2014-10-01 21:29:07.449433463 +0200
+@@ -1333,6 +1333,7 @@
  
    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 @@
-   };
++    "x86_64-pld-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",
+     "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", "x86_64-slackware-linux",
+@@ -1341,6 +1342,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 @@
++    "i686-pld-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", "i486-slackware-linux",
+@@ -2778,6 +2781,7 @@
  
  enum Distro {
    ArchLinux,
@@ -24,8 +24,8 @@
    DebianLenny,
    DebianSqueeze,
    DebianWheezy,
-@@ -2029,6 +2032,10 @@
-   return Distro >= UbuntuHardy && Distro <= UbuntuRaring;
+@@ -2820,6 +2824,10 @@
+   return Distro >= UbuntuHardy && Distro <= UbuntuTrusty;
  }
  
 +static bool IsTLD(enum Distro Distro) {
@@ -33,37 +33,37 @@
 +}
 +
  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)
+   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
+       llvm::MemoryBuffer::getFile("/etc/lsb-release");
+@@ -2888,6 +2896,9 @@
+   if (llvm::sys::fs::exists("/etc/arch-release"))
      return ArchLinux;
  
-+  if (!llvm::sys::fs::exists("/etc/tld-release", Exists) && Exists)
++  if (!llvm::sys::fs::exists("/etc/tld-release"))
 +    return TLDLinux;
 +
    return UnknownDistro;
  }
  
-@@ -2224,7 +2234,7 @@
+@@ -3029,7 +3040,7 @@
  
    Distro Distro = DetectDistro(Arch);
  
--  if (IsOpenSuse(Distro) || IsUbuntu(Distro)) {
-+  if (IsOpenSuse(Distro) || IsUbuntu(Distro) || IsTLD(Distro)) {
+-  if (IsOpenSUSE(Distro) || IsUbuntu(Distro)) {
++  if (IsOpenSUSE(Distro) || IsUbuntu(Distro) || IsTLD(Distro)) {
      ExtraOpts.push_back("-z");
      ExtraOpts.push_back("relro");
    }
-@@ -2244,7 +2254,7 @@
+@@ -3049,7 +3060,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) ||
+-    if (IsRedhat(Distro) || IsOpenSUSE(Distro) ||
++    if (IsRedhat(Distro) || IsOpenSUSE(Distro) || IsTLD(Distro) ||
          (IsUbuntu(Distro) && Distro >= UbuntuMaverick))
        ExtraOpts.push_back("--hash-style=gnu");
  
-@@ -2253,11 +2263,11 @@
+@@ -3058,11 +3069,11 @@
        ExtraOpts.push_back("--hash-style=both");
    }
  
@@ -72,8 +72,8 @@
      ExtraOpts.push_back("--no-add-needed");
  
    if (Distro == DebianSqueeze || Distro == DebianWheezy ||
--      Distro == DebianJessie || IsOpenSuse(Distro) ||
-+      Distro == DebianJessie || IsOpenSuse(Distro) || IsTLD(Distro) ||
+-      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");