clang: Fix dynamic linker detection for arm hf

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

4 files changed, 18 insertions, 19 deletions

diff --git a/recipes-devtools/clang/clang/0001-clang-driver-Use-lib-for-ldso-on-OE.patch b/recipes-devtools/clang/clang/0001-clang-driver-Use-lib-for-ldso-on-OE.patch
index 7571c3a..dac007a 100644
--- a/recipes-devtools/clang/clang/0001-clang-driver-Use-lib-for-ldso-on-OE.patch
+++ b/recipes-devtools/clang/clang/0001-clang-driver-Use-lib-for-ldso-on-OE.patch
@@ -1,4 +1,4 @@
-From 5273f61c9e93d1fa263fba29f0d62ab2860cde65 Mon Sep 17 00:00:00 2001
+From f34c165de2b0365cb9931956db78315c8e4dc688 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 1/4] clang: driver: Use /lib for ldso on OE
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
-index 7884c40..706612d 100644
+index 4ecbf2b..bcd91f0 100644
 --- a/lib/Driver/ToolChains.cpp
 +++ b/lib/Driver/ToolChains.cpp
-@@ -4227,12 +4227,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -4270,12 +4270,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      Loader = "ld.so.1";
      break;
    case llvm::Triple::ppc64:
@@ -33,7 +33,7 @@ index 7884c40..706612d 100644
      Loader =
          (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
      break;
-@@ -4242,7 +4242,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -4285,7 +4285,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      Loader = "ld-linux.so.2";
      break;
    case llvm::Triple::sparcv9:
@@ -42,7 +42,7 @@ index 7884c40..706612d 100644
      Loader = "ld-linux.so.2";
      break;
    case llvm::Triple::systemz:
-@@ -4256,7 +4256,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -4299,7 +4299,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
    case llvm::Triple::x86_64: {
      bool X32 = Triple.getEnvironment() == llvm::Triple::GNUX32;
  
diff --git a/recipes-devtools/clang/clang/0002-clang-Driver-tools.cpp-Add-lssp-and-lssp_nonshared-o.patch b/recipes-devtools/clang/clang/0002-clang-Driver-tools.cpp-Add-lssp-and-lssp_nonshared-o.patch
index 35b8009..a9057e4 100644
--- a/recipes-devtools/clang/clang/0002-clang-Driver-tools.cpp-Add-lssp-and-lssp_nonshared-o.patch
+++ b/recipes-devtools/clang/clang/0002-clang-Driver-tools.cpp-Add-lssp-and-lssp_nonshared-o.patch
@@ -1,4 +1,4 @@
-From ad80343e25ebf5ef82ab3f1b8ce339d4702e5fa6 Mon Sep 17 00:00:00 2001
+From a30d994ddc3611bca15ff3138c6d0ee7f9fd4021 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 2/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 2425619..ab048ba 100644
+index d3844dd..de7d1b5 100644
 --- a/lib/Driver/Tools.cpp
 +++ b/lib/Driver/Tools.cpp
-@@ -9451,6 +9451,13 @@ void gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+@@ -9460,6 +9460,13 @@ void gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
        if (IsIAMCU)
          CmdArgs.push_back("-lgloss");
  
diff --git a/recipes-devtools/clang/clang/0003-clang-musl-ppc-does-not-support-128-bit-long-double.patch b/recipes-devtools/clang/clang/0003-clang-musl-ppc-does-not-support-128-bit-long-double.patch
index 182ae91..b128390 100644
--- a/recipes-devtools/clang/clang/0003-clang-musl-ppc-does-not-support-128-bit-long-double.patch
+++ b/recipes-devtools/clang/clang/0003-clang-musl-ppc-does-not-support-128-bit-long-double.patch
@@ -1,4 +1,4 @@
-From 8a9808b868c81d3fc65a84af74f0969dfc2df877 Mon Sep 17 00:00:00 2001
+From 2cf62aa12f3161bc366bfc873964d6fed8454702 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 3/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 5e9ea68..33f0d89 100644
+index c3ca8c8..bd54075 100644
 --- a/lib/Basic/Targets.cpp
 +++ b/lib/Basic/Targets.cpp
-@@ -1592,7 +1592,8 @@ public:
+@@ -1593,7 +1593,8 @@ public:
        break;
      }
  
diff --git a/recipes-devtools/clang/clang/0004-clang-Check-for-float-ABI-on-arm.patch b/recipes-devtools/clang/clang/0004-clang-Check-for-float-ABI-on-arm.patch
index 1b54c65..e47b48e 100644
--- a/recipes-devtools/clang/clang/0004-clang-Check-for-float-ABI-on-arm.patch
+++ b/recipes-devtools/clang/clang/0004-clang-Check-for-float-ABI-on-arm.patch
@@ -1,4 +1,4 @@
-From 30fb1a92b9d0899a2f25cf1917000aad2f4578c5 Mon Sep 17 00:00:00 2001
+From 56cdacb669a182e69159b840a6a440f7f19211f9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 4 Jul 2016 20:14:52 -0700
 Subject: [PATCH 4/4] clang: Check for float ABI on arm
@@ -9,23 +9,22 @@ also check for float ABI which can be
 set on commandline
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-xx
 ---
- lib/Driver/ToolChains.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ lib/Driver/ToolChains.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
-index 706612d..8bac35a 100644
+index bcd91f0..fd31d7e 100644
 --- a/lib/Driver/ToolChains.cpp
 +++ b/lib/Driver/ToolChains.cpp
-@@ -4169,7 +4169,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -4212,7 +4212,9 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      default:
        ArchName = Triple.getArchName().str();
      }
 -    if (Triple.getEnvironment() == llvm::Triple::MuslEABIHF)
 +    if (Triple.getEnvironment() == llvm::Triple::MuslEABIHF ||
-+        tools::arm::getARMFloatABI(*this, Args) == tools::arm::FloatABI::Hard)
++        (Triple.getEnvironment() == llvm::Triple::MuslEABI &&
++        tools::arm::getARMFloatABI(*this, Args) == tools::arm::FloatABI::Hard))
        ArchName += "hf";
  
      return "/lib/ld-musl-" + ArchName + ".so.1";