clang: try /usr/lib32/ld-linux.so.3 loader in sysroot first

* when building libclc the qemuwrapper correctly sets LD_LIBRARY_PATH to /usr/lib32 but the
  interpreter used by prepare_builtins has /usr/lib/ld-linux.so.3 interpreter:
  lib32-libclc/16.0.6 $ file build/prepare_builtins
  build/prepare_builtins: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /usr/lib/ld-linux.so.3, for GNU/Linux 5.4.0, with debug_info, not stripped

  causing qemu to fail with:
  cd lib32-libclc/16.0.6/build && lib32-libclc/16.0.6/qemuwrapper lib32-libclc/16.0.6/build/prepare_builtins -o clspv--.bc builtins.opt.clspv--.bc
  qemu-arm: Could not open '/usr/lib/ld-linux.so.3': No such file or directory

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>

2 files changed, 39 insertions, 15 deletions

diff --git a/recipes-devtools/clang/clang/0006-clang-driver-Check-sysroot-for-ldso-path.patch b/recipes-devtools/clang/clang/0006-clang-driver-Check-sysroot-for-ldso-path.patch
index f280da2..6f61a3c 100644
--- a/recipes-devtools/clang/clang/0006-clang-driver-Check-sysroot-for-ldso-path.patch
+++ b/recipes-devtools/clang/clang/0006-clang-driver-Check-sysroot-for-ldso-path.patch
@@ -1,4 +1,4 @@
-From 710a936d66011859cb3995f42a5b9e962db01f0e Mon Sep 17 00:00:00 2001
+From 4e8e066b60a00eb10c70ef9523c55cfc7ab536f8 Mon Sep 17 00:00:00 2001
 From: Dan McGregor <dan.mcgregor@usask.ca>
 Date: Wed, 26 Apr 2017 20:29:41 -0600
 Subject: [PATCH] clang: driver: Check sysroot for ldso path
@@ -11,14 +11,27 @@ Upstream-Status: Pending
 Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- clang/lib/Driver/ToolChains/Linux.cpp | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+ clang/lib/Driver/ToolChains/Linux.cpp | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index c6fb290ffdb4..2a58f876a68d 100644
+index c6fb290ffdb4..897a2da73d54 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -518,11 +518,19 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -463,7 +463,11 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+         Triple.getEnvironment() == llvm::Triple::GNUEABIHF ||
+         tools::arm::getARMFloatABI(*this, Args) == tools::arm::FloatABI::Hard;
+ 
+-    LibDir = "lib";
++    LibDir = "lib32";
++    if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
++         getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
++        LibDir = "lib";
++    }
+     Loader = HF ? "ld-linux-armhf.so.3" : "ld-linux.so.3";
+     break;
+   }
+@@ -518,11 +522,19 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      LibDir = "lib64";
      Loader =
          (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
@@ -38,7 +51,7 @@ index c6fb290ffdb4..2a58f876a68d 100644
      break;
    case llvm::Triple::riscv32: {
      StringRef ABIName = tools::riscv::getRISCVABI(Args, Triple);
-@@ -544,6 +552,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -544,6 +556,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
    case llvm::Triple::sparcv9:
      LibDir = "lib64";
      Loader = "ld-linux.so.2";
@@ -49,7 +62,7 @@ index c6fb290ffdb4..2a58f876a68d 100644
      break;
    case llvm::Triple::systemz:
      LibDir = "lib";
-@@ -558,6 +570,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -558,6 +574,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
  
      LibDir = X32 ? "libx32" : "lib64";
      Loader = X32 ? "ld-linux-x32.so.2" : "ld-linux-x86-64.so.2";
diff --git a/recipes-devtools/clang/clang/0017-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch b/recipes-devtools/clang/clang/0017-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
index 01182b7..ac311a0 100644
--- a/recipes-devtools/clang/clang/0017-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
+++ b/recipes-devtools/clang/clang/0017-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
@@ -1,4 +1,4 @@
-From a1fdade00611749a75b958e1010db68d4cefff95 Mon Sep 17 00:00:00 2001
+From a85573b9e7e939b0ab1738dd3b3cc999b7de1547 Mon Sep 17 00:00:00 2001
 From: Oleksandr Ocheretnyi <oocheret@cisco.com>
 Date: Wed, 15 Apr 2020 00:08:39 +0300
 Subject: [PATCH] clang: driver: Add dyld-prefix when checking sysroot for ldso
@@ -15,14 +15,25 @@ Upstream-Status: Pending
 Signed-off-by: Oleksandr Ocheretnyi <oocheret@cisco.com>
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- clang/lib/Driver/ToolChains/Linux.cpp | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
+ clang/lib/Driver/ToolChains/Linux.cpp | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index c68a842b45e0..ca9f5f2e4f74 100644
+index de0d5950d2ee..c6acfc8924c9 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -518,8 +518,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -464,8 +464,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+         tools::arm::getARMFloatABI(*this, Args) == tools::arm::FloatABI::Hard;
+ 
+     LibDir = "lib32";
+-    if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
+-         getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
++    if (!getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/" + LibDir + "/" + Loader) &&
++         getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/lib/" + Loader)) {
+         LibDir = "lib";
+     }
+     Loader = HF ? "ld-linux-armhf.so.3" : "ld-linux.so.3";
+@@ -522,8 +522,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      LibDir = "lib64";
      Loader =
          (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
@@ -33,7 +44,7 @@ index c68a842b45e0..ca9f5f2e4f74 100644
          LibDir = "lib";
      }
      break;
-@@ -527,8 +527,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -531,8 +531,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      LibDir = "lib64";
      Loader =
          (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
@@ -44,7 +55,7 @@ index c68a842b45e0..ca9f5f2e4f74 100644
          LibDir = "lib";
      }
      break;
-@@ -552,8 +552,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -556,8 +556,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
    case llvm::Triple::sparcv9:
      LibDir = "lib64";
      Loader = "ld-linux.so.2";
@@ -55,7 +66,7 @@ index c68a842b45e0..ca9f5f2e4f74 100644
          LibDir = "lib";
      }
      break;
-@@ -570,8 +570,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -574,8 +574,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
  
      LibDir = X32 ? "libx32" : "lib64";
      Loader = X32 ? "ld-linux-x32.so.2" : "ld-linux-x86-64.so.2";