Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile.uk
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ endif
################################################################################
# Sources
################################################################################
LIBCXX_VERSION=14.0.6
LIBCXX_VERSION=15.0.0
LIBCXX_URL=https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCXX_VERSION)/libcxx-$(LIBCXX_VERSION).src.tar.xz
LIBCXX_PATCHDIR=$(LIBCXX_BASE)/patches
$(eval $(call fetch,libcxx,$(LIBCXX_URL)))
Expand Down Expand Up @@ -102,7 +102,7 @@ LIBCXX_SUPPRESS_FLAGS-$(call have_gcc) += -Wno-maybe-uninitialized
LIBCXX_SUPPRESS_FLAGS-$(call have_gcc) += -Wno-unknown-pragmas

LIBCXX_CFLAGS-y += $(LIBCXX_CONFIG_FLAGS)
LIBCXX_CXXFLAGS-y += $(LIBCXX_CONFIG_FLAGS) -std=c++2a
LIBCXX_CXXFLAGS-y += $(LIBCXX_CONFIG_FLAGS) -std=c++2a -fpermissive
LIBCXX_CXXFLAGS-$(call have_gcc) += -Wno-literal-suffix
LIBCXX_CXXFLAGS-$(call have_gcc) += -Wno-dangling-reference

Expand Down
50 changes: 50 additions & 0 deletions patches/0001-Remove-ABI-tag.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
From 316e4eee534e9474e34f928d5451032556377853 Mon Sep 17 00:00:00 2001
From: Mamta Shukla <mamtashukla555@gmail.com>
Date: Sun, 6 Aug 2023 22:49:45 +0200
Subject: [PATCH] Remove ABI tag

Signed-off-by: Mamta Shukla <mamtashukla555@gmail.com>
---
include/__support/musl/xlocale.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/__support/musl/xlocale.h b/include/__support/musl/xlocale.h
index f564c87..97b4876 100644
--- a/include/__support/musl/xlocale.h
+++ b/include/__support/musl/xlocale.h
@@ -24,27 +24,27 @@
extern "C" {
#endif

-inline _LIBCPP_HIDE_FROM_ABI long long
+inline long long
strtoll_l(const char *__nptr, char **__endptr, int __base, locale_t) {
return ::strtoll(__nptr, __endptr, __base);
}

-inline _LIBCPP_HIDE_FROM_ABI unsigned long long
+inline unsigned long long
strtoull_l(const char *__nptr, char **__endptr, int __base, locale_t) {
return ::strtoull(__nptr, __endptr, __base);
}

-inline _LIBCPP_HIDE_FROM_ABI long long
+inline long long
wcstoll_l(const wchar_t *__nptr, wchar_t **__endptr, int __base, locale_t) {
return ::wcstoll(__nptr, __endptr, __base);
}

-inline _LIBCPP_HIDE_FROM_ABI long long
+inline long long
wcstoull_l(const wchar_t *__nptr, wchar_t **__endptr, int __base, locale_t) {
return ::wcstoull(__nptr, __endptr, __base);
}

-inline _LIBCPP_HIDE_FROM_ABI long double
+inline long double
wcstold_l(const wchar_t *__nptr, wchar_t **__endptr, locale_t) {
return ::wcstold(__nptr, __endptr);
}
--
2.25.1

24 changes: 0 additions & 24 deletions patches/0001-Use-__is_convertible-built-in-when-available.patch

This file was deleted.