Date: Thu, 19 Mar 2026 16:08:54 +0000 From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3cdf07363af4 - main - wasi: update to sdk-31 Message-ID: <69bc1f96.24e1f.d34173e@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=3cdf07363af4b6992b30a1823c83f785a0bd9773 commit 3cdf07363af4b6992b30a1823c83f785a0bd9773 Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2026-03-19 15:42:17 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2026-03-19 16:08:34 +0000 wasi: update to sdk-31 - switch to cmake - stop copying std{arg,def}.h from devel/llvm, not needed - sync libcxx CMAKE_ARGS - bump all existing libcxx --- devel/wasi-libc/Makefile | 28 ++--- devel/wasi-libc/distinfo | 6 +- .../wasi-libc/files/llvm17/__stddef_max_align_t.h | 27 ---- devel/wasi-libc/files/llvm17/stdarg.h | 51 -------- devel/wasi-libc/files/llvm17/stddef.h | 133 -------------------- .../files/llvm18/__stdarg___gnuc_va_list.h | 13 -- devel/wasi-libc/files/llvm18/__stdarg___va_copy.h | 12 -- devel/wasi-libc/files/llvm18/__stdarg_va_arg.h | 22 ---- devel/wasi-libc/files/llvm18/__stdarg_va_copy.h | 12 -- devel/wasi-libc/files/llvm18/__stdarg_va_list.h | 13 -- .../wasi-libc/files/llvm18/__stddef_max_align_t.h | 27 ---- devel/wasi-libc/files/llvm18/__stddef_null.h | 29 ----- devel/wasi-libc/files/llvm18/__stddef_nullptr_t.h | 29 ----- devel/wasi-libc/files/llvm18/__stddef_offsetof.h | 17 --- devel/wasi-libc/files/llvm18/__stddef_ptrdiff_t.h | 20 --- devel/wasi-libc/files/llvm18/__stddef_rsize_t.h | 20 --- devel/wasi-libc/files/llvm18/__stddef_size_t.h | 20 --- .../wasi-libc/files/llvm18/__stddef_unreachable.h | 21 ---- devel/wasi-libc/files/llvm18/__stddef_wchar_t.h | 28 ----- devel/wasi-libc/files/llvm18/__stddef_wint_t.h | 15 --- devel/wasi-libc/files/llvm18/stdarg.h | 79 ------------ devel/wasi-libc/files/llvm18/stddef.h | 123 ------------------ .../files/llvm19/__stdarg___gnuc_va_list.h | 13 -- devel/wasi-libc/files/llvm19/__stdarg___va_copy.h | 12 -- .../wasi-libc/files/llvm19/__stdarg_header_macro.h | 12 -- devel/wasi-libc/files/llvm19/__stdarg_va_arg.h | 22 ---- devel/wasi-libc/files/llvm19/__stdarg_va_copy.h | 12 -- devel/wasi-libc/files/llvm19/__stdarg_va_list.h | 13 -- .../wasi-libc/files/llvm19/__stddef_header_macro.h | 12 -- .../wasi-libc/files/llvm19/__stddef_max_align_t.h | 27 ---- devel/wasi-libc/files/llvm19/__stddef_null.h | 29 ----- devel/wasi-libc/files/llvm19/__stddef_nullptr_t.h | 29 ----- devel/wasi-libc/files/llvm19/__stddef_offsetof.h | 17 --- devel/wasi-libc/files/llvm19/__stddef_ptrdiff_t.h | 20 --- devel/wasi-libc/files/llvm19/__stddef_rsize_t.h | 20 --- devel/wasi-libc/files/llvm19/__stddef_size_t.h | 20 --- .../wasi-libc/files/llvm19/__stddef_unreachable.h | 21 ---- devel/wasi-libc/files/llvm19/__stddef_wchar_t.h | 28 ----- devel/wasi-libc/files/llvm19/__stddef_wint_t.h | 15 --- devel/wasi-libc/files/llvm19/stdarg.h | 75 ----------- devel/wasi-libc/files/llvm19/stddef.h | 139 --------------------- .../files/llvm20/__stdarg___gnuc_va_list.h | 13 -- devel/wasi-libc/files/llvm20/__stdarg___va_copy.h | 12 -- .../wasi-libc/files/llvm20/__stdarg_header_macro.h | 12 -- devel/wasi-libc/files/llvm20/__stdarg_va_arg.h | 22 ---- devel/wasi-libc/files/llvm20/__stdarg_va_copy.h | 12 -- devel/wasi-libc/files/llvm20/__stdarg_va_list.h | 13 -- .../wasi-libc/files/llvm20/__stddef_header_macro.h | 12 -- .../wasi-libc/files/llvm20/__stddef_max_align_t.h | 27 ---- devel/wasi-libc/files/llvm20/__stddef_null.h | 29 ----- devel/wasi-libc/files/llvm20/__stddef_nullptr_t.h | 29 ----- devel/wasi-libc/files/llvm20/__stddef_offsetof.h | 17 --- devel/wasi-libc/files/llvm20/__stddef_ptrdiff_t.h | 20 --- devel/wasi-libc/files/llvm20/__stddef_rsize_t.h | 20 --- devel/wasi-libc/files/llvm20/__stddef_size_t.h | 20 --- .../wasi-libc/files/llvm20/__stddef_unreachable.h | 21 ---- devel/wasi-libc/files/llvm20/__stddef_wchar_t.h | 28 ----- devel/wasi-libc/files/llvm20/__stddef_wint_t.h | 15 --- devel/wasi-libc/files/llvm20/stdarg.h | 75 ----------- devel/wasi-libc/files/llvm20/stddef.h | 139 --------------------- .../files/llvm21/__stdarg___gnuc_va_list.h | 13 -- devel/wasi-libc/files/llvm21/__stdarg___va_copy.h | 12 -- .../wasi-libc/files/llvm21/__stdarg_header_macro.h | 12 -- devel/wasi-libc/files/llvm21/__stdarg_va_arg.h | 22 ---- devel/wasi-libc/files/llvm21/__stdarg_va_copy.h | 12 -- devel/wasi-libc/files/llvm21/__stdarg_va_list.h | 13 -- .../wasi-libc/files/llvm21/__stddef_header_macro.h | 12 -- .../wasi-libc/files/llvm21/__stddef_max_align_t.h | 27 ---- devel/wasi-libc/files/llvm21/__stddef_null.h | 29 ----- devel/wasi-libc/files/llvm21/__stddef_nullptr_t.h | 29 ----- devel/wasi-libc/files/llvm21/__stddef_offsetof.h | 17 --- devel/wasi-libc/files/llvm21/__stddef_ptrdiff_t.h | 20 --- devel/wasi-libc/files/llvm21/__stddef_rsize_t.h | 20 --- devel/wasi-libc/files/llvm21/__stddef_size_t.h | 20 --- .../wasi-libc/files/llvm21/__stddef_unreachable.h | 21 ---- devel/wasi-libc/files/llvm21/__stddef_wchar_t.h | 28 ----- devel/wasi-libc/files/llvm21/__stddef_wint_t.h | 15 --- devel/wasi-libc/files/llvm21/stdarg.h | 75 ----------- devel/wasi-libc/files/llvm21/stddef.h | 139 --------------------- devel/wasi-libc/files/patch-Makefile | 20 --- devel/wasi-libc/pkg-plist17 | 9 +- devel/wasi-libc/pkg-plist18 | 23 +--- devel/wasi-libc/pkg-plist19 | 25 +--- devel/wasi-libc/pkg-plist20 | 25 +--- devel/wasi-libc/pkg-plist21 | 25 +--- devel/wasi-libcxx/Makefile | 6 +- devel/wasi-libcxx17/Makefile | 2 +- devel/wasi-libcxx18/Makefile | 2 +- devel/wasi-libcxx19/Makefile | 1 + devel/wasi-libcxx20/Makefile | 1 + devel/wasi-libcxx21/Makefile | 1 + 91 files changed, 36 insertions(+), 2457 deletions(-) diff --git a/devel/wasi-libc/Makefile b/devel/wasi-libc/Makefile index e87205f4e8e2..6ef76e519cd0 100644 --- a/devel/wasi-libc/Makefile +++ b/devel/wasi-libc/Makefile @@ -1,6 +1,6 @@ PORTNAME= wasi-libc DISTVERSIONPREFIX= wasi-sdk- -DISTVERSION= 29 +DISTVERSION= 31 CATEGORIES= devel PKGNAMESUFFIX= ${FLAVOR} @@ -16,12 +16,13 @@ LICENSE_FILE_LLVM2= ${WRKSRC}/LICENSE-APACHE-LLVM LICENSE_NAME_LLVM2= Apache License 2.0 with LLVM Exceptions LICENSE_PERMS_LLVM2= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= bash:shells/bash +BUILD_DEPENDS= bash:shells/bash \ + wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} FLAVORS= 19 20 21 18 17 FLAVOR?= ${FLAVORS:[1]} -USES= gmake llvm:${FLAVOR} +USES= cmake llvm:${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= WebAssembly GH_TUPLE= WebAssembly:WASI:59cbe14:wasi/tools/wasi-headers/WASI @@ -29,21 +30,16 @@ NO_ARCH= yes PLIST= ${PKGDIR}/pkg-plist${LLVM_VERSION} CONFLICTS_INSTALL= wasi-libc[0-9]* -ALL_TARGET= finish - # NOTE: matches the https://github.com/WebAssembly/wasi-sdk WASI_SYSROOT= ${PREFIX}/share/wasi-sysroot -MAKE_ENV= INSTALL_DIR=${STAGEDIR}${WASI_SYSROOT} \ - EXTRA_CFLAGS="-O2 -DNDEBUG -isystem ${FILESDIR}" \ - AR=${LOCALBASE}/bin/llvm-ar${LLVM_VERSION} \ - NM=${LOCALBASE}/bin/llvm-nm${LLVM_VERSION} \ - -post-install: -# NOTE: our llvm ports don't ship stdarg/stddef clang headers, so -# they are copied from clang/lib/Headers into FILESDIR and we install -# them to the sysroot - ${INSTALL_DATA} ${FILESDIR}/llvm${LLVM_VERSION}/*stdarg*.h ${STAGEDIR}${WASI_SYSROOT}/include/ - ${INSTALL_DATA} ${FILESDIR}/llvm${LLVM_VERSION}/*stddef*.h ${STAGEDIR}${WASI_SYSROOT}/include/ +CMAKE_INSTALL_PREFIX= ${WASI_SYSROOT} +CMAKE_ARGS= -DCMAKE_C_COMPILER=clang${LLVM_VERSION} \ + -DCMAKE_AR=llvm-ar${LLVM_VERSION} \ + -DCMAKE_NM=llvm-nm${LLVM_VERSION} \ + -DCMAKE_RANLIB=llvm-ranlib${LLVM_VERSION} \ + -DTARGET_TRIPLE=wasm32-wasi \ + -DBUILTINS_LIB=${LLVM_PREFIX:S/${PREFIX}/${LOCALBASE}/}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a \ + -DBUILD_SHARED=OFF .include <bsd.port.mk> diff --git a/devel/wasi-libc/distinfo b/devel/wasi-libc/distinfo index 4224cb552bc2..226bb187b738 100644 --- a/devel/wasi-libc/distinfo +++ b/devel/wasi-libc/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1767797487 -SHA256 (WebAssembly-wasi-libc-wasi-sdk-29_GH0.tar.gz) = d511de1f556521041b0811c6fb9c3e175d9a527bce5ade9ca31ab79b0941823c -SIZE (WebAssembly-wasi-libc-wasi-sdk-29_GH0.tar.gz) = 1507879 +TIMESTAMP = 1773892001 +SHA256 (WebAssembly-wasi-libc-wasi-sdk-31_GH0.tar.gz) = ccb72023597c610b59e4c6c3dcac00b13651dfc633471c24aa33cbfe9cc601ff +SIZE (WebAssembly-wasi-libc-wasi-sdk-31_GH0.tar.gz) = 1637097 SHA256 (WebAssembly-WASI-59cbe14_GH0.tar.gz) = 4e36c4add2421b44ccdded83d442d9aadf02ffa8b534d94016fad2bb7b781cc6 SIZE (WebAssembly-WASI-59cbe14_GH0.tar.gz) = 162059 diff --git a/devel/wasi-libc/files/llvm17/__stddef_max_align_t.h b/devel/wasi-libc/files/llvm17/__stddef_max_align_t.h deleted file mode 100644 index e3b439285d0f..000000000000 --- a/devel/wasi-libc/files/llvm17/__stddef_max_align_t.h +++ /dev/null @@ -1,27 +0,0 @@ -/*===---- __stddef_max_align_t.h - Definition of max_align_t for modules ---=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#ifndef __CLANG_MAX_ALIGN_T_DEFINED -#define __CLANG_MAX_ALIGN_T_DEFINED - -#if defined(_MSC_VER) -typedef double max_align_t; -#elif defined(__APPLE__) -typedef long double max_align_t; -#else -// Define 'max_align_t' to match the GCC definition. -typedef struct { - long long __clang_max_align_nonce1 - __attribute__((__aligned__(__alignof__(long long)))); - long double __clang_max_align_nonce2 - __attribute__((__aligned__(__alignof__(long double)))); -} max_align_t; -#endif - -#endif diff --git a/devel/wasi-libc/files/llvm17/stdarg.h b/devel/wasi-libc/files/llvm17/stdarg.h deleted file mode 100644 index ba978721f1f3..000000000000 --- a/devel/wasi-libc/files/llvm17/stdarg.h +++ /dev/null @@ -1,51 +0,0 @@ -/*===---- stdarg.h - Variable argument handling ----------------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#ifndef __STDARG_H - -#ifndef __GNUC_VA_LIST -#define __GNUC_VA_LIST -typedef __builtin_va_list __gnuc_va_list; -#endif - -#ifdef __need___va_list -#undef __need___va_list -#else -#define __STDARG_H -#ifndef _VA_LIST -typedef __builtin_va_list va_list; -#define _VA_LIST -#endif - -/* FIXME: This is using the placeholder dates Clang produces for these macros - in C2x mode; switch to the correct values once they've been published. */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L -/* C2x does not require the second parameter for va_start. */ -#define va_start(ap, ...) __builtin_va_start(ap, 0) -#else -/* Versions before C2x do require the second parameter. */ -#define va_start(ap, param) __builtin_va_start(ap, param) -#endif -#define va_end(ap) __builtin_va_end(ap) -#define va_arg(ap, type) __builtin_va_arg(ap, type) - -/* GCC always defines __va_copy, but does not define va_copy unless in c99 mode - * or -ansi is not specified, since it was not part of C90. - */ -#define __va_copy(d,s) __builtin_va_copy(d,s) - -#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ - (defined(__cplusplus) && __cplusplus >= 201103L) || \ - !defined(__STRICT_ANSI__) -#define va_copy(dest, src) __builtin_va_copy(dest, src) -#endif - -#endif /* __STDARG_H */ - -#endif /* not __STDARG_H */ diff --git a/devel/wasi-libc/files/llvm17/stddef.h b/devel/wasi-libc/files/llvm17/stddef.h deleted file mode 100644 index 539541f0ed41..000000000000 --- a/devel/wasi-libc/files/llvm17/stddef.h +++ /dev/null @@ -1,133 +0,0 @@ -/*===---- stddef.h - Basic type definitions --------------------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#if !defined(__STDDEF_H) || defined(__need_ptrdiff_t) || \ - defined(__need_size_t) || defined(__need_wchar_t) || \ - defined(__need_NULL) || defined(__need_wint_t) - -#if !defined(__need_ptrdiff_t) && !defined(__need_size_t) && \ - !defined(__need_wchar_t) && !defined(__need_NULL) && \ - !defined(__need_wint_t) -/* Always define miscellaneous pieces when modules are available. */ -#if !__has_feature(modules) -#define __STDDEF_H -#endif -#define __need_ptrdiff_t -#define __need_size_t -#define __need_wchar_t -#define __need_NULL -#define __need_STDDEF_H_misc -/* __need_wint_t is intentionally not defined here. */ -#endif - -#if defined(__need_ptrdiff_t) -#if !defined(_PTRDIFF_T) || __has_feature(modules) -/* Always define ptrdiff_t when modules are available. */ -#if !__has_feature(modules) -#define _PTRDIFF_T -#endif -typedef __PTRDIFF_TYPE__ ptrdiff_t; -#endif -#undef __need_ptrdiff_t -#endif /* defined(__need_ptrdiff_t) */ - -#if defined(__need_size_t) -#if !defined(_SIZE_T) || __has_feature(modules) -/* Always define size_t when modules are available. */ -#if !__has_feature(modules) -#define _SIZE_T -#endif -typedef __SIZE_TYPE__ size_t; -#endif -#undef __need_size_t -#endif /*defined(__need_size_t) */ - -#if defined(__need_STDDEF_H_misc) -/* ISO9899:2011 7.20 (C11 Annex K): Define rsize_t if __STDC_WANT_LIB_EXT1__ is - * enabled. */ -#if (defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ >= 1 && \ - !defined(_RSIZE_T)) || __has_feature(modules) -/* Always define rsize_t when modules are available. */ -#if !__has_feature(modules) -#define _RSIZE_T -#endif -typedef __SIZE_TYPE__ rsize_t; -#endif -#endif /* defined(__need_STDDEF_H_misc) */ - -#if defined(__need_wchar_t) -#if !defined(__cplusplus) || (defined(_MSC_VER) && !_NATIVE_WCHAR_T_DEFINED) -/* Always define wchar_t when modules are available. */ -#if !defined(_WCHAR_T) || __has_feature(modules) -#if !__has_feature(modules) -#define _WCHAR_T -#if defined(_MSC_EXTENSIONS) -#define _WCHAR_T_DEFINED -#endif -#endif -typedef __WCHAR_TYPE__ wchar_t; -#endif -#endif -#undef __need_wchar_t -#endif /* defined(__need_wchar_t) */ - -#if defined(__need_NULL) -#undef NULL -#ifdef __cplusplus -# if !defined(__MINGW32__) && !defined(_MSC_VER) -# define NULL __null -# else -# define NULL 0 -# endif -#else -# define NULL ((void*)0) -#endif -#ifdef __cplusplus -#if defined(_MSC_EXTENSIONS) && defined(_NATIVE_NULLPTR_SUPPORTED) -namespace std { typedef decltype(nullptr) nullptr_t; } -using ::std::nullptr_t; -#endif -#endif -#undef __need_NULL -#endif /* defined(__need_NULL) */ - -/* FIXME: This is using the placeholder dates Clang produces for these macros - in C2x mode; switch to the correct values once they've been published. */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L -typedef typeof(nullptr) nullptr_t; -#endif /* defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L */ - -#if defined(__need_STDDEF_H_misc) && defined(__STDC_VERSION__) && \ - __STDC_VERSION__ >= 202000L -#define unreachable() __builtin_unreachable() -#endif /* defined(__need_STDDEF_H_misc) && >= C23 */ - -#if defined(__need_STDDEF_H_misc) -#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || \ - (defined(__cplusplus) && __cplusplus >= 201103L) -#include "__stddef_max_align_t.h" -#endif -#define offsetof(t, d) __builtin_offsetof(t, d) -#undef __need_STDDEF_H_misc -#endif /* defined(__need_STDDEF_H_misc) */ - -/* Some C libraries expect to see a wint_t here. Others (notably MinGW) will use -__WINT_TYPE__ directly; accommodate both by requiring __need_wint_t */ -#if defined(__need_wint_t) -/* Always define wint_t when modules are available. */ -#if !defined(_WINT_T) || __has_feature(modules) -#if !__has_feature(modules) -#define _WINT_T -#endif -typedef __WINT_TYPE__ wint_t; -#endif -#undef __need_wint_t -#endif /* __need_wint_t */ - -#endif diff --git a/devel/wasi-libc/files/llvm18/__stdarg___gnuc_va_list.h b/devel/wasi-libc/files/llvm18/__stdarg___gnuc_va_list.h deleted file mode 100644 index 2a0a7e8cc6c0..000000000000 --- a/devel/wasi-libc/files/llvm18/__stdarg___gnuc_va_list.h +++ /dev/null @@ -1,13 +0,0 @@ -/*===---- __stdarg___gnuc_va_list.h - Definition of __gnuc_va_list ---------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#ifndef __GNUC_VA_LIST -#define __GNUC_VA_LIST -typedef __builtin_va_list __gnuc_va_list; -#endif diff --git a/devel/wasi-libc/files/llvm18/__stdarg___va_copy.h b/devel/wasi-libc/files/llvm18/__stdarg___va_copy.h deleted file mode 100644 index e433e18a7082..000000000000 --- a/devel/wasi-libc/files/llvm18/__stdarg___va_copy.h +++ /dev/null @@ -1,12 +0,0 @@ -/*===---- __stdarg___va_copy.h - Definition of __va_copy -------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#ifndef __va_copy -#define __va_copy(d, s) __builtin_va_copy(d, s) -#endif diff --git a/devel/wasi-libc/files/llvm18/__stdarg_va_arg.h b/devel/wasi-libc/files/llvm18/__stdarg_va_arg.h deleted file mode 100644 index 89bd2f65d3be..000000000000 --- a/devel/wasi-libc/files/llvm18/__stdarg_va_arg.h +++ /dev/null @@ -1,22 +0,0 @@ -/*===---- __stdarg_va_arg.h - Definitions of va_start, va_arg, va_end-------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#ifndef va_arg - -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L -/* C23 does not require the second parameter for va_start. */ -#define va_start(ap, ...) __builtin_va_start(ap, 0) -#else -/* Versions before C23 do require the second parameter. */ -#define va_start(ap, param) __builtin_va_start(ap, param) -#endif -#define va_end(ap) __builtin_va_end(ap) -#define va_arg(ap, type) __builtin_va_arg(ap, type) - -#endif diff --git a/devel/wasi-libc/files/llvm18/__stdarg_va_copy.h b/devel/wasi-libc/files/llvm18/__stdarg_va_copy.h deleted file mode 100644 index 8645328c2c68..000000000000 --- a/devel/wasi-libc/files/llvm18/__stdarg_va_copy.h +++ /dev/null @@ -1,12 +0,0 @@ -/*===---- __stdarg_va_copy.h - Definition of va_copy------------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#ifndef va_copy -#define va_copy(dest, src) __builtin_va_copy(dest, src) -#endif diff --git a/devel/wasi-libc/files/llvm18/__stdarg_va_list.h b/devel/wasi-libc/files/llvm18/__stdarg_va_list.h deleted file mode 100644 index 20c2e2cad940..000000000000 --- a/devel/wasi-libc/files/llvm18/__stdarg_va_list.h +++ /dev/null @@ -1,13 +0,0 @@ -/*===---- __stdarg_va_list.h - Definition of va_list -----------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#ifndef _VA_LIST -#define _VA_LIST -typedef __builtin_va_list va_list; -#endif diff --git a/devel/wasi-libc/files/llvm18/__stddef_max_align_t.h b/devel/wasi-libc/files/llvm18/__stddef_max_align_t.h deleted file mode 100644 index 512606a87728..000000000000 --- a/devel/wasi-libc/files/llvm18/__stddef_max_align_t.h +++ /dev/null @@ -1,27 +0,0 @@ -/*===---- __stddef_max_align_t.h - Definition of max_align_t ---------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#ifndef __CLANG_MAX_ALIGN_T_DEFINED -#define __CLANG_MAX_ALIGN_T_DEFINED - -#if defined(_MSC_VER) -typedef double max_align_t; -#elif defined(__APPLE__) -typedef long double max_align_t; -#else -// Define 'max_align_t' to match the GCC definition. -typedef struct { - long long __clang_max_align_nonce1 - __attribute__((__aligned__(__alignof__(long long)))); - long double __clang_max_align_nonce2 - __attribute__((__aligned__(__alignof__(long double)))); -} max_align_t; -#endif - -#endif diff --git a/devel/wasi-libc/files/llvm18/__stddef_null.h b/devel/wasi-libc/files/llvm18/__stddef_null.h deleted file mode 100644 index c10bd2d7d988..000000000000 --- a/devel/wasi-libc/files/llvm18/__stddef_null.h +++ /dev/null @@ -1,29 +0,0 @@ -/*===---- __stddef_null.h - Definition of NULL -----------------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#if !defined(NULL) || !__building_module(_Builtin_stddef) - -/* linux/stddef.h will define NULL to 0. glibc (and other) headers then define - * __need_NULL and rely on stddef.h to redefine NULL to the correct value again. - * Modules don't support redefining macros like that, but support that pattern - * in the non-modules case. - */ -#undef NULL - -#ifdef __cplusplus -#if !defined(__MINGW32__) && !defined(_MSC_VER) -#define NULL __null -#else -#define NULL 0 -#endif -#else -#define NULL ((void*)0) -#endif - -#endif diff --git a/devel/wasi-libc/files/llvm18/__stddef_nullptr_t.h b/devel/wasi-libc/files/llvm18/__stddef_nullptr_t.h deleted file mode 100644 index 7f3fbe6fe0d3..000000000000 --- a/devel/wasi-libc/files/llvm18/__stddef_nullptr_t.h +++ /dev/null @@ -1,29 +0,0 @@ -/*===---- __stddef_nullptr_t.h - Definition of nullptr_t -------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -/* - * When -fbuiltin-headers-in-system-modules is set this is a non-modular header - * and needs to behave as if it was textual. - */ -#if !defined(_NULLPTR_T) || \ - (__has_feature(modules) && !__building_module(_Builtin_stddef)) -#define _NULLPTR_T - -#ifdef __cplusplus -#if defined(_MSC_EXTENSIONS) && defined(_NATIVE_NULLPTR_SUPPORTED) -namespace std { -typedef decltype(nullptr) nullptr_t; -} -using ::std::nullptr_t; -#endif -#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L -typedef typeof(nullptr) nullptr_t; -#endif - -#endif diff --git a/devel/wasi-libc/files/llvm18/__stddef_offsetof.h b/devel/wasi-libc/files/llvm18/__stddef_offsetof.h deleted file mode 100644 index 84172c6cd273..000000000000 --- a/devel/wasi-libc/files/llvm18/__stddef_offsetof.h +++ /dev/null @@ -1,17 +0,0 @@ -/*===---- __stddef_offsetof.h - Definition of offsetof ---------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -/* - * When -fbuiltin-headers-in-system-modules is set this is a non-modular header - * and needs to behave as if it was textual. - */ -#if !defined(offsetof) || \ - (__has_feature(modules) && !__building_module(_Builtin_stddef)) -#define offsetof(t, d) __builtin_offsetof(t, d) -#endif diff --git a/devel/wasi-libc/files/llvm18/__stddef_ptrdiff_t.h b/devel/wasi-libc/files/llvm18/__stddef_ptrdiff_t.h deleted file mode 100644 index fd3c893c66c9..000000000000 --- a/devel/wasi-libc/files/llvm18/__stddef_ptrdiff_t.h +++ /dev/null @@ -1,20 +0,0 @@ -/*===---- __stddef_ptrdiff_t.h - Definition of ptrdiff_t -------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -/* - * When -fbuiltin-headers-in-system-modules is set this is a non-modular header - * and needs to behave as if it was textual. - */ -#if !defined(_PTRDIFF_T) || \ - (__has_feature(modules) && !__building_module(_Builtin_stddef)) -#define _PTRDIFF_T - -typedef __PTRDIFF_TYPE__ ptrdiff_t; - -#endif diff --git a/devel/wasi-libc/files/llvm18/__stddef_rsize_t.h b/devel/wasi-libc/files/llvm18/__stddef_rsize_t.h deleted file mode 100644 index dd433d40d973..000000000000 --- a/devel/wasi-libc/files/llvm18/__stddef_rsize_t.h +++ /dev/null @@ -1,20 +0,0 @@ -/*===---- __stddef_rsize_t.h - Definition of rsize_t -----------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -/* - * When -fbuiltin-headers-in-system-modules is set this is a non-modular header - * and needs to behave as if it was textual. - */ -#if !defined(_RSIZE_T) || \ - (__has_feature(modules) && !__building_module(_Builtin_stddef)) -#define _RSIZE_T - -typedef __SIZE_TYPE__ rsize_t; - -#endif diff --git a/devel/wasi-libc/files/llvm18/__stddef_size_t.h b/devel/wasi-libc/files/llvm18/__stddef_size_t.h deleted file mode 100644 index 3dd7b1f37929..000000000000 --- a/devel/wasi-libc/files/llvm18/__stddef_size_t.h +++ /dev/null @@ -1,20 +0,0 @@ -/*===---- __stddef_size_t.h - Definition of size_t -------------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -/* - * When -fbuiltin-headers-in-system-modules is set this is a non-modular header - * and needs to behave as if it was textual. - */ -#if !defined(_SIZE_T) || \ - (__has_feature(modules) && !__building_module(_Builtin_stddef)) -#define _SIZE_T - -typedef __SIZE_TYPE__ size_t; - -#endif diff --git a/devel/wasi-libc/files/llvm18/__stddef_unreachable.h b/devel/wasi-libc/files/llvm18/__stddef_unreachable.h deleted file mode 100644 index 61df43e9732f..000000000000 --- a/devel/wasi-libc/files/llvm18/__stddef_unreachable.h +++ /dev/null @@ -1,21 +0,0 @@ -/*===---- __stddef_unreachable.h - Definition of unreachable ---------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#ifndef __cplusplus - -/* - * When -fbuiltin-headers-in-system-modules is set this is a non-modular header - * and needs to behave as if it was textual. - */ -#if !defined(unreachable) || \ - (__has_feature(modules) && !__building_module(_Builtin_stddef)) -#define unreachable() __builtin_unreachable() -#endif - -#endif diff --git a/devel/wasi-libc/files/llvm18/__stddef_wchar_t.h b/devel/wasi-libc/files/llvm18/__stddef_wchar_t.h deleted file mode 100644 index bd69f6322541..000000000000 --- a/devel/wasi-libc/files/llvm18/__stddef_wchar_t.h +++ /dev/null @@ -1,28 +0,0 @@ -/*===---- __stddef_wchar.h - Definition of wchar_t -------------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#if !defined(__cplusplus) || (defined(_MSC_VER) && !_NATIVE_WCHAR_T_DEFINED) - -/* - * When -fbuiltin-headers-in-system-modules is set this is a non-modular header - * and needs to behave as if it was textual. - */ -#if !defined(_WCHAR_T) || \ - (__has_feature(modules) && !__building_module(_Builtin_stddef)) -#define _WCHAR_T - -#ifdef _MSC_EXTENSIONS -#define _WCHAR_T_DEFINED -#endif - -typedef __WCHAR_TYPE__ wchar_t; - -#endif - -#endif diff --git a/devel/wasi-libc/files/llvm18/__stddef_wint_t.h b/devel/wasi-libc/files/llvm18/__stddef_wint_t.h deleted file mode 100644 index 0aa291507957..000000000000 --- a/devel/wasi-libc/files/llvm18/__stddef_wint_t.h +++ /dev/null @@ -1,15 +0,0 @@ -/*===---- __stddef_wint.h - Definition of wint_t ---------------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#ifndef _WINT_T -#define _WINT_T - -typedef __WINT_TYPE__ wint_t; - -#endif diff --git a/devel/wasi-libc/files/llvm18/stdarg.h b/devel/wasi-libc/files/llvm18/stdarg.h deleted file mode 100644 index 94b066566f08..000000000000 --- a/devel/wasi-libc/files/llvm18/stdarg.h +++ /dev/null @@ -1,79 +0,0 @@ -/*===---- stdarg.h - Variable argument handling ----------------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -/* - * This header is designed to be included multiple times. If any of the __need_ - * macros are defined, then only that subset of interfaces are provided. This - * can be useful for POSIX headers that need to not expose all of stdarg.h, but - * need to use some of its interfaces. Otherwise this header provides all of - * the expected interfaces. - * - * When clang modules are enabled, this header is a textual header. It ignores - * its header guard so that multiple submodules can export its interfaces. - * Take module SM with submodules A and B, whose headers both include stdarg.h - * When SM.A builds, __STDARG_H will be defined. When SM.B builds, the - * definition from SM.A will leak when building without local submodule - * visibility. stdarg.h wouldn't include any of its implementation headers, and - * SM.B wouldn't import any of the stdarg modules, and SM.B's `export *` - * wouldn't export any stdarg interfaces as expected. However, since stdarg.h - * ignores its header guard when building with modules, it all works as - * expected. - * - * When clang modules are not enabled, the header guards can function in the - * normal simple fashion. - */ -#if !defined(__STDARG_H) || __has_feature(modules) || \ - defined(__need___va_list) || defined(__need_va_list) || \ - defined(__need_va_arg) || defined(__need___va_copy) || \ - defined(__need_va_copy) - -#if !defined(__need___va_list) && !defined(__need_va_list) && \ - !defined(__need_va_arg) && !defined(__need___va_copy) && \ - !defined(__need_va_copy) -#define __STDARG_H -#define __need___va_list -#define __need_va_list -#define __need_va_arg -#define __need___va_copy -/* GCC always defines __va_copy, but does not define va_copy unless in c99 mode - * or -ansi is not specified, since it was not part of C90. - */ -#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ - (defined(__cplusplus) && __cplusplus >= 201103L) || \ - !defined(__STRICT_ANSI__) -#define __need_va_copy -#endif -#endif - -#ifdef __need___va_list -#include <__stdarg___gnuc_va_list.h> -#undef __need___va_list -#endif /* defined(__need___va_list) */ - -#ifdef __need_va_list -#include <__stdarg_va_list.h> -#undef __need_va_list -#endif /* defined(__need_va_list) */ - -#ifdef __need_va_arg -#include <__stdarg_va_arg.h> -#undef __need_va_arg -#endif /* defined(__need_va_arg) */ - -#ifdef __need___va_copy -#include <__stdarg___va_copy.h> -#undef __need___va_copy -#endif /* defined(__need___va_copy) */ - -#ifdef __need_va_copy -#include <__stdarg_va_copy.h> -#undef __need_va_copy -#endif /* defined(__need_va_copy) */ - -#endif diff --git a/devel/wasi-libc/files/llvm18/stddef.h b/devel/wasi-libc/files/llvm18/stddef.h deleted file mode 100644 index e0ad7b8d17af..000000000000 --- a/devel/wasi-libc/files/llvm18/stddef.h +++ /dev/null @@ -1,123 +0,0 @@ -/*===---- stddef.h - Basic type definitions --------------------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -/* - * This header is designed to be included multiple times. If any of the __need_ - * macros are defined, then only that subset of interfaces are provided. This - * can be useful for POSIX headers that need to not expose all of stddef.h, but - * need to use some of its interfaces. Otherwise this header provides all of - * the expected interfaces. - * - * When clang modules are enabled, this header is a textual header. It ignores - * its header guard so that multiple submodules can export its interfaces. - * Take module SM with submodules A and B, whose headers both include stddef.h - * When SM.A builds, __STDDEF_H will be defined. When SM.B builds, the - * definition from SM.A will leak when building without local submodule - * visibility. stddef.h wouldn't include any of its implementation headers, and - * SM.B wouldn't import any of the stddef modules, and SM.B's `export *` - * wouldn't export any stddef interfaces as expected. However, since stddef.h - * ignores its header guard when building with modules, it all works as - * expected. - * - * When clang modules are not enabled, the header guards can function in the - * normal simple fashion. - */ -#if !defined(__STDDEF_H) || __has_feature(modules) || \ - (defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ >= 1) || \ - defined(__need_ptrdiff_t) || defined(__need_size_t) || \ - defined(__need_rsize_t) || defined(__need_wchar_t) || \ - defined(__need_NULL) || defined(__need_nullptr_t) || \ - defined(__need_unreachable) || defined(__need_max_align_t) || \ - defined(__need_offsetof) || defined(__need_wint_t) - -#if !defined(__need_ptrdiff_t) && !defined(__need_size_t) && \ - !defined(__need_rsize_t) && !defined(__need_wchar_t) && \ - !defined(__need_NULL) && !defined(__need_nullptr_t) && \ - !defined(__need_unreachable) && !defined(__need_max_align_t) && \ - !defined(__need_offsetof) && !defined(__need_wint_t) -#define __STDDEF_H -#define __need_ptrdiff_t -#define __need_size_t -/* ISO9899:2011 7.20 (C11 Annex K): Define rsize_t if __STDC_WANT_LIB_EXT1__ is - * enabled. */ -#if defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ >= 1 -#define __need_rsize_t -#endif -#define __need_wchar_t -#define __need_NULL -#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L) || \ - defined(__cplusplus) -#define __need_nullptr_t -#endif -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L -#define __need_unreachable -#endif -#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || \ - (defined(__cplusplus) && __cplusplus >= 201103L) -#define __need_max_align_t -#endif -#define __need_offsetof -/* wint_t is provided by <wchar.h> and not <stddef.h>. It's here - * for compatibility, but must be explicitly requested. Therefore - * __need_wint_t is intentionally not defined here. */ -#endif - -#if defined(__need_ptrdiff_t) -#include <__stddef_ptrdiff_t.h> -#undef __need_ptrdiff_t -#endif /* defined(__need_ptrdiff_t) */ - -#if defined(__need_size_t) -#include <__stddef_size_t.h> -#undef __need_size_t -#endif /*defined(__need_size_t) */ - -#if defined(__need_rsize_t) -#include <__stddef_rsize_t.h> -#undef __need_rsize_t -#endif /* defined(__need_rsize_t) */ - -#if defined(__need_wchar_t) -#include <__stddef_wchar_t.h> -#undef __need_wchar_t -#endif /* defined(__need_wchar_t) */ - -#if defined(__need_NULL) -#include <__stddef_null.h> -#undef __need_NULL -#endif /* defined(__need_NULL) */ - -#if defined(__need_nullptr_t) -#include <__stddef_nullptr_t.h> -#undef __need_nullptr_t *** 2333 LINES SKIPPED ***home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69bc1f96.24e1f.d34173e>