enable patch that is (still) required on bookworm

and rebase it while we're at it

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2023-09-14 14:35:03 +02:00
parent db21cc7322
commit 5c42a09f83
2 changed files with 8 additions and 7 deletions

View File

@ -20,16 +20,16 @@ Differential Revision: https://reviews.llvm.org/D124227
libcxx/include/__support/solaris/xlocale.h | 55 +++++++++++-----------
4 files changed, 67 insertions(+), 75 deletions(-)
Index: llvm-toolchain-15_15.0.6~++20230102020141+088f33605d8a/libcxx/include/__support/musl/xlocale.h
Index: llvm-toolchain-16-16.0.6/libcxx/include/__support/musl/xlocale.h
===================================================================
--- llvm-toolchain-15_15.0.6~++20230102020141+088f33605d8a.orig/libcxx/include/__support/musl/xlocale.h
+++ llvm-toolchain-15_15.0.6~++20230102020141+088f33605d8a/libcxx/include/__support/musl/xlocale.h
@@ -39,7 +39,7 @@ wcstoll_l(const wchar_t *__nptr, wchar_t
--- llvm-toolchain-16-16.0.6.orig/libcxx/include/__support/musl/xlocale.h
+++ llvm-toolchain-16-16.0.6/libcxx/include/__support/musl/xlocale.h
@@ -37,7 +37,7 @@ inline _LIBCPP_HIDE_FROM_ABI_C long long
return ::wcstoll(__nptr, __endptr, __base);
}
-inline _LIBCPP_HIDE_FROM_ABI long long
+inline _LIBCPP_HIDE_FROM_ABI unsigned long long
wcstoull_l(const wchar_t *__nptr, wchar_t **__endptr, int __base, locale_t) {
-inline _LIBCPP_HIDE_FROM_ABI_C long long wcstoull_l(const wchar_t* __nptr, wchar_t** __endptr, int __base, locale_t) {
+inline _LIBCPP_HIDE_FROM_ABI_C unsigned long long wcstoull_l(const wchar_t* __nptr, wchar_t** __endptr, int __base, locale_t) {
return ::wcstoull(__nptr, __endptr, __base);
}

View File

@ -154,3 +154,4 @@ new-cmake-build-fix.patch
HIP-search-path-fix.patch
D158066-simd-ppc64el.patch
#mips64el-ompt.patch
libcxx-D124227-wasm.patch