lib/wasi-libc: upgrade to wasi-sdk-32

wasi-libc migrated its build system from a Makefile to CMake between
wasi-sdk-16 and wasi-sdk-32, restructuring some source directories and
adding new generated headers. Update builder/wasilibc.go to match:

- Generate wasi/version.h (previously produced by CMake's
  configure_file), which defines __wasip1__ and is now widely included
  and used to gate code.
- Follow thread/thrd_sleep.c moving to thread/common/thrd_sleep.c, and
  add newly-added top-half sources (realpath.c, gethostname.c,
  inet_addr.c, inet_legacy.c, inet_ntoa.c).
- Exclude internal/emulate_wait4.c, a new Linux wait4 emulation file
  that needs sys/wait.h, which isn't relevant on WASI.
- Exclude newly-added wasip2/wasip3-only socket sources that now live
  alongside the wasip1 sources in libc-bottom-half/sources, and pick
  up the new libc-bottom-half/sources/math subdirectory.

Bump the wasi-libc cache version to invalidate stale build caches.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Author: dgryski

builder/wasilibc.go

@@ -9,6 +9,33 @@ import (
 	"github.com/tinygo-org/tinygo/goenv"
 )
 
+// generateWasiVersionHeader creates wasi/version.h from its .in template,
+// defining __wasip<preview>__ (preview is "1", "2", or "3") and leaving the
+// other __wasipN__ macros undefined. Upstream generates this file with
+// CMake's configure_file as part of the CMake build.
+func generateWasiVersionHeader(includeDir, preview string) error {
+	libcDir := filepath.Join(goenv.Get("TINYGOROOT"), "lib/wasi-libc")
+	versionHeaderIn := filepath.Join(libcDir, "libc-bottom-half/headers/public/wasi/version.h.in")
+	data, err := os.ReadFile(versionHeaderIn)
+	if err != nil {
+		return err
+	}
+	define := "__wasip" + preview + "__"
+	lines := strings.Split(string(data), "\n")
+	for i, line := range lines {
+		if !strings.HasPrefix(line, "#cmakedefine ") {
+			continue
+		}
+		name := strings.Fields(line)[1]
+		if name == define {
+			lines[i] = "#define " + name
+		} else {
+			lines[i] = "/* #undef " + name + " */"
+		}
+	}
+	return os.WriteFile(filepath.Join(includeDir, "wasi", "version.h"), []byte(strings.Join(lines, "\n")), 0o666)
+}
+
 var libWasiLibc = Library{
 	name: "wasi-libc",
 	makeHeaders: func(target, includeDir string) error {
@@ -84,6 +111,17 @@ var libWasiLibc = Library{
 			}
 		}
 
+		// wasi/version.h is normally generated by CMake's configure_file
+		// from version.h.in, defining __wasip1__/__wasip2__/__wasip3__
+		// depending on the WASI preview targeted. It's included (directly or
+		// transitively) by most of wasi-libc, including wasi/api.h.
+		// libWasiLibc currently only targets wasip1; when wasip2/wasip3
+		// build against wasi-libc directly (instead of libWasmBuiltins),
+		// this will need to be told which preview to define.
+		if err := generateWasiVersionHeader(includeDir, "1"); err != nil {
+			return err
+		}
+
 		return nil
 	},
 	cflags: func(target, headerPath string) []string {
@@ -133,6 +171,7 @@ var libWasiLibc = Library{
 			{glob: "libc-top-half/musl/src/conf/*.c"},
 			{glob: "libc-top-half/musl/src/internal/*.c", exclude: []string{
 				"procfdname.c", "syscall.c", "syscall_ret.c", "vdso.c", "version.c",
+				"emulate_wait4.c", // wait4/waitid emulation, not relevant/available on WASI
 			}},
 			{glob: "libc-top-half/musl/src/locale/*.c", exclude: []string{
 				"dcngettext.c", "textdomain.c", "bind_textdomain_codeset.c"}},
@@ -166,7 +205,20 @@ var libWasiLibc = Library{
 			// Bottom half: connect top half to WASI equivalents.
 			{glob: "libc-bottom-half/cloudlibc/src/libc/*/*.c"},
 			{glob: "libc-bottom-half/cloudlibc/src/libc/sys/*/*.c"},
-			{glob: "libc-bottom-half/sources/*.c"},
+			{glob: "libc-bottom-half/sources/math/*.c"},
+			{glob: "libc-bottom-half/sources/*.c", exclude: []string{
+				// These implement sockets on top of a shared "descriptor
+				// table" abstraction, used only for wasip2/wasip3. wasip1
+				// uses the cloudlibc socket syscalls (and accept-wasip1.c)
+				// instead.
+				"accept.c", "bind.c", "connect.c", "descriptor_table.c",
+				"file.c", "file_utils.c", "getsockpeername.c", "listen.c",
+				"netdb.c", "recv.c", "send.c", "shutdown.c", "socket.c",
+				"sockets_utils.c", "sockopt.c", "tcp.c", "udp.c",
+				// wasip2/wasip3-only bindings.
+				"wasip2.c", "wasip2_stdio.c",
+				"wasip3.c", "wasip3_block_on.c", "wasip3_stdio.c",
+			}},
 		}
 
 		// We're using the Boehm GC, so we need a heap implementation in the libc.
@@ -243,9 +295,14 @@ var libWasiLibc = Library{
 			"libc-top-half/musl/src/env/setenv.c",
 			"libc-top-half/musl/src/env/unsetenv.c",
 			"libc-top-half/musl/src/unistd/posix_close.c",
+			"libc-top-half/musl/src/unistd/gethostname.c",
 			"libc-top-half/musl/src/stat/futimesat.c",
 			"libc-top-half/musl/src/legacy/getpagesize.c",
-			"libc-top-half/musl/src/thread/thrd_sleep.c",
+			"libc-top-half/musl/src/thread/common/thrd_sleep.c",
+			"libc-top-half/musl/src/misc/realpath.c",
+			"libc-top-half/musl/src/network/inet_addr.c",
+			"libc-top-half/musl/src/network/inet_legacy.c",
+			"libc-top-half/musl/src/network/inet_ntoa.c",
 		}
 
 		basepath := goenv.Get("TINYGOROOT") + "/lib/wasi-libc/"

compileopts/config.go

@@ -23,8 +23,9 @@ import (
 // builder.Library struct but that's hard to do since we want to know the
 // library path in advance in several places).
 var libVersions = map[string]int{
-	"musl":  3,
-	"bdwgc": 2,
+	"musl":      3,
+	"bdwgc":     2,
+	"wasi-libc": 1,
 }
 
 // Config keeps all configuration affecting the build in a single struct.