clang: Update to latest 3.9 branch

Signed-off-by: Khem Raj <raj.khem@gmail.com>

8 files changed, 132 insertions, 85 deletions

diff --git a/recipes-devtools/clang/clang/0001-clang-driver-Add-musl-ldso-support.patch b/recipes-devtools/clang/clang/0001-clang-driver-Add-musl-ldso-support.patch
index 6747c24..0d8318a 100644
--- a/recipes-devtools/clang/clang/0001-clang-driver-Add-musl-ldso-support.patch
+++ b/recipes-devtools/clang/clang/0001-clang-driver-Add-musl-ldso-support.patch
@@ -1,6 +1,6 @@
-From 21cb1801f0da97918ce5a567cd1f60413b4de726 Mon Sep 17 00:00:00 2001
+From eccb9b3f6745b82c666ad7546035bae3139a5bdf Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 30 Mar 2016 19:56:10 -0700
+Date: Sat, 21 May 2016 21:49:08 -0700
 Subject: [PATCH 1/4] clang: driver: Add musl ldso support
 
 Linux/musl libc implementation has different ldso
@@ -9,18 +9,25 @@ as a musl based Linux platform
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- lib/Driver/Tools.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 42 insertions(+), 6 deletions(-)
+ lib/Driver/Tools.cpp | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 107 insertions(+)
 
 diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
-index 8a1cb54..0ce548c 100644
+index 35ca470..bde9fa9 100644
 --- a/lib/Driver/Tools.cpp
 +++ b/lib/Driver/Tools.cpp
