- merged 3.3 from PLD, adjusted tld patch

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

diff --git a/llvm-tld.patch b/llvm-tld.patch
index 38b54f6a857348612e7591d9e281b0d4017def9a..cbe0f364447bdce56019b1fa783d4467289a6c11 100644 (file)
--- a/llvm-tld.patch
+++ b/llvm-tld.patch
@@ -1,6 +1,6 @@
---- llvm-3.2.src/tools/clang/lib/Driver/ToolChains.cpp.orig    2012-12-16 16:59:27.000000000 +0100
-+++ llvm-3.2.src/tools/clang/lib/Driver/ToolChains.cpp 2013-01-24 12:42:19.582377854 +0100
-@@ -1062,6 +1062,7 @@
+--- 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 @@
  
    static const char *const X86_64LibDirs[] = { "/lib64", "/lib" };
    static const char *const X86_64Triples[] = {
@@ -8,7 +8,7 @@
      "x86_64-linux-gnu",
      "x86_64-unknown-linux-gnu",
      "x86_64-pc-linux-gnu",
-@@ -1074,6 +1075,7 @@
+@@ -1103,6 +1104,7 @@
    };
    static const char *const X86LibDirs[] = { "/lib32", "/lib" };
    static const char *const X86Triples[] = {
@@ -16,15 +16,15 @@
      "i686-linux-gnu",
      "i686-pc-linux-gnu",
      "i486-linux-gnu",
-@@ -1830,6 +1834,7 @@
+@@ -1981,6 +1983,7 @@
  
- enum LinuxDistro {
+ enum Distro {
    ArchLinux,
 +  TLDLinux,
    DebianLenny,
    DebianSqueeze,
    DebianWheezy,
-@@ -1877,6 +1882,10 @@
+@@ -2029,6 +2032,10 @@
    return Distro >= UbuntuHardy && Distro <= UbuntuRaring;
  }
  
@@ -32,10 +32,10 @@
 +  return Distro == TLDLinux;
 +}
 +
- static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
+ static Distro DetectDistro(llvm::Triple::ArchType Arch) {
    OwningPtr<llvm::MemoryBuffer> File;
    if (!llvm::MemoryBuffer::getFile("/etc/lsb-release", File)) {
-@@ -1955,6 +1964,9 @@
+@@ -2109,6 +2116,9 @@
    if (!llvm::sys::fs::exists("/etc/arch-release", Exists) && Exists)
      return ArchLinux;
  
@@ -45,25 +45,25 @@
    return UnknownDistro;
  }
  
-@@ -2072,7 +2084,7 @@
+@@ -2224,7 +2234,7 @@
  
-   LinuxDistro Distro = DetectLinuxDistro(Arch);
+   Distro Distro = DetectDistro(Arch);
  
 -  if (IsOpenSuse(Distro) || IsUbuntu(Distro)) {
 +  if (IsOpenSuse(Distro) || IsUbuntu(Distro) || IsTLD(Distro)) {
      ExtraOpts.push_back("-z");
      ExtraOpts.push_back("relro");
    }
-@@ -2088,7 +2100,7 @@
+@@ -2244,7 +2254,7 @@
    // ABI requires a mapping between the GOT and the symbol table.
    // Android loader does not support .gnu.hash.
-   if (!isMipsArch(Arch) && !IsAndroid) {
+   if (!IsMips && !IsAndroid) {
 -    if (IsRedhat(Distro) || IsOpenSuse(Distro) ||
 +    if (IsRedhat(Distro) || IsOpenSuse(Distro) || IsTLD(Distro) ||
          (IsUbuntu(Distro) && Distro >= UbuntuMaverick))
        ExtraOpts.push_back("--hash-style=gnu");
  
-@@ -2097,11 +2109,11 @@
+@@ -2253,11 +2263,11 @@
        ExtraOpts.push_back("--hash-style=both");
    }
  
@@ -72,8 +72,8 @@
      ExtraOpts.push_back("--no-add-needed");
  
    if (Distro == DebianSqueeze || Distro == DebianWheezy ||
--      IsOpenSuse(Distro) ||
-+      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");