wasm: add support for GOOS=wasip1

This adds true GOOS=wasip1 support in addition to our existing
-target=wasi support. The old support for WASI isn't removed, but should
be treated as deprecated and will likely be removed eventually to reduce
the test burden.

src/os/dir_unix.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux && !baremetal && !wasi
+//go:build linux && !baremetal && !wasi && !wasip1
 
 package os
 

src/os/dir_wasi.go

@@ -6,7 +6,7 @@
 // fairly similar: we use fdopendir, fdclosedir, and readdir from wasi-libc in
 // a similar way that the darwin code uses functions from libc.
 
-//go:build wasi
+//go:build wasi || wasip1
 
 package os
 

src/os/env_unix_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build darwin || linux
+//go:build darwin || linux || wasip1
 
 package os_test
 

src/os/exec_posix.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
+//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || wasip1 || windows
 
 package os
 

src/os/file_other.go

@@ -1,4 +1,4 @@
-//go:build baremetal || (wasm && !wasi)
+//go:build baremetal || (wasm && !wasi && !wasip1)
 
 package os
 

src/os/file_unix.go

@@ -1,4 +1,4 @@
-//go:build darwin || (linux && !baremetal)
+//go:build darwin || (linux && !baremetal) || wasip1
 
 // target wasi sets GOOS=linux and thus the +linux build tag,
 // even though it doesn't show up in "tinygo info target -wasi"

src/os/getpagesize_test.go

@@ -1,4 +1,4 @@
-//go:build windows || darwin || (linux && !baremetal)
+//go:build windows || darwin || (linux && !baremetal) || wasip1
 
 package os_test
 

src/os/is_wasi_no_test.go

@@ -1,4 +1,4 @@
-//go:build !wasi
+//go:build !wasi && !wasip1
 
 package os_test
 

src/os/is_wasi_test.go

@@ -1,4 +1,4 @@
-//go:build wasi
+//go:build wasi || wasip1
 
 package os_test
 

src/os/os_anyos_test.go

@@ -1,4 +1,4 @@
-//go:build windows || darwin || (linux && !baremetal)
+//go:build windows || darwin || (linux && !baremetal) || wasip1
 
 package os_test
 
@@ -23,7 +23,6 @@ var dot = []string{
 	"os_test.go",
 	"types.go",
 	"stat_darwin.go",
-	"stat_linux.go",
 }
 
 func randomName() string {

src/os/os_chmod_test.go

@@ -1,4 +1,4 @@
-//go:build !baremetal && !js && !wasi
+//go:build !baremetal && !js && !wasi && !wasip1
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

src/os/os_symlink_test.go

@@ -1,4 +1,4 @@
-//go:build !windows && !baremetal && !js && !wasi
+//go:build !windows && !baremetal && !js && !wasi && !wasip1
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

src/os/read_test.go

@@ -1,4 +1,4 @@
-//go:build !baremetal && !js && !wasi
+//go:build !baremetal && !js && !wasi && !wasip1
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

src/os/removeall_noat.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !baremetal && !js && !wasi
+//go:build !baremetal && !js && !wasi && !wasip1
 
 package os
 

src/os/removeall_other.go

@@ -1,4 +1,4 @@
-//go:build baremetal || js || wasi
+//go:build baremetal || js || wasi || wasip1
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

src/os/stat_linuxlike.go

@@ -1,9 +1,13 @@
-//go:build linux && !baremetal
+//go:build (linux && !baremetal) || wasip1
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// Note: this file is used for both Linux and WASI.
+// Eventually it might be better to spit it up, and make the syscall constants
+// match the typical WASI constants instead of the Linux-equivalents used here.
+
 package os
 
 import (

src/os/stat_other.go

@@ -1,4 +1,4 @@
-//go:build baremetal || (wasm && !wasi)
+//go:build baremetal || (wasm && !wasi && !wasip1)
 
 // Copyright 2016 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

src/os/stat_unix.go

@@ -1,4 +1,4 @@
-//go:build darwin || (linux && !baremetal)
+//go:build darwin || (linux && !baremetal) || wasip1
 
 // Copyright 2016 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

src/os/tempfile_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !baremetal && !js && !wasi
+//go:build !baremetal && !js && !wasi && !wasip1
 
 package os_test
 

src/os/types_unix.go

@@ -1,4 +1,4 @@
-//go:build darwin || (linux && !baremetal)
+//go:build darwin || (linux && !baremetal) || wasip1
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

src/runtime/env.go

@@ -1,4 +1,4 @@
-//go:build linux || darwin || windows
+//go:build linux || darwin || windows || wasip1
 
 package runtime
 

src/runtime/env_unix.go

@@ -1,4 +1,4 @@
-//go:build linux || darwin
+//go:build linux || darwin || wasip1
 
 package runtime
 

src/runtime/os_wasip1.go

@@ -0,0 +1,10 @@
+//go:build wasip1
+
+package runtime
+
+// The actual GOOS=wasip1, as newly added in the Go 1.21 toolchain.
+// Previously we supported -target=wasi, but that was essentially faked by using
+// linux/arm instead because that was the closest thing that was already
+// supported in the Go standard library.
+
+const GOOS = "wasip1"

src/runtime/runtime_wasm_js.go

@@ -1,4 +1,4 @@
-//go:build wasm && !wasi
+//go:build wasm && !wasi && !wasip1
 
 package runtime
 

src/runtime/runtime_wasm_js_scheduler.go

@@ -1,4 +1,4 @@
-//go:build wasm && !wasi && !scheduler.none
+//go:build wasm && !wasi && !scheduler.none && !wasip1
 
 package runtime
 

src/runtime/runtime_wasm_wasi.go

@@ -1,4 +1,4 @@
-//go:build tinygo.wasm && wasi
+//go:build tinygo.wasm && (wasi || wasip1)
 
 package runtime
 

src/syscall/errno_other.go

@@ -1,4 +1,4 @@
-//go:build !wasi && !darwin
+//go:build !wasi && !wasip1 && !darwin
 
 package syscall
 

src/syscall/file_emulated.go

@@ -1,4 +1,4 @@
-//go:build baremetal || wasm
+//go:build baremetal || (wasm && !wasip1)
 
 // This file emulates some file-related functions that are only available
 // under a real operating system.

src/syscall/file_hosted.go

@@ -1,4 +1,4 @@
-//go:build !baremetal && !wasm
+//go:build !(baremetal || (wasm && !wasip1))
 
 // This file assumes there is a libc available that runs on a real operating
 // system.

src/syscall/proc_emulated.go

@@ -1,4 +1,4 @@
-//go:build baremetal || wasi || wasm
+//go:build baremetal || tinygo.wasm
 
 // This file emulates some process-related functions that are only available
 // under a real operating system.

src/syscall/proc_hosted.go

@@ -1,4 +1,4 @@
-//go:build !baremetal && !wasi && !wasm
+//go:build !baremetal && !tinygo.wasm
 
 // This file assumes there is a libc available that runs on a real operating
 // system.

src/syscall/syscall_libc.go

@@ -1,4 +1,4 @@
-//go:build darwin || nintendoswitch || wasi
+//go:build darwin || nintendoswitch || wasi || wasip1
 
 package syscall
 

src/syscall/syscall_libc_wasi.go

@@ -1,4 +1,4 @@
-//go:build wasi
+//go:build wasi || wasip1
 
 package syscall
 

src/testing/is_wasi_no_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //
-//go:build !wasi
+//go:build !wasi && !wasip1
 
 package testing_test
 

src/testing/is_wasi_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //
-//go:build wasi
+//go:build wasi || wasip1
 
 package testing_test