clang: Backport a fix to re-arrange header include order on musl

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

2 files changed, 116 insertions, 0 deletions

diff --git a/recipes-devtools/clang/clang/0022-Driver-Prioritize-SYSROOT-usr-include-over-RESOURCE_.patch b/recipes-devtools/clang/clang/0022-Driver-Prioritize-SYSROOT-usr-include-over-RESOURCE_.patch
new file mode 100644
index 0000000..df2d496
--- /dev/null
+++ b/recipes-devtools/clang/clang/0022-Driver-Prioritize-SYSROOT-usr-include-over-RESOURCE_.patch
@@ -0,0 +1,115 @@
+From c2a7db3073f1991ee3be8e61acb750b40bbd71f3 Mon Sep 17 00:00:00 2001
+From: Fangrui Song <maskray@google.com>
+Date: Tue, 6 Aug 2019 06:25:32 +0000
+Subject: [PATCH] [Driver] Prioritize SYSROOT/usr/include over
+ RESOURCE_DIR/include on linux-musl
+
+On a musl-based Linux distribution, stdalign.h stdarg.h stdbool.h stddef.h stdint.h stdnoreturn.h are expected to be provided by musl (/usr/include), instead of RESOURCE_DIR/include.
+Reorder RESOURCE_DIR/include to fix the search order problem.
+(Currently musl doesn't provide stdatomic.h. stdatomic.h is still found in RESOURCE_DIR/include.)
+
+gcc on musl has a similar search order:
+
+```
+ /usr/lib/gcc/x86_64-alpine-linux-musl/8.3.0/../../../../include/c++/8.3.0
+ /usr/lib/gcc/x86_64-alpine-linux-musl/8.3.0/../../../../include/c++/8.3.0/x86_64-alpine-linux-musl
+ /usr/lib/gcc/x86_64-alpine-linux-musl/8.3.0/../../../../include/c++/8.3.0/backward
+ /usr/local/include
+ /usr/include/fortify
+ /usr/include
+ /usr/lib/gcc/x86_64-alpine-linux-musl/8.3.0/include
+```
+
+This is different from a glibc-based distribution where RESOURCE_DIR/include is placed before SYSROOT/usr/include.
+
+According to the maintainer of musl:
+
+> musl does not support use/mixing of compiler-provided std headers with its headers, and intentionally has no mechanism for communicating with such headers as to which types have already been defined or still need to be defined. If the current include order, with clang's headers before the libc ones, works in some situations, it's only by accident.
+
+Reviewed by: phosek
+
+Differential Revision: https://reviews.llvm.org/D65699
+
+llvm-svn: 367981
+---
+ clang/lib/Driver/ToolChains/Linux.cpp         | 13 ++++---
+ .../test/Driver/linux-musl-header-search.cpp  | 39 +++++++++++++++++++
+ 2 files changed, 47 insertions(+), 5 deletions(-)
+ create mode 100644 clang/test/Driver/linux-musl-header-search.cpp
+
+diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
+index fc7d6c17484..ff671fe27d2 100644
+--- a/clang/lib/Driver/ToolChains/Linux.cpp
++++ b/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -668,11 +668,11 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+   if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
+     addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
+ 
+-  if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
+-    SmallString<128> P(D.ResourceDir);
+-    llvm::sys::path::append(P, "include");
+-    addSystemInclude(DriverArgs, CC1Args, P);
+-  }
++  SmallString<128> ResourceDirInclude(D.ResourceDir);
++  llvm::sys::path::append(ResourceDirInclude, "include");
++  if (!DriverArgs.hasArg(options::OPT_nobuiltininc) &&
++      (!getTriple().isMusl() || DriverArgs.hasArg(options::OPT_nostdlibinc)))
++    addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
+ 
+   if (DriverArgs.hasArg(options::OPT_nostdlibinc))
+     return;
+@@ -870,6 +870,9 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+   addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include");
+ 
+   addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
++
++  if (!DriverArgs.hasArg(options::OPT_nobuiltininc) && getTriple().isMusl())
++    addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
+ }
+ 
+ static std::string DetectLibcxxIncludePath(llvm::vfs::FileSystem &vfs,
+diff --git a/clang/test/Driver/linux-musl-header-search.cpp b/clang/test/Driver/linux-musl-header-search.cpp
+new file mode 100644
+index 00000000000..9fee0360068
+--- /dev/null
++++ b/clang/test/Driver/linux-musl-header-search.cpp
+@@ -0,0 +1,39 @@
++// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
++// RUN:     -target x86_64-linux-musl -stdlib=libc++ \
++// RUN:     -ccc-install-dir %S/Inputs/basic_linux_tree/usr/bin \
++// RUN:     -resource-dir=%S/Inputs/resource_dir \
++// RUN:     --sysroot=%S/Inputs/basic_linux_libcxx_tree --gcc-toolchain= \
++// RUN:   | FileCheck --check-prefix=CHECK-X86-64-LIBCXX %s
++
++// RESOURCE_DIR/include comes after /usr/include on linux-musl.
++// This is different from a glibc-based distribution.
++// CHECK-X86-64-LIBCXX: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
++// CHECK-X86-64-LIBCXX: "-isysroot" "[[SYSROOT:[^"]+]]"
++// CHECK-X86-64-LIBCXX: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/v1"
++// CHECK-X86-64-LIBCXX: "-internal-isystem" "[[SYSROOT]]/usr/local/include"
++// CHECK-X86-64-LIBCXX: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"
++// CHECK-X86-64-LIBCXX: "-internal-isystem" "[[RESOURCE_DIR]]{{/|\\\\}}include"
++
++// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only -nobuiltininc 2>&1 \
++// RUN:     -target x86_64-linux-musl \
++// RUN:     -ccc-install-dir %S/Inputs/basic_linux_tree/usr/bin \
++// RUN:     -resource-dir=%S/Inputs/resource_dir \
++// RUN:     --sysroot=%S/Inputs/basic_linux_libcxx_tree --gcc-toolchain= \
++// RUN:   | FileCheck --check-prefix=CHECK-NOBUILTININC %s
++
++// CHECK-NOBUILTININC: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
++// CHECK-NOBUILTININC-NOT: "-internal-isystem" "[[RESOURCE_DIR]]{{/|\\\\}}include"
++
++// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only -nostdlibinc 2>&1 \
++// RUN:     -target x86_64-linux-musl \
++// RUN:     -ccc-install-dir %S/Inputs/basic_linux_tree/usr/bin \
++// RUN:     -resource-dir=%S/Inputs/resource_dir \
++// RUN:     --sysroot=%S/Inputs/basic_linux_libcxx_tree --gcc-toolchain= \
++// RUN:   | FileCheck --check-prefix=CHECK-NOSTDLIBINC %s
++
++// CHECK-NOSTDLIBINC: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
++// CHECK-NOSTDLIBINC-NOT: "-internal-externc-isystem"
++// CHECK-NOSTDLIBINC-NOT: "-internal-isystem"
++// CHECK-NOSTDLIBINC: "-internal-isystem" "[[RESOURCE_DIR]]{{/|\\\\}}include"
++// CHECK-NOSTDLIBINC-NOT: "-internal-externc-isystem"
++// CHECK-NOSTDLIBINC-NOT: "-internal-isystem"
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index 6c03622..9adeac8 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -29,6 +29,7 @@ SRC_URI = "\
     file://0019-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch \
     file://0020-clang-default-to-lp64d-ABI-and-rv64gc-ISA.patch \
     file://0021-lldb-Do-not-look-for-interpreter.patch \
+    file://0022-Driver-Prioritize-SYSROOT-usr-include-over-RESOURCE_.patch \
 "
 
 # Fallback to no-PIE if not set