From ab79de310e242a8d3db6a38ed23073de2cc6b3fd Mon Sep 17 00:00:00 2001 From: rsadowski Date: Sat, 7 Feb 2026 15:59:32 +0000 Subject: [PATCH] Fix PSTL backend (names) in __config_site Upstream libc++ renamed these macros in the following commit: https://github.com/llvm/llvm-project/commit/d423d80 We had the correct names in the libcxx* makefiles, so no ABI changes are required. Reported by c2qd and also provided the __config_site diff. OK robert@ --- gnu/lib/libcxx/Makefile | 3 +-- gnu/lib/libcxx/include/c++/v1/__config_site | 6 +++--- gnu/lib/libcxxabi/Makefile | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/lib/libcxx/Makefile b/gnu/lib/libcxx/Makefile index 0d370827186..d569b89b555 100644 --- a/gnu/lib/libcxx/Makefile +++ b/gnu/lib/libcxx/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2025/12/06 09:27:54 robert Exp $ +# $OpenBSD: Makefile,v 1.10 2026/02/07 15:59:32 rsadowski Exp $ .include @@ -93,7 +93,6 @@ CPPFLAGS+= -Wall -DLIBCXXABI -I${HDRDIR} -I${SRCDIR} -I${AHDRDIR} \ CPPFLAGS+= -D_LIBCPP_BUILDING_LIBRARY CPPFLAGS+= -DLIBCXX_BUILDING_LIBCXXABI CPPFLAGS+= -D_LIBCPP_HAS_NO_TIME_ZONE_DATABASE -CPPFLAGS+= -D_LIBCPP_PSTL_BACKEND_STD_THREAD CXXFLAGS+= -nostdlib -nostdinc++ .if empty(CXXFLAGS:M-std=*) diff --git a/gnu/lib/libcxx/include/c++/v1/__config_site b/gnu/lib/libcxx/include/c++/v1/__config_site index bbadde94023..26037e4acc2 100644 --- a/gnu/lib/libcxx/include/c++/v1/__config_site +++ b/gnu/lib/libcxx/include/c++/v1/__config_site @@ -34,9 +34,9 @@ // PSTL backends -/* #undef _LIBCPP_PSTL_CPU_BACKEND_SERIAL */ -#define _LIBCPP_PSTL_CPU_BACKEND_THREAD -/* #undef _LIBCPP_PSTL_CPU_BACKEND_LIBDISPATCH */ +/* #undef _LIBCPP_PSTL_BACKEND_SERIAL */ +#define _LIBCPP_PSTL_BACKEND_STD_THREAD +/* #undef _LIBCPP_PSTL_BACKEND_LIBDISPATCH */ // Hardening. #define _LIBCPP_HARDENING_MODE_DEFAULT 2 diff --git a/gnu/lib/libcxxabi/Makefile b/gnu/lib/libcxxabi/Makefile index bbea5ea01b6..4fcc3e1155a 100644 --- a/gnu/lib/libcxxabi/Makefile +++ b/gnu/lib/libcxxabi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2025/08/21 15:26:58 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.7 2026/02/07 15:59:32 rsadowski Exp $ .include @@ -54,7 +54,6 @@ CPPFLAGS+= -Wall -I${SHDRDIR} -I${HDRDIR} -I${UHDRDIR} \ CPPFLAGS+= -D_LIBUNWIND_IS_NATIVE_ONLY CPPFLAGS+= -D_LIBCXXABI_BUILDING_LIBRARY CPPFLAGS+= -D_LIBCPP_BUILDING_LIBRARY -CPPFLAGS+= -D_LIBCPP_PSTL_BACKEND_STD_THREAD CPPFLAGS+= -D_LIBCPP_HARDENING_MODE=2 CPPFLAGS+= -DNDEBUG CFLAGS+= -nostdlib -funwind-tables