clang: Fix ldso for musl based systems

Existing patches were fine however it was resetting
the ld.so since we were following through the musl
case and subsequent flow would overwrite the computed
value of ldso

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

2 files changed, 31 insertions, 19 deletions

diff --git a/recipes-devtools/clang/clang/0001-driver-Add-musl-ldso-support.patch b/recipes-devtools/clang/clang/0001-driver-Add-musl-ldso-support.patch
index 494a671..89eb0b8 100644
--- a/recipes-devtools/clang/clang/0001-driver-Add-musl-ldso-support.patch
+++ b/recipes-devtools/clang/clang/0001-driver-Add-musl-ldso-support.patch
@@ -1,4 +1,4 @@
-From 8fddf3128d740d2e8831367c827fa1b747364563 Mon Sep 17 00:00:00 2001
+From 2b8900f80027da90a41043f8d428c208cb6fdae2 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 30 Mar 2016 19:56:10 -0700
 Subject: [PATCH] driver: Add musl ldso support
@@ -9,14 +9,14 @@ as a musl based Linux platform
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- lib/Driver/Tools.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
+ lib/Driver/Tools.cpp | 47 ++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 42 insertions(+), 5 deletions(-)
 
 diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
-index e72e4bd..968542c 100644
+index e45c5c5..34237c4 100644
 --- a/lib/Driver/Tools.cpp
 +++ b/lib/Driver/Tools.cpp
-@@ -8240,6 +8240,46 @@ static std::string getLinuxDynamicLinker(const ArgList &Args,
+@@ -8953,6 +8953,47 @@ static std::string getLinuxDynamicLinker(const ArgList &Args,
        return "/system/bin/linker64";
      else
        return "/system/bin/linker";
@@ -58,11 +58,25 @@ index e72e4bd..968542c 100644
 +      case llvm::Triple::mips64el:
 +        return "/lib/ld-musl-mipsel64el.so.1";
 +      default:
++        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";
+@@ -8981,11 +9022,7 @@ static std::string getLinuxDynamicLinker(const ArgList &Args,
+     bool IsNaN2008 = mips::isNaN2008(Args, ToolChain.getTriple());
+     if (mips::isUCLibc(Args))
+       LibName = IsNaN2008 ? "ld-uClibc-mipsn8.so.0" : "ld-uClibc.so.0";
+-    else if (!ToolChain.getTriple().hasEnvironment()) {
+-      bool LE = (ToolChain.getTriple().getArch() == llvm::Triple::mipsel) ||
+-                (ToolChain.getTriple().getArch() == llvm::Triple::mips64el);
+-      LibName = LE ? "ld-musl-mipsel.so.1" : "ld-musl-mips.so.1";
+-    } else
++    else
+       LibName = IsNaN2008 ? "ld-linux-mipsn8.so.1" : "ld.so.1";
+ 
+     return (LibDir + "/" + LibName).str();
 -- 
-2.7.4
+2.8.2
 
diff --git a/recipes-devtools/clang/clang/0001-triplet-Add-musl-support.patch b/recipes-devtools/clang/clang/0001-triplet-Add-musl-support.patch
index 9888a5d..3fdf4b6 100644
--- a/recipes-devtools/clang/clang/0001-triplet-Add-musl-support.patch
+++ b/recipes-devtools/clang/clang/0001-triplet-Add-musl-support.patch
@@ -1,4 +1,4 @@
-From 31a62e652efc8e582e3febda0a300fd3f345e260 Mon Sep 17 00:00:00 2001
+From 6ea56dabfd56ad4d1f994378b3f5ce46c02cb85c 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] triplet: Add musl support
@@ -6,13 +6,13 @@ Subject: [PATCH] triplet: Add musl support
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  include/llvm/ADT/Triple.h           | 13 +++++++++++++
- lib/Support/Triple.cpp              | 10 +++++++++-
+ lib/Support/Triple.cpp              |  8 ++++++++
  lib/Target/ARM/ARMSubtarget.h       |  3 +++
  lib/Target/ARM/ARMTargetMachine.cpp |  2 ++
- 4 files changed, 27 insertions(+), 1 deletion(-)
+ 4 files changed, 26 insertions(+)
 
 diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h
-index d163ac7..a4ffc55 100644
+index c89cf4d..29ec600 100644
 --- a/include/llvm/ADT/Triple.h
 +++ b/include/llvm/ADT/Triple.h
 @@ -175,6 +175,10 @@ public:
@@ -32,7 +32,7 @@ index d163ac7..a4ffc55 100644
  
 +  /// Checks if the environment is Linux with musl
 +  bool isLinuxMuslEnvironment() const {
-+    return getOS() == Triple::Linux &&
++    return isOSLinux() &&
 +           (getEnvironment() == Triple::MUSL ||
 +            getEnvironment() == Triple::MUSLX32 ||
 +            getEnvironment() == Triple::MUSLEABI ||
@@ -43,7 +43,7 @@ index d163ac7..a4ffc55 100644
    bool isOSCygMing() const {
      return isWindowsCygwinEnvironment() || isWindowsGNUEnvironment();
 diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
-index 1967fac..146ed82 100644
+index 1967fac..f8b6236 100644
 --- a/lib/Support/Triple.cpp
 +++ b/lib/Support/Triple.cpp
 @@ -201,6 +201,10 @@ const char *Triple::getEnvironmentTypeName(EnvironmentType Kind) {
@@ -57,16 +57,14 @@ index 1967fac..146ed82 100644
    case CODE16: return "code16";
    case EABI: return "eabi";
    case EABIHF: return "eabihf";
-@@ -460,7 +464,11 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
-     .StartsWith("eabi", Triple::EABI)
+@@ -461,6 +465,10 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
      .StartsWith("gnueabihf", Triple::GNUEABIHF)
      .StartsWith("gnueabi", Triple::GNUEABI)
--    .StartsWith("gnux32", Triple::GNUX32)
+     .StartsWith("gnux32", Triple::GNUX32)
 +    .StartsWith("musl", Triple::MUSL)
-+    .StartsWith("gnux32", Triple::MUSLX32)
 +    .StartsWith("musleabihf", Triple::MUSLEABIHF)
 +    .StartsWith("musleabi", Triple::MUSLEABI)
-+    .StartsWith("muslx32", Triple::GNUX32)
++    .StartsWith("muslx32", Triple::MUSLX32)
      .StartsWith("code16", Triple::CODE16)
      .StartsWith("gnu", Triple::GNU)
      .StartsWith("android", Triple::Android)
@@ -107,5 +105,5 @@ index 390b39c..9840c11 100644
      case llvm::Triple::EABI:
        TargetABI = ARMBaseTargetMachine::ARM_ABI_AAPCS;
 -- 
-2.7.4
+2.8.2