]> git.proxmox.com Git - wasi-libc.git/blobdiff - Makefile
bump version to 0.0~git20230113.4362b18-1~bpo12+pve1
[wasi-libc.git] / Makefile
index ee8e8e8437e912b5a7fd3a22915c6bc175d06a88..57975a799d144c2930311a84524b2c5f71a73c66 100644 (file)
--- a/Makefile
+++ b/Makefile
-# These variables are specifically meant to be overridable via
-# the make command-line.
-WASM_CC ?= clang
-WASM_NM ?= $(patsubst %clang,%llvm-nm,$(WASM_CC))
-WASM_AR ?= $(patsubst %clang,%llvm-ar,$(WASM_CC))
-WASM_CFLAGS ?= -O2
+# These variables are specifically meant to be overridable via the make
+# command-line.
+# ?= doesn't work for CC and AR because make has a default value for them.
+ifeq ($(origin CC), default)
+CC := clang
+endif
+NM ?= $(patsubst %clang,%llvm-nm,$(filter-out ccache sccache,$(CC)))
+ifeq ($(origin AR), default)
+AR = $(patsubst %clang,%llvm-ar,$(filter-out ccache sccache,$(CC)))
+endif
+EXTRA_CFLAGS ?= -O2 -DNDEBUG
 # The directory where we build the sysroot.
 SYSROOT ?= $(CURDIR)/sysroot
 # A directory to install to for "make install".
 INSTALL_DIR ?= /usr/local
-# single or posix
-THREAD_MODEL = single
+# single or posix; note that pthread support is still a work-in-progress.
+THREAD_MODEL ?= single
+# dlmalloc or none
+MALLOC_IMPL ?= dlmalloc
 # yes or no
-BUILD_DLMALLOC = yes
-BUILD_LIBC_BOTTOM_HALF = yes
-BUILD_LIBC_TOP_HALF = yes
-# The directory where we're store intermediate artifacts.
-OBJDIR = $(CURDIR)/build
+BUILD_LIBC_TOP_HALF ?= yes
+# The directory where we will store intermediate artifacts.
+OBJDIR ?= $(CURDIR)/build/$(TARGET_TRIPLE)
 
-# Check dependencies.
-ifeq ($(BUILD_LIBC_TOP_HALF),yes)
-ifneq ($(BUILD_LIBC_BOTTOM_HALF),yes)
-$(error BUILD_LIBC_TOP_HALF=yes depends on BUILD_LIBC_BOTTOM_HALF=yes)
-endif
-endif
-ifeq ($(BUILD_LIBC_BOTTOM_HALF),yes)
-ifneq ($(BUILD_DLMALLOC),yes)
-$(error BUILD_LIBC_BOTTOM_HALF=yes depends on BUILD_DLMALLOC=yes)
-endif
+# When the length is no larger than this threshold, we consider the
+# overhead of bulk memory opcodes to outweigh the performance benefit,
+# and fall back to the original musl implementation. See
+# https://github.com/WebAssembly/wasi-libc/pull/263 for relevant
+# discussion
+BULK_MEMORY_THRESHOLD ?= 32
+
+# Variables from this point on are not meant to be overridable via the
+# make command-line.
+
+# Set the default WASI target triple.
+TARGET_TRIPLE = wasm32-wasi
+
+# Threaded version necessitates a different traget, as objects from different
+# targets can't be mixed together while linking.
+ifeq ($(THREAD_MODEL), posix)
+TARGET_TRIPLE = wasm32-wasi-threads
 endif
 