-@@ -8994,6 +8994,47 @@ static std::string getLinuxDynamicLinker(const ArgList &Args,
-       return "/system/bin/linker64";
-     else
-       return "/system/bin/linker";
-+  } else if (ToolChain.getTriple().isLinuxMuslEnvironment()) {
+@@ -8984,6 +8984,113 @@ static void AddLibgcc(const llvm::Triple &Triple, const Driver &D,
+     CmdArgs.push_back("-ldl");
+ }
+ 
++static std::string getLinuxDynamicLinker(const ArgList &Args,
++                                         const toolchains::Linux &ToolChain) {
++  const llvm::Triple::ArchType Arch = ToolChain.getArch();
++  const llvm::Triple &Triple = ToolChain.getTriple();
++
++  if (Triple.isAndroid())
++    return Triple.isArch64Bit() ? "/system/bin/linker64" : "/system/bin/linker";
++  if (ToolChain.getTriple().isLinuxMuslEnvironment()) {
 +    switch (Arch) {
 +      case llvm::Triple::x86:
 +        return "/lib/ld-musl-i386.so.1";
@@ -61,23 +68,68 @@ index 8a1cb54..0ce548c 100644
 +        llvm_unreachable("unsupported musl architecture");
 +        break;
 +    }
-   } else if (Arch == llvm::Triple::x86 || Arch == llvm::Triple::sparc ||
-              Arch == llvm::Triple::sparcel)
-     return "/lib/ld-linux.so.2";
-@@ -9021,12 +9062,7 @@ static std::string getLinuxDynamicLinker(const ArgList &Args,
-     bool IsNaN2008 = mips::isNaN2008(Args, Triple);
-     if (mips::isUCLibc(Args))
-       LibName = IsNaN2008 ? "ld-uClibc-mipsn8.so.0" : "ld-uClibc.so.0";
--    else if (!Triple.hasEnvironment() &&
--             Triple.getVendor() == llvm::Triple::VendorType::MipsTechnologies) {
--      bool LE = (Triple.getArch() == llvm::Triple::mipsel) ||
--                (Triple.getArch() == llvm::Triple::mips64el);
--      LibName = LE ? "ld-musl-mipsel.so.1" : "ld-musl-mips.so.1";
--    } else
++  }
++  switch (Arch) {
++  default: llvm_unreachable("unsupported architecture");
++
++  case llvm::Triple::aarch64:
++    return "/lib/ld-linux-aarch64.so.1";
++  case llvm::Triple::aarch64_be:
++    return "/lib/ld-linux-aarch64_be.so.1";
++  case llvm::Triple::arm:
++  case llvm::Triple::thumb:
++  case llvm::Triple::armeb:
++  case llvm::Triple::thumbeb: {
++    const bool IsHardFloat =
++        Triple.getEnvironment() == llvm::Triple::GNUEABIHF ||
++        arm::getARMFloatABI(ToolChain, Args) == arm::FloatABI::Hard;
++
++    return IsHardFloat ? "/lib/ld-linux-armhf.so.3" : "/lib/ld-linux.so.3";
++  }
++  case llvm::Triple::mips:
++  case llvm::Triple::mipsel:
++  case llvm::Triple::mips64:
++  case llvm::Triple::mips64el: {
++    bool IsNaN2008 = mips::isNaN2008(Args, Triple);
++    bool LE = (Triple.getArch() == llvm::Triple::mipsel) ||
++              (Triple.getArch() == llvm::Triple::mips64el);
++
++    std::string LibDir = "/lib" + mips::getMipsABILibSuffix(Args, Triple);
++    StringRef LibName;
++    if (mips::isUCLibc(Args))
++      LibName = IsNaN2008 ? "ld-uClibc-mipsn8.so.0" : "ld-uClibc.so.0";
 +    else
-       LibName = IsNaN2008 ? "ld-linux-mipsn8.so.1" : "ld.so.1";
- 
-     return (LibDir + "/" + LibName).str();
++      LibName = IsNaN2008 ? "ld-linux-mipsn8.so.1" : "ld.so.1";
++
++    return (LibDir + "/" + LibName).str();
++  }
++  case llvm::Triple::ppc:
++    return "/lib/ld.so.1";
++  case llvm::Triple::ppc64:
++    return (ppc::hasPPCAbiArg(Args, "elfv2")) ? "/lib64/ld64.so.2"
++                                              : "/lib64/ld64.so.1";
++  case llvm::Triple::ppc64le:
++    return (ppc::hasPPCAbiArg(Args, "elfv1")) ? "/lib64/ld64.so.1"
++                                              : "/lib64/ld64.so.2";
++  case llvm::Triple::sparc:
++  case llvm::Triple::sparcel:
++    return "/lib/ld-linux.so.2";
++  case llvm::Triple::sparcv9:
++    return "/lib64/ld-linux.so.2";
++  case llvm::Triple::systemz:
++    return "/lib/ld64.so.1";
++  case llvm::Triple::x86:
++    return "/lib/ld-linux.so.2";
++  case llvm::Triple::x86_64:
++    return (Triple.getEnvironment() == llvm::Triple::GNUX32)
++               ? "/libx32/ld-linux-x32.so.2"
++               : "/lib64/ld-linux-x86-64.so.2";
++  }
++}
++
+ static void AddRunTimeLibs(const ToolChain &TC, const Driver &D,
+                            ArgStringList &CmdArgs, const ArgList &Args) {
+   // Make use of compiler-rt if --rtlib option is used
 -- 
 2.8.2
 
diff --git a/recipes-devtools/clang/clang/0001-llvm-triplet-Add-musl-support.patch b/recipes-devtools/clang/clang/0001-llvm-triplet-Add-musl-support.patch
index a13f568..e2d16aa 100644
--- a/recipes-devtools/clang/clang/0001-llvm-triplet-Add-musl-support.patch
+++ b/recipes-devtools/clang/clang/0001-llvm-triplet-Add-musl-support.patch
@@ -1,4 +1,4 @@
-From a585b7edd91dd64d1d9a8b171f82e28413e574b9 Mon Sep 17 00:00:00 2001
+From ff9b9c7b143b51d9f9c203f6bc74e1f479d883b9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 30 Mar 2016 19:55:41 -0700
 Subject: [PATCH 1/4] llvm: triplet: Add musl support
diff --git a/recipes-devtools/clang/clang/0002-clang-driver-Use-lib-for-ldso-on-OE.patch b/recipes-devtools/clang/clang/0002-clang-driver-Use-lib-for-ldso-on-OE.patch
index 2269968..6aacf21 100644
--- a/recipes-devtools/clang/clang/0002-clang-driver-Use-lib-for-ldso-on-OE.patch
+++ b/recipes-devtools/clang/clang/0002-clang-driver-Use-lib-for-ldso-on-OE.patch
@@ -1,6 +1,6 @@
-From 90f5518a14a4756ef08dbd324b907d9b705d01b8 Mon Sep 17 00:00:00 2001
+From 2c64c7e8953219ba8be91f92418efb9c5369aba8 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 9 May 2016 23:29:24 -0700
+Date: Sat, 21 May 2016 21:52:36 -0700
 Subject: [PATCH 2/4] clang: driver: Use /lib for ldso on OE
 
 OE does not follow the default base_libdir
@@ -11,53 +11,45 @@ for 64bit to /lib64 instead of /lib
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- lib/Driver/Tools.cpp | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
+ lib/Driver/Tools.cpp | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
-index 0ce548c..d318b10 100644
+index bde9fa9..7831911 100644
 --- a/lib/Driver/Tools.cpp
 +++ b/lib/Driver/Tools.cpp
-@@ -9057,7 +9057,6 @@ static std::string getLinuxDynamicLinker(const ArgList &Args,
-       return "/lib/ld-linux.so.3";
-   } else if (Arch == llvm::Triple::mips || Arch == llvm::Triple::mipsel ||
-              Arch == llvm::Triple::mips64 || Arch == llvm::Triple::mips64el) {
--    std::string LibDir = "/lib" + mips::getMipsABILibSuffix(Args, Triple);
-     StringRef LibName;
-     bool IsNaN2008 = mips::isNaN2008(Args, Triple);
-     if (mips::isUCLibc(Args))
-@@ -9065,17 +9064,17 @@ static std::string getLinuxDynamicLinker(const ArgList &Args,
-     else
-       LibName = IsNaN2008 ? "ld-linux-mipsn8.so.1" : "ld.so.1";
- 
--    return (LibDir + "/" + LibName).str();
-+    return ("/lib/" + LibName).str();
-   } else if (Arch == llvm::Triple::ppc)
+@@ -9070,24 +9070,24 @@ static std::string getLinuxDynamicLinker(const ArgList &Args,
+   case llvm::Triple::ppc:
      return "/lib/ld.so.1";
-   else if (Arch == llvm::Triple::ppc64) {
-     if (ppc::hasPPCAbiArg(Args, "elfv2"))
--      return "/lib64/ld64.so.2";
--    return "/lib64/ld64.so.1";
-+      return "/lib/ld64.so.2";
-+    return "/lib/ld64.so.1";
-   } else if (Arch == llvm::Triple::ppc64le) {
-     if (ppc::hasPPCAbiArg(Args, "elfv1"))
--      return "/lib64/ld64.so.1";
--    return "/lib64/ld64.so.2";
-+      return "/lib/ld64.so.1";
-+    return "/lib/ld64.so.2";
-   } else if (Arch == llvm::Triple::systemz)
+   case llvm::Triple::ppc64:
+-    return (ppc::hasPPCAbiArg(Args, "elfv2")) ? "/lib64/ld64.so.2"
+-                                              : "/lib64/ld64.so.1";
++    return (ppc::hasPPCAbiArg(Args, "elfv2")) ? "/lib/ld64.so.2"
++                                              : "/lib/ld64.so.1";
+   case llvm::Triple::ppc64le:
+-    return (ppc::hasPPCAbiArg(Args, "elfv1")) ? "/lib64/ld64.so.1"
+-                                              : "/lib64/ld64.so.2";
++    return (ppc::hasPPCAbiArg(Args, "elfv1")) ? "/lib/ld64.so.1"
++                                              : "/lib/ld64.so.2";
+   case llvm::Triple::sparc:
+   case llvm::Triple::sparcel:
+     return "/lib/ld-linux.so.2";
+   case llvm::Triple::sparcv9:
+-    return "/lib64/ld-linux.so.2";
++    return "/lib/ld-linux.so.2";
+   case llvm::Triple::systemz:
      return "/lib/ld64.so.1";
-   else if (Arch == llvm::Triple::sparcv9)
-@@ -9084,7 +9083,7 @@ static std::string getLinuxDynamicLinker(const ArgList &Args,
-            Triple.getEnvironment() == llvm::Triple::GNUX32)
-     return "/libx32/ld-linux-x32.so.2";
-   else
--    return "/lib64/ld-linux-x86-64.so.2";
-+    return "/lib/ld-linux-x86-64.so.2";
+   case llvm::Triple::x86:
+     return "/lib/ld-linux.so.2";
+   case llvm::Triple::x86_64:
+     return (Triple.getEnvironment() == llvm::Triple::GNUX32)
+-               ? "/libx32/ld-linux-x32.so.2"
+-               : "/lib64/ld-linux-x86-64.so.2";
++               ? "/lib/ld-linux-x32.so.2"
++               : "/lib/ld-linux-x86-64.so.2";
+   }
  }
  
- static void AddRunTimeLibs(const ToolChain &TC, const Driver &D,
 -- 
 2.8.2
 
diff --git a/recipes-devtools/clang/clang/0002-llvm-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-com.patch b/recipes-devtools/clang/clang/0002-llvm-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-com.patch
index 6787df7..d79cbd4 100644
--- a/recipes-devtools/clang/clang/0002-llvm-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-com.patch
+++ b/recipes-devtools/clang/clang/0002-llvm-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-com.patch
@@ -1,4 +1,4 @@
-From 002d533f62fb3a25e8515e3b53d384fb055ddac6 Mon Sep 17 00:00:00 2001
+From dcbc09369c9a031a8c6bbf725b7596765e32b234 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 15 May 2015 12:13:17 -0700
 Subject: [PATCH 2/4] llvm: Remove CMAKE_CROSSCOMPILING so it can cross compile
diff --git a/recipes-devtools/clang/clang/0003-clang-Driver-tools.cpp-Add-lssp-and-lssp_nonshared-o.patch b/recipes-devtools/clang/clang/0003-clang-Driver-tools.cpp-Add-lssp-and-lssp_nonshared-o.patch
index 7418fc7..3964cfe 100644
--- a/recipes-devtools/clang/clang/0003-clang-Driver-tools.cpp-Add-lssp-and-lssp_nonshared-o.patch
+++ b/recipes-devtools/clang/clang/0003-clang-Driver-tools.cpp-Add-lssp-and-lssp_nonshared-o.patch
@@ -1,4 +1,4 @@
-From be020e5e63464204a9459ecb807c9706f422f1da Mon Sep 17 00:00:00 2001
+From f642d770c9bef63cdb0362afd2922a1d94ea625f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 19 May 2016 21:11:06 -0700
 Subject: [PATCH 3/4] clang: Driver/tools.cpp: Add -lssp and -lssp_nonshared on
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
-index d318b10..38d8e27 100644
+index 7831911..9783251 100644
 --- a/lib/Driver/Tools.cpp
 +++ b/lib/Driver/Tools.cpp
-@@ -9366,6 +9366,13 @@ void gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+@@ -9371,6 +9371,13 @@ void gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
  
        CmdArgs.push_back("-lc");
  
diff --git a/recipes-devtools/clang/clang/0003-llvm-Do-not-assume-linux-glibc.patch b/recipes-devtools/clang/clang/0003-llvm-Do-not-assume-linux-glibc.patch
index 6a84485..036a9c1 100644
--- a/recipes-devtools/clang/clang/0003-llvm-Do-not-assume-linux-glibc.patch
+++ b/recipes-devtools/clang/clang/0003-llvm-Do-not-assume-linux-glibc.patch
@@ -1,4 +1,4 @@
-From 877eeefccde262eda3bd022fff2ad6d147a6ad54 Mon Sep 17 00:00:00 2001
+From 5a3de334d6e297d1d730548a479f194e4d907f54 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 15 Mar 2016 05:26:47 +0000
 Subject: [PATCH 3/4] llvm: Do not assume linux == glibc
diff --git a/recipes-devtools/clang/clang/0004-clang-musl-ppc-does-not-support-128-bit-long-double.patch b/recipes-devtools/clang/clang/0004-clang-musl-ppc-does-not-support-128-bit-long-double.patch
index 8ac0151..eafbd9b 100644
--- a/recipes-devtools/clang/clang/0004-clang-musl-ppc-does-not-support-128-bit-long-double.patch
+++ b/recipes-devtools/clang/clang/0004-clang-musl-ppc-does-not-support-128-bit-long-double.patch
@@ -1,4 +1,4 @@
-From 5af772366531ed83ce42a2d6a86c1f5820f659a4 Mon Sep 17 00:00:00 2001
+From 042fc3b25ae43a4e478f825810be78e6053ae9ff Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 10 May 2016 02:00:11 -0700
 Subject: [PATCH 4/4] clang: musl/ppc does not support 128-bit long double
@@ -9,10 +9,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
-index c205356..8146f21 100644
+index cd9c51a..06fb470 100644
 --- a/lib/Basic/Targets.cpp
 +++ b/lib/Basic/Targets.cpp
-@@ -1578,7 +1578,8 @@ public:
+@@ -1585,7 +1585,8 @@ public:
        break;
      }
  
diff --git a/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
index 2dc16b2..9dec3c3 100644
--- a/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
+++ b/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
@@ -1,21 +1,21 @@
-From b1b73874dc3b81e6dd5e05b9f00b2010c9ab18fb Mon Sep 17 00:00:00 2001
+From 31b3fb49da19c4c729520c1333f3dc4cfbb57c0c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 May 2016 00:33:20 +0000
-Subject: [PATCH] llvm: TargetLibraryInfo: Undefine libc functions if they are
- macros
+Subject: [PATCH 4/4] llvm: TargetLibraryInfo: Undefine libc functions if they
+ are macros
 
 musl defines some functions as macros and not inline functions
 if this is the case then make sure to undefine them
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- include/llvm/Analysis/TargetLibraryInfo.def | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
+ include/llvm/Analysis/TargetLibraryInfo.def | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
 
-Index: git/include/llvm/Analysis/TargetLibraryInfo.def
-===================================================================
---- git.orig/include/llvm/Analysis/TargetLibraryInfo.def
-+++ git/include/llvm/Analysis/TargetLibraryInfo.def
+diff --git a/include/llvm/Analysis/TargetLibraryInfo.def b/include/llvm/Analysis/TargetLibraryInfo.def
+index b2a593d..327894c 100644
+--- a/include/llvm/Analysis/TargetLibraryInfo.def
++++ b/include/llvm/Analysis/TargetLibraryInfo.def
 @@ -531,6 +531,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
  TLI_DEFINE_ENUM_INTERNAL(fopen)
  TLI_DEFINE_STRING_INTERNAL("fopen")
@@ -86,3 +86,6 @@ Index: git/include/llvm/Analysis/TargetLibraryInfo.def
  TLI_DEFINE_ENUM_INTERNAL(tmpfile64)
  TLI_DEFINE_STRING_INTERNAL("tmpfile64")
  /// int toascii(int c);
+-- 
+2.8.2
+