clang: Fix patches to use upstream isMusl() function

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

4 files changed, 11 insertions, 11 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 6b81afa..1ed45e7 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,4 +1,4 @@
-From 88840f268e6e86ea56654ef62c75b1ee52badee0 Mon Sep 17 00:00:00 2001
+From fb45cce576a5a748df271ba9e3aa4c4acaece100 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 May 2016 21:49:08 -0700
 Subject: [PATCH 1/4] clang: driver: Add musl ldso support
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 104 insertions(+)
 
 diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
-index c4ac773..cf3b4ae 100644
+index c4ac773..ea8b528 100644
 --- a/lib/Driver/Tools.cpp
 +++ b/lib/Driver/Tools.cpp
 @@ -9108,6 +9108,110 @@ static void AddLibgcc(const llvm::Triple &Triple, const Driver &D,
@@ -27,7 +27,7 @@ index c4ac773..cf3b4ae 100644
 +
 +  if (Triple.isAndroid())
 +    return Triple.isArch64Bit() ? "/system/bin/linker64" : "/system/bin/linker";
-+  if (ToolChain.getTriple().isLinuxMuslEnvironment()) {
++  if (ToolChain.getTriple().isMusl()) {
 +    switch (Arch) {
 +      case llvm::Triple::x86:
 +        return "/lib/ld-musl-i386.so.1";
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 fc208d1..eab2743 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,4 +1,4 @@
-From 73106ac819c30f7f86dad3b459693cd11dd54963 Mon Sep 17 00:00:00 2001
+From 9f267c3838ce237712d3bf62d77218040d10bfaf Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 May 2016 21:52:36 -0700
 Subject: [PATCH 2/4] clang: driver: Use /lib for ldso on OE
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
-index cf3b4ae..1196eac 100644
+index ea8b528..abb7d3b 100644
 --- a/lib/Driver/Tools.cpp
 +++ b/lib/Driver/Tools.cpp
 @@ -9191,24 +9191,24 @@ static std::string getLinuxDynamicLinker(const ArgList &Args,
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 5146572..532c1b1 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 cab3a8b1785fabe9c2278c98d401c2eee027d044 Mon Sep 17 00:00:00 2001
+From 44c64caafedfbcda712102354450b1c5a13a4551 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,14 +13,14 @@ 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 1196eac..9582af9 100644
+index abb7d3b..11b418d 100644
 --- a/lib/Driver/Tools.cpp
 +++ b/lib/Driver/Tools.cpp
 @@ -9503,6 +9503,13 @@ void gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
        if (IsIAMCU)
          CmdArgs.push_back("-lgloss");
  
-+      if (ToolChain.getTriple().isLinuxMuslEnvironment() &&
++      if (ToolChain.getTriple().isMusl() &&
 +          (Args.hasArg(options::OPT_fstack_protector) ||
 +          Args.hasArg(options::OPT_fstack_protector_strong) ||
 +          Args.hasArg(options::OPT_fstack_protector_all))) {
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 642d988..9904d9e 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 34c294478178a0dcf028a037b5297e21ba91f501 Mon Sep 17 00:00:00 2001
+From 688d89497051b733691d38aa3cd0aa045540448e 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,7 +9,7 @@ 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 0292e1d..67f70ed 100644
+index 0292e1d..43b34f1 100644
 --- a/lib/Basic/Targets.cpp
 +++ b/lib/Basic/Targets.cpp
 @@ -1585,7 +1585,8 @@ public:
@@ -18,7 +18,7 @@ index 0292e1d..67f70ed 100644
  
 -    if (getTriple().getOS() == llvm::Triple::FreeBSD) {
 +    if (getTriple().getOS() == llvm::Triple::FreeBSD
-+        || getTriple().isLinuxMuslEnvironment()) {
++        || getTriple().isMusl()) {
        LongDoubleWidth = LongDoubleAlign = 64;
        LongDoubleFormat = &llvm::APFloat::IEEEdouble;
      }