Skip to content

Commit

Permalink
wasm-unknown: make sure the os package can be imported
Browse files Browse the repository at this point in the history
See: #4314

The os package isn't particularly useful on wasm-unknown, but just like
on baremetal systems it's imported by a lot of packages so it should at
least be possible to import this package.
  • Loading branch information
aykevl committed Jun 27, 2024
1 parent 4517a0c commit fae0402
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 16 deletions.
4 changes: 4 additions & 0 deletions src/examples/hello-wasm-unknown/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
// tinygo build -size short -o hello-unknown.wasm -target wasm-unknown -gc=leaking -no-debug ./src/examples/hello-wasm-unknown/
package main

// Smoke test: make sure the fmt package can be imported (even if it isn't
// really useful for wasm-unknown).
import _ "os"

var x int32

//go:wasmimport hosted echo_i32
Expand Down
2 changes: 1 addition & 1 deletion src/os/dir_other.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build baremetal || js || windows
//go:build baremetal || js || windows || wasm_unknown

// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
Expand Down
2 changes: 1 addition & 1 deletion src/os/dir_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 && !wasip1
//go:build linux && !baremetal && !wasip1 && !wasm_unknown

package os

Expand Down
2 changes: 1 addition & 1 deletion src/os/dirent_linux.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build !baremetal && !js && !wasip1
//go:build !baremetal && !js && !wasip1 && !wasm_unknown

// Copyright 2020 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
Expand Down
2 changes: 1 addition & 1 deletion src/os/file_anyos.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build !baremetal && !js
//go:build !baremetal && !js && !wasm_unknown

// Portions copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
Expand Down
2 changes: 1 addition & 1 deletion src/os/file_other.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build baremetal || (wasm && !wasip1)
//go:build baremetal || (tinygo.wasm && !wasip1)

package os

Expand Down
2 changes: 1 addition & 1 deletion src/os/file_unix.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build darwin || (linux && !baremetal) || wasip1
//go:build darwin || (linux && !baremetal && !wasm_unknown) || wasip1

// target wasi sets GOOS=linux and thus the +linux build tag,
// even though it doesn't show up in "tinygo info target -wasi"
Expand Down
2 changes: 1 addition & 1 deletion src/os/removeall_noat.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 && !wasip1
//go:build !baremetal && !js && !wasip1 && !wasm_unknown

package os

Expand Down
2 changes: 1 addition & 1 deletion src/os/removeall_other.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build baremetal || js || wasi || wasip1
//go:build baremetal || js || wasi || wasip1 || wasm_unknown

// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
Expand Down
2 changes: 1 addition & 1 deletion src/os/stat_linuxlike.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build (linux && !baremetal) || wasip1
//go:build (linux && !baremetal && !wasm_unknown) || wasip1

// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
Expand Down
2 changes: 1 addition & 1 deletion src/os/stat_other.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build baremetal || (wasm && !wasip1)
//go:build baremetal || (tinygo.wasm && !wasip1)

// Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
Expand Down
2 changes: 1 addition & 1 deletion src/os/stat_unix.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build darwin || (linux && !baremetal) || wasip1
//go:build darwin || (linux && !baremetal && !wasm_unknown) || wasip1

// Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
Expand Down
2 changes: 1 addition & 1 deletion src/os/types_anyos.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build !baremetal && !js
//go:build !baremetal && !js && !wasm_unknown

// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
Expand Down
2 changes: 1 addition & 1 deletion src/os/types_unix.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build darwin || (linux && !baremetal) || wasip1
//go:build darwin || (linux && !baremetal && !wasm_unknown) || wasip1

// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/nonhosted.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build baremetal || js
//go:build baremetal || js || wasm_unknown

package runtime

Expand Down
2 changes: 0 additions & 2 deletions src/runtime/runtime_wasm_unknown.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ func init() {
__wasm_call_ctors()
}

var args []string

func ticksToNanoseconds(ticks timeUnit) int64 {
return int64(ticks)
}
Expand Down

0 comments on commit fae0402

Please sign in to comment.