some dirs got moved/renamed.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---- a/expected/wasm32-wasi/posix/predefined-macros.txt
-+++ b/expected/wasm32-wasi/posix/predefined-macros.txt
+Index: wasi-libc/expected/wasm32-wasi-threads/predefined-macros.txt
+===================================================================
+--- wasi-libc.orig/expected/wasm32-wasi-threads/predefined-macros.txt
++++ wasi-libc/expected/wasm32-wasi-threads/predefined-macros.txt
@@ -1119,7 +1119,6 @@
#define NAN (0.0f/0.0f)
#define NBBY 8
#define ND_NA_FLAG_OVERRIDE 0x00000020
#define ND_NA_FLAG_ROUTER 0x00000080
#define ND_NA_FLAG_SOLICITED 0x00000040
-@@ -3113,7 +3112,7 @@
+@@ -3112,7 +3111,7 @@
#define and_eq &=
#define asin(x) __tg_real_complex(asin, (x))
#define asinh(x) __tg_real_complex(asinh, (x))
#define atan(x) __tg_real_complex(atan, (x))
#define atan2(x,y) __tg_real_2(atan2, (x), (y))
#define atanh(x) __tg_real_complex(atanh, (x))
---- a/expected/wasm32-wasi/single/predefined-macros.txt
-+++ b/expected/wasm32-wasi/single/predefined-macros.txt
+Index: wasi-libc/expected/wasm32-wasi/predefined-macros.txt
+===================================================================
+--- wasi-libc.orig/expected/wasm32-wasi/predefined-macros.txt
++++ wasi-libc/expected/wasm32-wasi/predefined-macros.txt
@@ -1119,7 +1119,6 @@
#define NAN (0.0f/0.0f)
#define NBBY 8
---- a/Makefile
-+++ b/Makefile
-@@ -294,6 +294,7 @@
+Index: wasi-libc/Makefile
+===================================================================
+--- wasi-libc.orig/Makefile
++++ wasi-libc/Makefile
+@@ -310,6 +310,7 @@ CFLAGS += -Wall -Wextra -Werror \
-Wno-missing-braces \
-Wno-ignored-pragmas \
-Wno-unused-but-set-variable \
---- a/Makefile
-+++ b/Makefile
-@@ -556,6 +556,8 @@
+Index: wasi-libc/Makefile
+===================================================================
+--- wasi-libc.orig/Makefile
++++ wasi-libc/Makefile
+@@ -577,6 +577,8 @@ include_dirs:
# Remove selected header files.
$(RM) $(patsubst %,$(SYSROOT_INC)/%,$(MUSL_OMIT_HEADERS))
startup_files: include_dirs
#
# Build the startup files.
-@@ -566,6 +568,8 @@
+@@ -587,6 +589,8 @@ startup_files: include_dirs
mkdir -p "$(SYSROOT_LIB)" && \
mv *.o "$(SYSROOT_LIB)"
libc: include_dirs \
$(SYSROOT_LIB)/libc.a \
$(SYSROOT_LIB)/libc-printscan-long-double.a \
-@@ -575,6 +579,8 @@
+@@ -596,6 +600,8 @@ libc: include_dirs \
$(SYSROOT_LIB)/libwasi-emulated-getpid.a \
$(SYSROOT_LIB)/libwasi-emulated-signal.a
finish: startup_files libc
#
# Create empty placeholder libraries.
-@@ -586,6 +592,7 @@
+@@ -607,6 +613,7 @@ finish: startup_files libc
#
# The build succeeded! The generated sysroot is in $(SYSROOT).
#
# The check for defined and undefined symbols expects there to be a heap
# alloctor (providing malloc, calloc, free, etc). Skip this step if the build
-@@ -687,5 +694,6 @@
+@@ -712,5 +719,6 @@ install: finish
clean:
$(RM) -r "$(OBJDIR)"
$(RM) -r "$(SYSROOT)"