-# These variables describe the locations of various files and
-# directories in the source tree.
-BASICS_DIR = $(CURDIR)/basics
-BASICS_INC = $(BASICS_DIR)/include
-BASICS_CRT_SOURCES = $(wildcard $(BASICS_DIR)/crt/*.c)
-BASICS_SOURCES = $(wildcard $(BASICS_DIR)/sources/*.c)
+# These variables describe the locations of various files and directories in
+# the source tree.
 DLMALLOC_DIR = $(CURDIR)/dlmalloc
 DLMALLOC_SRC_DIR = $(DLMALLOC_DIR)/src
 DLMALLOC_SOURCES = $(DLMALLOC_SRC_DIR)/dlmalloc.c
 DLMALLOC_INC = $(DLMALLOC_DIR)/include
+EMMALLOC_DIR = $(CURDIR)/emmalloc
+EMMALLOC_SOURCES = $(EMMALLOC_DIR)/emmalloc.c
 LIBC_BOTTOM_HALF_DIR = $(CURDIR)/libc-bottom-half
 LIBC_BOTTOM_HALF_CLOUDLIBC_SRC = $(LIBC_BOTTOM_HALF_DIR)/cloudlibc/src
 LIBC_BOTTOM_HALF_CLOUDLIBC_SRC_INC = $(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC)/include
 LIBC_BOTTOM_HALF_HEADERS_PUBLIC = $(LIBC_BOTTOM_HALF_DIR)/headers/public
 LIBC_BOTTOM_HALF_HEADERS_PRIVATE = $(LIBC_BOTTOM_HALF_DIR)/headers/private
-LIBC_BOTTOM_HALF_LIBPREOPEN_DIR = $(LIBC_BOTTOM_HALF_DIR)/libpreopen
-LIBC_BOTTOM_HALF_LIBPREOPEN_LIB = $(LIBC_BOTTOM_HALF_LIBPREOPEN_DIR)/lib
-LIBC_BOTTOM_HALF_LIBPREOPEN_INC = $(LIBC_BOTTOM_HALF_LIBPREOPEN_DIR)/include
 LIBC_BOTTOM_HALF_SOURCES = $(LIBC_BOTTOM_HALF_DIR)/sources
 LIBC_BOTTOM_HALF_ALL_SOURCES = \
+    $(sort \
     $(shell find $(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC) -name \*.c) \
-    $(LIBC_BOTTOM_HALF_LIBPREOPEN_LIB)/po_libc_wrappers.c \
-    $(shell find $(LIBC_BOTTOM_HALF_SOURCES) -name \*.c)
+    $(shell find $(LIBC_BOTTOM_HALF_SOURCES) -name \*.c))
+
+# FIXME(https://reviews.llvm.org/D85567) - due to a bug in LLD the weak
+# references to a function defined in `chdir.c` only work if `chdir.c` is at the
+# end of the archive, but once that LLD review lands and propagates into LLVM
+# then we don't have to do this.
+LIBC_BOTTOM_HALF_ALL_SOURCES := $(filter-out $(LIBC_BOTTOM_HALF_SOURCES)/chdir.c,$(LIBC_BOTTOM_HALF_ALL_SOURCES))
+LIBC_BOTTOM_HALF_ALL_SOURCES := $(LIBC_BOTTOM_HALF_ALL_SOURCES) $(LIBC_BOTTOM_HALF_SOURCES)/chdir.c
+
 LIBWASI_EMULATED_MMAN_SOURCES = \
-    $(shell find $(LIBC_BOTTOM_HALF_DIR)/mman -name \*.c)
+    $(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/mman -name \*.c))
+LIBWASI_EMULATED_PROCESS_CLOCKS_SOURCES = \
+    $(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/clocks -name \*.c))
+LIBWASI_EMULATED_GETPID_SOURCES = \
+    $(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/getpid -name \*.c))
+LIBWASI_EMULATED_SIGNAL_SOURCES = \
+    $(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/signal -name \*.c))
+LIBWASI_EMULATED_SIGNAL_MUSL_SOURCES = \
+    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/signal/psignal.c \
+    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/string/strsignal.c
 LIBC_BOTTOM_HALF_CRT_SOURCES = $(wildcard $(LIBC_BOTTOM_HALF_DIR)/crt/*.c)
 LIBC_TOP_HALF_DIR = $(CURDIR)/libc-top-half
 LIBC_TOP_HALF_MUSL_DIR = $(LIBC_TOP_HALF_DIR)/musl
 LIBC_TOP_HALF_MUSL_SRC_DIR = $(LIBC_TOP_HALF_MUSL_DIR)/src
 LIBC_TOP_HALF_MUSL_INC = $(LIBC_TOP_HALF_MUSL_DIR)/include
 LIBC_TOP_HALF_MUSL_SOURCES = \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/a64l.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/basename.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/dirname.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/ffs.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/ffsl.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/ffsll.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/fmtmsg.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/getdomainname.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/gethostid.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/getopt.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/getopt_long.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/getsubopt.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/uname.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/misc/nftw.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/errno/strerror.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/network/htonl.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/network/htons.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/network/ntohl.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/network/ntohs.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/network/inet_ntop.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/network/inet_pton.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/network/inet_aton.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/network/in6addr_any.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/network/in6addr_loopback.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/fenv/fenv.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/fenv/fesetround.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/fenv/feupdateenv.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/fenv/fesetexceptflag.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/fenv/fegetexceptflag.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/fenv/feholdexcept.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/exit/exit.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/exit/atexit.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/exit/assert.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/exit/quick_exit.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/exit/at_quick_exit.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/strftime.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/asctime.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/asctime_r.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/ctime.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/ctime_r.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/wcsftime.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/strptime.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/difftime.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/timegm.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/ftime.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/gmtime.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/gmtime_r.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/timespec_get.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/getdate.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/localtime.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/localtime_r.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/mktime.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/__tm_to_secs.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/__month_to_secs.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/__secs_to_tm.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/__year_to_secs.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/time/__tz.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/fcntl/creat.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/dirent/alphasort.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/dirent/versionsort.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/env/clearenv.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/env/getenv.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/env/putenv.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/env/setenv.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/env/unsetenv.c \
-    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/unistd/posix_close.c \
+    $(addprefix $(LIBC_TOP_HALF_MUSL_SRC_DIR)/, \
+        misc/a64l.c \
+        misc/basename.c \
+        misc/dirname.c \
+        misc/ffs.c \
+        misc/ffsl.c \
+        misc/ffsll.c \
+        misc/fmtmsg.c \
+        misc/getdomainname.c \
+        misc/gethostid.c \
+        misc/getopt.c \
+        misc/getopt_long.c \
+        misc/getsubopt.c \
+        misc/uname.c \
+        misc/nftw.c \
+        errno/strerror.c \
+        network/htonl.c \
+        network/htons.c \
+        network/ntohl.c \
+        network/ntohs.c \
+        network/inet_ntop.c \
+        network/inet_pton.c \
+        network/inet_aton.c \
+        network/in6addr_any.c \
+        network/in6addr_loopback.c \
+        fenv/fenv.c \
+        fenv/fesetround.c \
+        fenv/feupdateenv.c \
+        fenv/fesetexceptflag.c \
+        fenv/fegetexceptflag.c \
+        fenv/feholdexcept.c \
+        exit/exit.c \
+        exit/atexit.c \
+        exit/assert.c \
+        exit/quick_exit.c \
+        exit/at_quick_exit.c \
+        time/strftime.c \
+        time/asctime.c \
+        time/asctime_r.c \
+        time/ctime.c \
+        time/ctime_r.c \
+        time/wcsftime.c \
+        time/strptime.c \
+        time/difftime.c \
+        time/timegm.c \
+        time/ftime.c \
+        time/gmtime.c \
+        time/gmtime_r.c \
+        time/timespec_get.c \
+        time/getdate.c \
+        time/localtime.c \
+        time/localtime_r.c \
+        time/mktime.c \
+        time/__tm_to_secs.c \
+        time/__month_to_secs.c \
+        time/__secs_to_tm.c \
+        time/__year_to_secs.c \
+        time/__tz.c \
+        fcntl/creat.c \
+        dirent/alphasort.c \
+        dirent/versionsort.c \
+        env/__stack_chk_fail.c \
+        env/clearenv.c \
+        env/getenv.c \
+        env/putenv.c \
+        env/setenv.c \
+        env/unsetenv.c \
+        unistd/posix_close.c \
+        stat/futimesat.c \
+        legacy/getpagesize.c \
+        thread/thrd_sleep.c \
+    ) \
     $(filter-out %/procfdname.c %/syscall.c %/syscall_ret.c %/vdso.c %/version.c, \
                  $(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/internal/*.c)) \
     $(filter-out %/flockfile.c %/funlockfile.c %/__lockfile.c %/ftrylockfile.c \
@@ -155,12 +185,95 @@ LIBC_TOP_HALF_MUSL_SOURCES = \
                  %/nearbyintf.c %/nearbyint.c \
                  %/sqrtf.c %/sqrt.c \
                  %/fabsf.c %/fabs.c \
-                 %/copysignf.c %/copysign.c, \
+                 %/copysignf.c %/copysign.c \
+                 %/fminf.c %/fmaxf.c \
+                 %/fmin.c %/fmax.c, \
                  $(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/math/*.c)) \
-    $(filter-out %/crealf.c %/creal.c \
-                 %/cimagf.c %/cimag.c, \
+    $(filter-out %/crealf.c %/creal.c %creall.c \
+                 %/cimagf.c %/cimag.c %cimagl.c, \
                  $(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/complex/*.c)) \
     $(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/crypt/*.c)
+
+ifeq ($(THREAD_MODEL), posix)
+LIBC_TOP_HALF_MUSL_SOURCES += \
+    $(addprefix $(LIBC_TOP_HALF_MUSL_SRC_DIR)/, \
+        env/__init_tls.c \
+        stdio/__lockfile.c \
+        stdio/flockfile.c \
+        stdio/ftrylockfile.c \
+        stdio/funlockfile.c \
+        thread/__lock.c \
+        thread/__wait.c \
+        thread/__timedwait.c \
+        thread/default_attr.c \
+        thread/pthread_attr_destroy.c \
+        thread/pthread_attr_get.c \
+        thread/pthread_attr_init.c \
+        thread/pthread_attr_setstack.c \
+        thread/pthread_attr_setdetachstate.c \
+        thread/pthread_attr_setstacksize.c \
+        thread/pthread_barrier_destroy.c \
+        thread/pthread_barrier_init.c \
+        thread/pthread_barrier_wait.c \
+        thread/pthread_cleanup_push.c \
+        thread/pthread_cond_broadcast.c \
+        thread/pthread_cond_destroy.c \
+        thread/pthread_cond_init.c \
+        thread/pthread_cond_signal.c \
+        thread/pthread_cond_timedwait.c \
+        thread/pthread_cond_wait.c \
+        thread/pthread_condattr_destroy.c \
+        thread/pthread_condattr_init.c \
+        thread/pthread_condattr_setclock.c \
+        thread/pthread_condattr_setpshared.c \
+        thread/pthread_create.c \
+        thread/pthread_detach.c \
+        thread/pthread_equal.c \
+        thread/pthread_getspecific.c \
+        thread/pthread_join.c \
+        thread/pthread_key_create.c \
+        thread/pthread_mutex_consistent.c \
+        thread/pthread_mutex_destroy.c \
+        thread/pthread_mutex_init.c \
+        thread/pthread_mutex_getprioceiling.c \
+        thread/pthread_mutex_lock.c \
+        thread/pthread_mutex_timedlock.c \
+        thread/pthread_mutex_trylock.c \
+        thread/pthread_mutex_unlock.c \
+        thread/pthread_mutexattr_destroy.c \
+        thread/pthread_mutexattr_init.c \
+        thread/pthread_mutexattr_setprotocol.c \
+        thread/pthread_mutexattr_setpshared.c \
+        thread/pthread_mutexattr_setrobust.c \
+        thread/pthread_mutexattr_settype.c \
+        thread/pthread_once.c \
+        thread/pthread_rwlock_destroy.c \
+        thread/pthread_rwlock_init.c \
+        thread/pthread_rwlock_rdlock.c \
+        thread/pthread_rwlock_timedrdlock.c \
+        thread/pthread_rwlock_timedwrlock.c \
+        thread/pthread_rwlock_tryrdlock.c \
+        thread/pthread_rwlock_trywrlock.c \
+        thread/pthread_rwlock_unlock.c \
+        thread/pthread_rwlock_wrlock.c \
+        thread/pthread_rwlockattr_destroy.c \
+        thread/pthread_rwlockattr_init.c \
+        thread/pthread_rwlockattr_setpshared.c \
+        thread/pthread_setcancelstate.c \
+        thread/pthread_setspecific.c \
+        thread/pthread_self.c \
+        thread/pthread_testcancel.c \
+        thread/sem_destroy.c \
+        thread/sem_getvalue.c \
+        thread/sem_init.c \
+        thread/sem_post.c \
+        thread/sem_timedwait.c \
+        thread/sem_trywait.c \
+        thread/sem_wait.c \
+        thread/wasm32/wasi_thread_start.s \
+    )
+endif
+
 MUSL_PRINTSCAN_SOURCES = \
     $(LIBC_TOP_HALF_MUSL_SRC_DIR)/internal/floatscan.c \
     $(LIBC_TOP_HALF_MUSL_SRC_DIR)/stdio/vfprintf.c \
@@ -168,89 +281,124 @@ MUSL_PRINTSCAN_SOURCES = \
     $(LIBC_TOP_HALF_MUSL_SRC_DIR)/stdio/vfscanf.c \
     $(LIBC_TOP_HALF_MUSL_SRC_DIR)/stdlib/strtod.c \
     $(LIBC_TOP_HALF_MUSL_SRC_DIR)/stdlib/wcstod.c
+BULK_MEMORY_SOURCES = \
+    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/string/memcpy.c \
+    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/string/memmove.c \
+    $(LIBC_TOP_HALF_MUSL_SRC_DIR)/string/memset.c
 LIBC_TOP_HALF_HEADERS_PRIVATE = $(LIBC_TOP_HALF_DIR)/headers/private
 LIBC_TOP_HALF_SOURCES = $(LIBC_TOP_HALF_DIR)/sources
 LIBC_TOP_HALF_ALL_SOURCES = \
     $(LIBC_TOP_HALF_MUSL_SOURCES) \
-    $(shell find $(LIBC_TOP_HALF_SOURCES) -name \*.c)
-
-# Set the target variables. Multiarch triples notably omit the vendor
-# field, which happens to be what we do for the main target triple too.
-TARGET_TRIPLE = wasm32-wasi
-MULTIARCH_TRIPLE = wasm32-wasi
-
-# These variables describe the locations of various files and
-# directories in the generated sysroot tree.
-SYSROOT_LIB = $(SYSROOT)/lib/$(MULTIARCH_TRIPLE)
-SYSROOT_INC = $(SYSROOT)/include
-SYSROOT_SHARE = $(SYSROOT)/share/$(MULTIARCH_TRIPLE)
+    $(sort $(shell find $(LIBC_TOP_HALF_SOURCES) -name \*.[cs]))
 
+# Add any extra flags
+CFLAGS = $(EXTRA_CFLAGS)
 # Set the target.
-override WASM_CFLAGS += --target=$(TARGET_TRIPLE)
+CFLAGS += --target=$(TARGET_TRIPLE)
+ASMFLAGS += --target=$(TARGET_TRIPLE)
 # WebAssembly floating-point match doesn't trap.
 # TODO: Add -fno-signaling-nans when the compiler supports it.
-override WASM_CFLAGS += -fno-trapping-math
+CFLAGS += -fno-trapping-math
+# Add all warnings, but disable a few which occur in third-party code.
+CFLAGS += -Wall -Wextra -Werror \
+  -Wno-null-pointer-arithmetic \
+  -Wno-unused-parameter \
+  -Wno-sign-compare \
+  -Wno-unused-variable \
+  -Wno-unused-function \
+  -Wno-ignored-attributes \
+  -Wno-missing-braces \
+  -Wno-ignored-pragmas \
+  -Wno-unused-but-set-variable \
+  -Wno-unknown-warning-option
 
 # Configure support for threads.
 ifeq ($(THREAD_MODEL), single)
-override WASM_CFLAGS += -mthread-model single
+CFLAGS += -mthread-model single
 endif
 ifeq ($(THREAD_MODEL), posix)
-override WASM_CFLAGS += -mthread-model posix -pthread
-endif
+# Specify the tls-model until LLVM 15 is released (which should contain
+# https://reviews.llvm.org/D130053).
+CFLAGS += -mthread-model posix -pthread -ftls-model=local-exec
 
-# Set the sysroot.
-override WASM_CFLAGS += --sysroot="$(SYSROOT)"
+# Include cloudlib's directory to access the structure definition of clockid_t
+CFLAGS += -I$(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC)
+endif
 
+# Expose the public headers to the implementation. We use `-isystem` for
+# purpose for two reasons:
+#
+# 1. It only does `<...>` not `"...."` lookup. We are making a libc,
+#    which is a system library, so all public headers should be
+#    accessible via `<...>` and never also need `"..."`. `-isystem` main
+#    purpose is to only effect `<...>` lookup.
+#
+# 2. The `-I` for private headers added for specific C files below
+#    should come earlier in the search path, so they can "override"
+#    and/or `#include_next` the public headers. `-isystem` (like
+#    `-idirafter`) comes later in the search path than `-I`.
+CFLAGS += -isystem "$(SYSROOT_INC)"
+
+# These variables describe the locations of various files and directories in
+# the build tree.
 objs = $(patsubst $(CURDIR)/%.c,$(OBJDIR)/%.o,$(1))
-override BASICS_OBJS = $(call objs,$(BASICS_SOURCES))
-override DLMALLOC_OBJS = $(call objs,$(DLMALLOC_SOURCES))
-override LIBC_BOTTOM_HALF_ALL_OBJS = $(call objs,$(LIBC_BOTTOM_HALF_ALL_SOURCES))
-override LIBC_TOP_HALF_ALL_OBJS = $(call objs,$(LIBC_TOP_HALF_ALL_SOURCES))
-override LIBC_OBJS := $(BASICS_OBJS)
-ifeq ($(BUILD_DLMALLOC),yes)
-override LIBC_OBJS += $(DLMALLOC_OBJS)
+asmobjs = $(patsubst $(CURDIR)/%.s,$(OBJDIR)/%.o,$(1))
+DLMALLOC_OBJS = $(call objs,$(DLMALLOC_SOURCES))
+EMMALLOC_OBJS = $(call objs,$(EMMALLOC_SOURCES))
+LIBC_BOTTOM_HALF_ALL_OBJS = $(call objs,$(LIBC_BOTTOM_HALF_ALL_SOURCES))
+LIBC_TOP_HALF_ALL_OBJS = $(call asmobjs,$(call objs,$(LIBC_TOP_HALF_ALL_SOURCES)))
+ifeq ($(MALLOC_IMPL),dlmalloc)
+LIBC_OBJS += $(DLMALLOC_OBJS)
+else ifeq ($(MALLOC_IMPL),emmalloc)
+LIBC_OBJS += $(EMMALLOC_OBJS)
+else ifeq ($(MALLOC_IMPL),none)
+# No object files to add.
+else
+$(error unknown malloc implementation $(MALLOC_IMPL))
 endif
-ifeq ($(BUILD_LIBC_BOTTOM_HALF),yes)
-# Override basics' string.o with libc-bottom-half's.
-override LIBC_OBJS := $(filter-out %/string.o,$(LIBC_OBJS))
 # Add libc-bottom-half's objects.
-override LIBC_OBJS += $(LIBC_BOTTOM_HALF_ALL_OBJS)
-endif
+LIBC_OBJS += $(LIBC_BOTTOM_HALF_ALL_OBJS)
 ifeq ($(BUILD_LIBC_TOP_HALF),yes)
-# Override libc-bottom-half's string.o with libc-top-half's.
-override LIBC_OBJS := $(filter-out %/string.o,$(LIBC_OBJS))
-# Override libc-bottom-half's qsort.o with libc-top-half's.
-override LIBC_OBJS := $(filter-out %/qsort.o,$(LIBC_OBJS))
 # libc-top-half is musl.
-override LIBC_OBJS += $(LIBC_TOP_HALF_ALL_OBJS)
+LIBC_OBJS += $(LIBC_TOP_HALF_ALL_OBJS)
 endif
-override MUSL_PRINTSCAN_OBJS = $(call objs,$(MUSL_PRINTSCAN_SOURCES))
-override MUSL_PRINTSCAN_LONG_DOUBLE_OBJS = $(patsubst %.o,%.long-double.o,$(MUSL_PRINTSCAN_OBJS))
-override MUSL_PRINTSCAN_NO_FLOATING_POINT_OBJS = $(patsubst %.o,%.no-floating-point.o,$(MUSL_PRINTSCAN_OBJS))
-override LIBWASI_EMULATED_MMAN_OBJS = $(call objs,$(LIBWASI_EMULATED_MMAN_SOURCES))
+MUSL_PRINTSCAN_OBJS = $(call objs,$(MUSL_PRINTSCAN_SOURCES))
+MUSL_PRINTSCAN_LONG_DOUBLE_OBJS = $(patsubst %.o,%.long-double.o,$(MUSL_PRINTSCAN_OBJS))
+MUSL_PRINTSCAN_NO_FLOATING_POINT_OBJS = $(patsubst %.o,%.no-floating-point.o,$(MUSL_PRINTSCAN_OBJS))
+BULK_MEMORY_OBJS = $(call objs,$(BULK_MEMORY_SOURCES))
+LIBWASI_EMULATED_MMAN_OBJS = $(call objs,$(LIBWASI_EMULATED_MMAN_SOURCES))
+LIBWASI_EMULATED_PROCESS_CLOCKS_OBJS = $(call objs,$(LIBWASI_EMULATED_PROCESS_CLOCKS_SOURCES))
+LIBWASI_EMULATED_GETPID_OBJS = $(call objs,$(LIBWASI_EMULATED_GETPID_SOURCES))
+LIBWASI_EMULATED_SIGNAL_OBJS = $(call objs,$(LIBWASI_EMULATED_SIGNAL_SOURCES))
+LIBWASI_EMULATED_SIGNAL_MUSL_OBJS = $(call objs,$(LIBWASI_EMULATED_SIGNAL_MUSL_SOURCES))
+
+# These variables describe the locations of various files and
+# directories in the generated sysroot tree.
+SYSROOT_LIB := $(SYSROOT)/lib/$(TARGET_TRIPLE)
+SYSROOT_INC = $(SYSROOT)/include
+SYSROOT_SHARE = $(SYSROOT)/share/$(TARGET_TRIPLE)
 
 # Files from musl's include directory that we don't want to install in the
 # sysroot's include directory.
-override MUSL_OMIT_HEADERS :=
+MUSL_OMIT_HEADERS :=
 
 # Remove files which aren't headers (we generate alltypes.h below).
-override MUSL_OMIT_HEADERS += \
+MUSL_OMIT_HEADERS += \
     "bits/syscall.h.in" \
     "bits/alltypes.h.in" \
     "alltypes.h.in"
 
 # Use the compiler's version of these headers.
-override MUSL_OMIT_HEADERS += \
+MUSL_OMIT_HEADERS += \
     "stdarg.h" \
     "stddef.h"
 
 # Use the WASI errno definitions.
-override MUSL_OMIT_HEADERS += \
+MUSL_OMIT_HEADERS += \
     "bits/errno.h"
 
 # Remove headers that aren't supported yet or that aren't relevant for WASI.
-override MUSL_OMIT_HEADERS += \
+MUSL_OMIT_HEADERS += \
     "sys/procfs.h" \
     "sys/user.h" \
     "sys/kd.h" "sys/vt.h" "sys/soundcard.h" "sys/sem.h" \
@@ -305,14 +453,17 @@ override MUSL_OMIT_HEADERS += \
     "net/route.h" \
     "netinet/if_ether.h" \
     "netinet/ether.h" \
-    "sys/timerfd.h"
+    "sys/timerfd.h" \
+    "libintl.h" \
+    "sys/sysmacros.h" \
+    "aio.h"
 
 ifeq ($(THREAD_MODEL), single)
 # Remove headers not supported in single-threaded mode.
-override MUSL_OMIT_HEADERS += "aio.h" "pthread.h"
+MUSL_OMIT_HEADERS += "pthread.h"
 endif
 
-default: check
+default: finish
 
 $(SYSROOT_LIB)/libc.a: $(LIBC_OBJS)
 
@@ -322,50 +473,71 @@ $(SYSROOT_LIB)/libc-printscan-no-floating-point.a: $(MUSL_PRINTSCAN_NO_FLOATING_
 
 $(SYSROOT_LIB)/libwasi-emulated-mman.a: $(LIBWASI_EMULATED_MMAN_OBJS)
 
+$(SYSROOT_LIB)/libwasi-emulated-process-clocks.a: $(LIBWASI_EMULATED_PROCESS_CLOCKS_OBJS)
+
+$(SYSROOT_LIB)/libwasi-emulated-getpid.a: $(LIBWASI_EMULATED_GETPID_OBJS)
+
+$(SYSROOT_LIB)/libwasi-emulated-signal.a: $(LIBWASI_EMULATED_SIGNAL_OBJS) $(LIBWASI_EMULATED_SIGNAL_MUSL_OBJS)
+
 %.a:
        @mkdir -p "$(@D)"
        # On Windows, the commandline for the ar invocation got too long, so it needs to be split up.
-       $(WASM_AR) crs $@ $(wordlist 1, 199, $^)
-       $(WASM_AR) crs $@ $(wordlist 200, 399, $^)
-       $(WASM_AR) crs $@ $(wordlist 400, 599, $^)
-       $(WASM_AR) crs $@ $(wordlist 600, 799, $^)
+       $(AR) crs $@ $(wordlist 1, 199, $^)
+       $(AR) crs $@ $(wordlist 200, 399, $^)
+       $(AR) crs $@ $(wordlist 400, 599, $^)
+       $(AR) crs $@ $(wordlist 600, 799, $^)
        # This might eventually overflow again, but at least it'll do so in a loud way instead of
        # silently dropping the tail.
-       $(WASM_AR) crs $@ $(wordlist 800, 100000, $^)
+       $(AR) crs $@ $(wordlist 800, 100000, $^)
 
-$(MUSL_PRINTSCAN_OBJS): override WASM_CFLAGS += \
+$(MUSL_PRINTSCAN_OBJS): CFLAGS += \
            -D__wasilibc_printscan_no_long_double \
            -D__wasilibc_printscan_full_support_option="\"add -lc-printscan-long-double to the link command\""
 
-$(MUSL_PRINTSCAN_NO_FLOATING_POINT_OBJS): override WASM_CFLAGS += \
+$(MUSL_PRINTSCAN_NO_FLOATING_POINT_OBJS): CFLAGS += \
            -D__wasilibc_printscan_no_floating_point \
            -D__wasilibc_printscan_floating_point_support_option="\"remove -lc-printscan-no-floating-point from the link command\""
 
+# TODO: apply -mbulk-memory globally, once
+# https://github.com/llvm/llvm-project/issues/52618 is resolved
+$(BULK_MEMORY_OBJS): CFLAGS += \
+        -mbulk-memory
+
+$(BULK_MEMORY_OBJS): CFLAGS += \
+        -DBULK_MEMORY_THRESHOLD=$(BULK_MEMORY_THRESHOLD)
+
+$(LIBWASI_EMULATED_SIGNAL_MUSL_OBJS): CFLAGS += \
+           -D_WASI_EMULATED_SIGNAL
+
 $(OBJDIR)/%.long-double.o: $(CURDIR)/%.c include_dirs
        @mkdir -p "$(@D)"
-       "$(WASM_CC)" $(WASM_CFLAGS) -MD -MP -o $@ -c $<
+       $(CC) $(CFLAGS) -MD -MP -o $@ -c $<
 
 $(OBJDIR)/%.no-floating-point.o: $(CURDIR)/%.c include_dirs
        @mkdir -p "$(@D)"
-       "$(WASM_CC)" $(WASM_CFLAGS) -MD -MP -o $@ -c $<
+       $(CC) $(CFLAGS) -MD -MP -o $@ -c $<
 
 $(OBJDIR)/%.o: $(CURDIR)/%.c include_dirs
        @mkdir -p "$(@D)"
-       "$(WASM_CC)" $(WASM_CFLAGS) -MD -MP -o $@ -c $<
+       $(CC) $(CFLAGS) -MD -MP -o $@ -c $<
+
+$(OBJDIR)/%.o: $(CURDIR)/%.s include_dirs
+       @mkdir -p "$(@D)"
+       $(CC) $(ASMFLAGS) -o $@ -c $<
 
 -include $(shell find $(OBJDIR) -name \*.d)
 
-$(DLMALLOC_OBJS): override WASM_CFLAGS += \
+$(DLMALLOC_OBJS): CFLAGS += \
     -I$(DLMALLOC_INC)
 
-startup_files $(LIBC_BOTTOM_HALF_ALL_OBJS): override WASM_CFLAGS += \
+startup_files $(LIBC_BOTTOM_HALF_ALL_OBJS): CFLAGS += \
     -I$(LIBC_BOTTOM_HALF_HEADERS_PRIVATE) \
     -I$(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC_INC) \
     -I$(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC) \
-    -I$(LIBC_BOTTOM_HALF_LIBPREOPEN_LIB) \
-    -I$(LIBC_BOTTOM_HALF_LIBPREOPEN_INC)
+    -I$(LIBC_TOP_HALF_MUSL_SRC_DIR)/include \
+    -I$(LIBC_TOP_HALF_MUSL_SRC_DIR)/internal
 
-$(LIBC_TOP_HALF_ALL_OBJS) $(MUSL_PRINTSCAN_LONG_DOUBLE_OBJS) $(MUSL_PRINTSCAN_NO_FLOATING_POINT_OBJS): override WASM_CFLAGS += \
+$(LIBC_TOP_HALF_ALL_OBJS) $(MUSL_PRINTSCAN_LONG_DOUBLE_OBJS) $(MUSL_PRINTSCAN_NO_FLOATING_POINT_OBJS) $(LIBWASI_EMULATED_SIGNAL_MUSL_OBJS): CFLAGS += \
     -I$(LIBC_TOP_HALF_MUSL_SRC_DIR)/include \
     -I$(LIBC_TOP_HALF_MUSL_SRC_DIR)/internal \
     -I$(LIBC_TOP_HALF_MUSL_DIR)/arch/wasm32 \
@@ -379,14 +551,14 @@ $(LIBC_TOP_HALF_ALL_OBJS) $(MUSL_PRINTSCAN_LONG_DOUBLE_OBJS) $(MUSL_PRINTSCAN_NO
     -Wno-dangling-else \
     -Wno-unknown-pragmas
 
-include_dirs:
-       $(RM) -r "$(SYSROOT)"
+$(LIBWASI_EMULATED_PROCESS_CLOCKS_OBJS): CFLAGS += \
+    -I$(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC)
 
+include_dirs:
        #
        # Install the include files.
        #
        mkdir -p "$(SYSROOT_INC)"
-       cp -r "$(BASICS_INC)" "$(SYSROOT)"
        cp -r "$(LIBC_BOTTOM_HALF_HEADERS_PUBLIC)"/* "$(SYSROOT_INC)"
 
        # Generate musl's bits/alltypes.h header.
@@ -405,19 +577,13 @@ include_dirs:
        # Remove selected header files.
        $(RM) $(patsubst %,$(SYSROOT_INC)/%,$(MUSL_OMIT_HEADERS))
 
-ifeq ($(BUILD_LIBC_BOTTOM_HALF),no)
-override CRT_SOURCES = $(BASICS_CRT_SOURCES)
-else
-override CRT_SOURCES = $(LIBC_BOTTOM_HALF_CRT_SOURCES)
-endif
-
 startup_files: include_dirs
        #
        # Build the startup files.
        #
        @mkdir -p "$(OBJDIR)"
        cd "$(OBJDIR)" && \
-       "$(WASM_CC)" $(WASM_CFLAGS) -c $(CRT_SOURCES) -MD -MP && \
+       $(CC) $(CFLAGS) -c $(LIBC_BOTTOM_HALF_CRT_SOURCES) -MD -MP && \
        mkdir -p "$(SYSROOT_LIB)" && \
        mv *.o "$(SYSROOT_LIB)"
 
@@ -425,58 +591,91 @@ libc: include_dirs \
     $(SYSROOT_LIB)/libc.a \
     $(SYSROOT_LIB)/libc-printscan-long-double.a \
     $(SYSROOT_LIB)/libc-printscan-no-floating-point.a \
-    $(SYSROOT_LIB)/libwasi-emulated-mman.a
+    $(SYSROOT_LIB)/libwasi-emulated-mman.a \
+    $(SYSROOT_LIB)/libwasi-emulated-process-clocks.a \
+    $(SYSROOT_LIB)/libwasi-emulated-getpid.a \
+    $(SYSROOT_LIB)/libwasi-emulated-signal.a
 
 finish: startup_files libc
        #
        # Create empty placeholder libraries.
        #
        for name in m rt pthread crypt util xnet resolv dl; do \
-           $(WASM_AR) crs "$(SYSROOT_LIB)/lib$${name}.a"; \
+           $(AR) crs "$(SYSROOT_LIB)/lib$${name}.a"; \
        done
 
+       #
+       # 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
+# is done without a malloc implementation.
+ifneq ($(MALLOC_IMPL),none)
+finish: check-symbols
+endif
+
+DEFINED_SYMBOLS = $(SYSROOT_SHARE)/defined-symbols.txt
+UNDEFINED_SYMBOLS = $(SYSROOT_SHARE)/undefined-symbols.txt
+
+check-symbols: startup_files libc
        #
        # Collect metadata on the sysroot and perform sanity checks.
        #
        mkdir -p "$(SYSROOT_SHARE)"
 
+       #
        # Collect symbol information.
-       # TODO: Use llvm-nm --extern-only instead of grep. This is blocked on
-       # LLVM PR40497, which is fixed in 9.0, but not in 8.0.
-       # Ignore certain llvm builtin symbols such as those starting with __mul
-       # since these dependencies can vary between llvm versions.
-       "$(WASM_NM)" --defined-only "$(SYSROOT_LIB)"/libc.a "$(SYSROOT_LIB)"/*.o \
-           |grep ' [[:upper:]] ' |sed 's/.* [[:upper:]] //' |LC_ALL=C sort > "$(SYSROOT_SHARE)/defined-symbols.txt"
-       for undef_sym in $$("$(WASM_NM)" --undefined-only "$(SYSROOT_LIB)"/*.a "$(SYSROOT_LIB)"/*.o \
+       #
+       @# TODO: Use llvm-nm --extern-only instead of grep. This is blocked on
+       @# LLVM PR40497, which is fixed in 9.0, but not in 8.0.
+       @# Ignore certain llvm builtin symbols such as those starting with __mul
+       @# since these dependencies can vary between llvm versions.
+       "$(NM)" --defined-only "$(SYSROOT_LIB)"/libc.a "$(SYSROOT_LIB)"/libwasi-emulated-*.a "$(SYSROOT_LIB)"/*.o \
+           |grep ' [[:upper:]] ' |sed 's/.* [[:upper:]] //' |LC_ALL=C sort |uniq > "$(DEFINED_SYMBOLS)"
+       for undef_sym in $$("$(NM)" --undefined-only "$(SYSROOT_LIB)"/libc.a "$(SYSROOT_LIB)"/libc-*.a "$(SYSROOT_LIB)"/*.o \
            |grep ' U ' |sed 's/.* U //' |LC_ALL=C sort |uniq); do \
-           grep -q '\<'$$undef_sym'\>' "$(SYSROOT_SHARE)/defined-symbols.txt" || echo $$undef_sym; \
-       done | grep -v "^__mul" > "$(SYSROOT_SHARE)/undefined-symbols.txt"
-       grep '^_*wasi_' "$(SYSROOT_SHARE)/undefined-symbols.txt" \
+           grep -q '\<'$$undef_sym'\>' "$(DEFINED_SYMBOLS)" || echo $$undef_sym; \
+       done | grep -v "^__mul" > "$(UNDEFINED_SYMBOLS)"
+       grep '^_*imported_wasi_' "$(UNDEFINED_SYMBOLS)" \
            > "$(SYSROOT_LIB)/libc.imports"
 
-       # Generate a test file that includes all public header files.
-       cd "$(SYSROOT)" && \
-       for header in $$(find include -type f -not -name mman.h |grep -v /bits/); do \
-           echo '#include <'$$header'>' | sed 's/include\///' ; \
-       done |LC_ALL=C sort >share/$(MULTIARCH_TRIPLE)/include-all.c ; \
+       #
+       # Generate a test file that includes all public C header files.
+       #
+       cd "$(SYSROOT_INC)" && \
+         for header in $$(find . -type f -not -name mman.h -not -name signal.h -not -name times.h -not -name resource.h |grep -v /bits/ |grep -v /c++/); do \
+             echo '#include <'$$header'>' | sed 's/\.\///' ; \
+       done |LC_ALL=C sort >$(SYSROOT_SHARE)/include-all.c ; \
        cd - >/dev/null
 
+       #
        # Test that it compiles.
-       "$(WASM_CC)" $(WASM_CFLAGS) -fsyntax-only "$(SYSROOT_SHARE)/include-all.c" -Wno-\#warnings
+       #
+       $(CC) $(CFLAGS) -fsyntax-only "$(SYSROOT_SHARE)/include-all.c" -Wno-\#warnings
 
-       # Collect all the predefined macros, except for compiler version macros
-       # which we don't need to track here. For the __*_ATOMIC_*_LOCK_FREE
-       # macros, squash individual compiler names to attempt, toward keeping
-       # these files compiler-independent.
        #
-       # We have to add `-isystem $(SYSROOT_INC)` because otherwise clang puts
-       # its builtin include path first, which produces compiler-specific
-       # output.
+       # Collect all the predefined macros, except for compiler version macros
+       # which we don't need to track here.
        #
-       # TODO: Undefine __FLOAT128__ for now since it's not in clang 8.0.
-       # TODO: Filter out __FLT16_* for now, as not all versions of clang have these.
-       "$(WASM_CC)" $(WASM_CFLAGS) "$(SYSROOT_SHARE)/include-all.c" \
+       @#
+       @# For the __*_ATOMIC_*_LOCK_FREE macros, squash individual compiler names
+       @# to attempt, toward keeping these files compiler-independent.
+       @#
+       @# We have to add `-isystem $(SYSROOT_INC)` because otherwise clang puts
+       @# its builtin include path first, which produces compiler-specific
+       @# output.
+       @#
+       @# TODO: Filter out __NO_MATH_ERRNO_ and a few __*WIDTH__ that are new to clang 14.
+       @# TODO: Filter out __GCC_HAVE_SYNC_COMPARE_AND_SWAP_* that are new to clang 16.
+       @# TODO: clang defined __FLT_EVAL_METHOD__ until clang 15, so we force-undefine it
+       @# for older versions.
+       @# TODO: Undefine __wasm_mutable_globals__ and __wasm_sign_ext__, that are new to
+       @# clang 16 for -mcpu=generic.
+       @# TODO: As of clang 16, __GNUC_VA_LIST is #defined without a value.
+       $(CC) $(CFLAGS) "$(SYSROOT_SHARE)/include-all.c" \
            -isystem $(SYSROOT_INC) \
+           -std=gnu17 \
            -E -dM -Wno-\#warnings \
            -D_ALL_SOURCE \
            -U__llvm__ \
@@ -485,26 +684,33 @@ finish: startup_files libc
            -U__clang_minor__ \
            -U__clang_patchlevel__ \
            -U__clang_version__ \
+           -U__clang_literal_encoding__ \
+           -U__clang_wide_literal_encoding__ \
+           -U__wasm_mutable_globals__ \
+           -U__wasm_sign_ext__ \
            -U__GNUC__ \
            -U__GNUC_MINOR__ \
            -U__GNUC_PATCHLEVEL__ \
            -U__VERSION__ \
-           -U__FLOAT128__ \
+           -U__NO_MATH_ERRNO__ \
+           -U__BITINT_MAXWIDTH__ \
+           -U__FLT_EVAL_METHOD__ -Wno-builtin-macro-redefined \
            | sed -e 's/__[[:upper:][:digit:]]*_ATOMIC_\([[:upper:][:digit:]_]*\)_LOCK_FREE/__compiler_ATOMIC_\1_LOCK_FREE/' \
-           | grep -v '^#define __FLT16_' \
+           | 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\)' \
            > "$(SYSROOT_SHARE)/predefined-macros.txt"
 
-       #
-       # The build succeeded! The generated sysroot is in $(SYSROOT).
-       #
-
-check: finish
        # Check that the computed metadata matches the expected metadata.
        # This ignores whitespace because on Windows the output has CRLF line endings.
-       diff -wur "$(CURDIR)/expected/$(MULTIARCH_TRIPLE)" "$(SYSROOT_SHARE)"
+       diff -wur "$(CURDIR)/expected/$(TARGET_TRIPLE)" "$(SYSROOT_SHARE)"
 
 install: finish
        mkdir -p "$(INSTALL_DIR)"
        cp -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include" "$(INSTALL_DIR)"
 
-.PHONY: default startup_files libc finish check install include_dirs
+clean:
+       $(RM) -r "$(OBJDIR)"
+       $(RM) -r "$(SYSROOT)"
+
+.PHONY: default startup_files libc finish install include_dirs clean