libcxx,libcxxabi: Use cmake knobs for musl

libcxx already has support for musl, enable that
instead of patching code

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

5 files changed, 4 insertions, 101 deletions

diff --git a/recipes-devtools/clang/files/0001-Use-__GLIBC__-to-differentiate-glibc-like-libc-on-li.patch b/recipes-devtools/clang/files/0001-Use-__GLIBC__-to-differentiate-glibc-like-libc-on-li.patch
deleted file mode 100644
index dc06ddd..0000000
--- a/recipes-devtools/clang/files/0001-Use-__GLIBC__-to-differentiate-glibc-like-libc-on-li.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f85abde580d2ba399bfc7538a28f7b6f96912bc6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 15 Mar 2016 03:10:42 +0000
-Subject: [PATCH] Use __GLIBC__ to differentiate glibc-like libc on linux
-
-glibc/uclibc define __GLIBC_PREREQ but musl does not therefore we need
-to check if its on glibc system before using it
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/__config | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/__config b/include/__config
-index db5a832..0859b5f 100644
---- a/include/__config
-+++ b/include/__config
-@@ -392,15 +392,15 @@ typedef __char32_t char32_t;
- #elif defined(__ANDROID__)
- #define _LIBCPP_HAS_QUICK_EXIT
- #elif defined(__linux__)
--#if !defined(_LIBCPP_HAS_MUSL_LIBC)
-+#if defined(__GLIBC__)
- # include <features.h>
--#if __GLIBC_PREREQ(2, 15)
-+#if  __GLIBC_PREREQ(2, 15)
- #define _LIBCPP_HAS_QUICK_EXIT
- #endif
- #if __GLIBC_PREREQ(2, 17)
- #define _LIBCPP_HAS_C11_FEATURES
- #endif
--#else // defined(_LIBCPP_HAS_MUSL_LIBC)
-+#else // defined(__GLIBC__)
- #define _LIBCPP_HAS_QUICK_EXIT
- #define _LIBCPP_HAS_C11_FEATURES
- #endif
--- 
-1.9.1
-
diff --git a/recipes-devtools/clang/files/0001-replace-strtoll_l-with-strtoll-on-musl.patch b/recipes-devtools/clang/files/0001-replace-strtoll_l-with-strtoll-on-musl.patch
deleted file mode 100644
index 6e8404d..0000000
--- a/recipes-devtools/clang/files/0001-replace-strtoll_l-with-strtoll-on-musl.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 103e1e99622318a6183c4576d372cc8126c6778d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 15 Mar 2016 04:20:10 +0000
-Subject: [PATCH] replace strtoll_l with strtoll on musl
-
-Fixes errors like
-libcxx/include/locale:874:26: error: use of undeclared identifier 'strtoll_l'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/locale | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/include/locale b/include/locale
-index 84cb5a5..9072722 100644
---- a/include/locale
-+++ b/include/locale
-@@ -10,7 +10,6 @@
- 
- #ifndef _LIBCPP_LOCALE
- #define _LIBCPP_LOCALE
--
- /*
-     locale synopsis
- 
-@@ -871,7 +870,7 @@ __num_get_signed_integral(const char* __a, const char* __a_end,
-         typename remove_reference<decltype(errno)>::type __save_errno = errno;
-         errno = 0;
-         char *__p2;
--        long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
-+        long long __ll = strtoll(__a, &__p2, __base);
-         typename remove_reference<decltype(errno)>::type __current_errno = errno;
-         if (__current_errno == 0)
-             errno = __save_errno;
-@@ -911,7 +910,7 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end,
-         typename remove_reference<decltype(errno)>::type __save_errno = errno;
-         errno = 0;
-         char *__p2;
--        unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
-+        unsigned long long __ll = strtoull(__a, &__p2, __base);
-         typename remove_reference<decltype(errno)>::type __current_errno = errno;
-         if (__current_errno == 0)
-             errno = __save_errno;
-@@ -941,7 +940,7 @@ __num_get_float(const char* __a, const char* __a_end, ios_base::iostate& __err)
-         typename remove_reference<decltype(errno)>::type __save_errno = errno;
-         errno = 0;
-         char *__p2;
--        long double __ld = strtold_l(__a, &__p2, _LIBCPP_GET_C_LOCALE);
-+        long double __ld = strtold(__a, &__p2);
-         typename remove_reference<decltype(errno)>::type __current_errno = errno;
-         if (__current_errno == 0)
-             errno = __save_errno;
--- 
-1.9.1
-
diff --git a/recipes-devtools/clang/files/0001-use-constexpr-when-using-glibc.patch b/recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch
index f66de8f..f66de8f 100644
--- a/recipes-devtools/clang/files/0001-use-constexpr-when-using-glibc.patch
+++ b/recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index ba6ecc2..b00cb53 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -23,10 +23,7 @@ SRC_URI = "\
            ${LLVM_GIT}/libcxx.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libcxx;destsuffix=git/projects/libcxx \
            ${LLVM_GIT}/libcxxabi.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \
           "
-SRC_URI += "file://0001-Use-__GLIBC__-to-differentiate-glibc-like-libc-on-li.patch \
-            file://0001-use-constexpr-when-using-glibc.patch \
-"
-SRC_URI_append_libc-musl = " file://0001-replace-strtoll_l-with-strtoll-on-musl.patch "
+SRC_URI_append_libc-musl = " file://0001-use-constexpr-when-using-glibc.patch "
 
 SRCREV_FORMAT = "llvm_libcxx_libcxxabi"
 
@@ -36,10 +33,11 @@ THUMB_TUNE_CCARGS = ""
 TUNE_CCARGS += "-ffreestanding -nostdlib"
 
 EXTRA_OECMAKE += "-DLIBCXX_CXX_ABI=libcxxabi \
-                  -DLIBCXXABI_LIBCXX_PATH=${S}/../libcxx \
                   -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/../libcxxabi/include \
                   -DLLVM_PATH=${S}/../../ \
                   -DLIBCXX_ENABLE_SHARED=False \
                  "
 
+EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=True "
+
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb
index 2cb2408..5f8243e 100644
--- a/recipes-devtools/clang/libcxxabi_git.bb
+++ b/recipes-devtools/clang/libcxxabi_git.bb
@@ -23,8 +23,6 @@ SRC_URI = "\
            ${LLVM_GIT}/libcxxabi.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \
           "
 
-SRC_URI += "file://0001-Use-__GLIBC__-to-differentiate-glibc-like-libc-on-li.patch;patchdir=../libcxx"
-
 SRCREV_FORMAT = "llvm_libcxx_libcxxabi"
 
 S = "${WORKDIR}/git/projects/libcxxabi"
@@ -39,5 +37,6 @@ EXTRA_OECMAKE += "-DLIBCXXABI_LIBCXX_PATH=${S}/../libcxx \
                   -DLLVM_BUILD_EXTERNAL_COMPILER_RT=True \
                   -DLIBCXXABI_ENABLE_SHARED=False \
                  "
+CXXFLAGS_append_libc-musl = " -D_LIBCPP_HAS_MUSL_LIBC "
 
 BBCLASSEXTEND = "native nativesdk"