--- 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 @@
 
   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",
@@ -1074,6 +1075,7 @@
   };
   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",
@@ -1830,6 +1834,7 @@
 
 enum LinuxDistro {
   ArchLinux,
+  TLDLinux,
   DebianLenny,
   DebianSqueeze,
   DebianWheezy,
@@ -1877,6 +1882,10 @@
   return Distro >= UbuntuHardy && Distro <= UbuntuRaring;
 }
 
+static bool IsTLD(enum LinuxDistro Distro) {
+  return Distro == TLDLinux;
+}
+
 static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
   OwningPtr<llvm::MemoryBuffer> File;
   if (!llvm::MemoryBuffer::getFile("/etc/lsb-release", File)) {
@@ -1955,6 +1964,9 @@
   if (!llvm::sys::fs::exists("/etc/arch-release", Exists) && Exists)
     return ArchLinux;
 
+  if (!llvm::sys::fs::exists("/etc/tld-release", Exists) && Exists)
+    return TLDLinux;
+
   return UnknownDistro;
 }
 
@@ -2072,7 +2084,7 @@
 
   LinuxDistro Distro = DetectLinuxDistro(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 @@
   // ABI requires a mapping between the GOT and the symbol table.
   // Android loader does not support .gnu.hash.
   if (!isMipsArch(Arch) && !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 @@
       ExtraOpts.push_back("--hash-style=both");
   }
 
-  if (IsRedhat(Distro))
+  if (IsRedhat(Distro) || IsTLD(Distro))
     ExtraOpts.push_back("--no-add-needed");
 
   if (Distro == DebianSqueeze || Distro == DebianWheezy ||
-      IsOpenSuse(Distro) ||
+      IsOpenSuse(Distro) || IsTLD(Distro) ||
       (IsRedhat(Distro) && Distro != RHEL4 && Distro != RHEL5) ||
       (IsUbuntu(Distro) && Distro >= UbuntuKarmic))
     ExtraOpts.push_back("--build-id");