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

@@ -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.

undefine-gcc-macros.patch

@@ -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__ \

wasi-libc.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Sep 22 17:06:06 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- 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 <aaronpuchert@alice-dsl.net>
 

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

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: