From b2a58440e1764ed9020836294ea959ed21fe029d903bafa5885d07f247ddc0bf Mon Sep 17 00:00:00 2001 From: William Brown Date: Fri, 22 Sep 2023 23:24:42 +0000 Subject: [PATCH 1/2] Accepting request 1113064 from home:aaronpuchert:llvm-next - Update to version (wasi-sdk-)20. - Rebase workaround-broken-makefile.patch. - Drop obsolete undefine-gcc-macros.patch. (Has been solved upstream in gh#WebAssembly/wasi-libc#379.) - Add ignore-fpclass-macros.patch to ignore __FPCLASS_* macros that are new with Clang 17. OBS-URL: https://build.opensuse.org/request/show/1113064 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/wasi-libc?expand=0&rev=10 --- ignore-fpclass-macros.patch | 13 +++++++++++++ undefine-gcc-macros.patch | 16 ---------------- wasi-libc-19.tar.gz | 3 --- wasi-libc-20.tar.gz | 3 +++ wasi-libc.changes | 10 ++++++++++ wasi-libc.spec | 4 ++-- workaround-broken-makefile.patch | 6 +++--- 7 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 ignore-fpclass-macros.patch delete mode 100644 undefine-gcc-macros.patch delete mode 100644 wasi-libc-19.tar.gz create mode 100644 wasi-libc-20.tar.gz diff --git a/ignore-fpclass-macros.patch b/ignore-fpclass-macros.patch new file mode 100644 index 0000000..f0d3100 --- /dev/null +++ b/ignore-fpclass-macros.patch @@ -0,0 +1,13 @@ +Ignore __FPCLASS_* macros that are new with Clang 17. +diff --git a/Makefile b/Makefile +index f350ecb..981da98 100644 +--- a/Makefile ++++ b/Makefile +@@ -702,6 +702,7 @@ check-symbols: startup_files libc + | sed -e 's/__GNUC_VA_LIST $$/__GNUC_VA_LIST 1/' \ + | grep -v '^#define __\(BOOL\|INT_\(LEAST\|FAST\)\(8\|16\|32\|64\)\|INT\|LONG\|LLONG\|SHRT\)_WIDTH__' \ + | grep -v '^#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_\(1\|2\|4\|8\)' \ ++ | grep -v '^#define __FPCLASS_\(\(NEG\|POS\)\(INF\|NORMAL\|SUBNORMAL\|ZERO\)\|[QS]NAN\)' \ + > "$(SYSROOT_SHARE)/predefined-macros.txt" + + # Check that the computed metadata matches the expected metadata. diff --git a/undefine-gcc-macros.patch b/undefine-gcc-macros.patch deleted file mode 100644 index bd7de60..0000000 --- a/undefine-gcc-macros.patch +++ /dev/null @@ -1,16 +0,0 @@ -Undefine some macros because the build isn't happy about them. -diff --git a/Makefile b/Makefile -index 563f59f..6d478e9 100644 ---- a/Makefile -+++ b/Makefile -@@ -688,6 +688,10 @@ check-symbols: startup_files libc - -U__clang_wide_literal_encoding__ \ - -U__wasm_mutable_globals__ \ - -U__wasm_sign_ext__ \ -+ -U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 \ -+ -U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 \ -+ -U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 \ -+ -U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 \ - -U__GNUC__ \ - -U__GNUC_MINOR__ \ - -U__GNUC_PATCHLEVEL__ \ diff --git a/wasi-libc-19.tar.gz b/wasi-libc-19.tar.gz deleted file mode 100644 index 9e770a0..0000000 --- a/wasi-libc-19.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d251a44bfa978ad625c98bd5770942c5246999b5eeea2f089fec05ba88212ec -size 1311353 diff --git a/wasi-libc-20.tar.gz b/wasi-libc-20.tar.gz new file mode 100644 index 0000000..3187580 --- /dev/null +++ b/wasi-libc-20.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a1c09c8c1da62a1ba214254ff4c9db6b60979c00f648a5eae33831d6ee2840e +size 1311597 diff --git a/wasi-libc.changes b/wasi-libc.changes index ff7b24f..c2cd2c9 100644 --- a/wasi-libc.changes +++ b/wasi-libc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Sep 22 17:06:06 UTC 2023 - Aaron Puchert + +- Update to version (wasi-sdk-)20. +- Rebase workaround-broken-makefile.patch. +- Drop obsolete undefine-gcc-macros.patch. (Has been solved + upstream in gh#WebAssembly/wasi-libc#379.) +- Add ignore-fpclass-macros.patch to ignore __FPCLASS_* macros that + are new with Clang 17. + ------------------------------------------------------------------- Wed Mar 22 22:23:36 UTC 2023 - Aaron Puchert diff --git a/wasi-libc.spec b/wasi-libc.spec index 647f0c5..e5579bc 100644 --- a/wasi-libc.spec +++ b/wasi-libc.spec @@ -17,7 +17,7 @@ Name: wasi-libc -Version: 19 +Version: 20 Release: 0 Summary: WASI libc implementation for WebAssembly # FIXME: Select a correct license from https://github.com/openSUSE/spec-cleaner#spdx-licenses @@ -26,7 +26,7 @@ URL: https://github.com/WebAssembly/wasi-libc Source: https://github.com/WebAssembly/wasi-libc/archive/refs/tags/wasi-sdk-%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: wasi-libc-rpmlintrc Patch1: workaround-broken-makefile.patch -Patch2: undefine-gcc-macros.patch +Patch2: ignore-fpclass-macros.patch BuildRequires: clang > 10 BuildRequires: llvm > 10 BuildArch: noarch diff --git a/workaround-broken-makefile.patch b/workaround-broken-makefile.patch index ad0c130..a168df6 100644 --- a/workaround-broken-makefile.patch +++ b/workaround-broken-makefile.patch @@ -1,11 +1,11 @@ # Workaround as per https://github.com/WebAssembly/wasi-libc/issues/156 diff --git a/Makefile b/Makefile -index 46229f9..563f59f 100644 +index f350ecb..52d9ca6 100644 --- a/Makefile +++ b/Makefile -@@ -706,7 +706,7 @@ check-symbols: startup_files libc +@@ -708,7 +708,7 @@ check-symbols: startup_files libc # This ignores whitespace because on Windows the output has CRLF line endings. - diff -wur "$(CURDIR)/expected/$(TARGET_TRIPLE)" "$(SYSROOT_SHARE)" + diff -wur "expected/$(TARGET_TRIPLE)" "$(SYSROOT_SHARE)" -install: finish +install: From 604f4c221ba806ea0656ebba14361101307e69fa312834760ae90ede0058b164 Mon Sep 17 00:00:00 2001 From: William Brown Date: Mon, 25 Sep 2023 23:11:31 +0000 Subject: [PATCH 2/2] Accepting request 1113536 from home:aaronpuchert:llvm-next - Add change log for new version. OBS-URL: https://build.opensuse.org/request/show/1113536 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/wasi-libc?expand=0&rev=11 --- wasi-libc.changes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wasi-libc.changes b/wasi-libc.changes index c2cd2c9..d38f474 100644 --- a/wasi-libc.changes +++ b/wasi-libc.changes @@ -2,6 +2,10 @@ Fri Sep 22 17:06:06 UTC 2023 - Aaron Puchert - Update to version (wasi-sdk-)20. + * Compatibility with Clang 16. + * Rename triple wasm32-wasi-pthread to wasm32-wasi-threads. + * Implement support for spinlock. + * Improve performance in dlmalloc. - Rebase workaround-broken-makefile.patch. - Drop obsolete undefine-gcc-macros.patch. (Has been solved upstream in gh#WebAssembly/wasi-libc#379.)