all: use baremetal build tag

This simplifies adding more baremetal targets, like a GameBoy Advance,
or baremetal x86 for unikernels.

2 files changed, 2 insertions, 2 deletions

diff --git a/compiler/compiler.go b/compiler/compiler.go
index c68a40106..c12aec89d 100644
--- a/compiler/compiler.go
+++ b/compiler/compiler.go
@@ -226,7 +226,7 @@ func (c *Compiler) Compile(mainPath string) []error {
 					return path
 				} else if path == "syscall" {
 					for _, tag := range c.BuildTags {
-						if tag == "avr" || tag == "cortexm" || tag == "darwin" || tag == "riscv" {
+						if tag == "baremetal" || tag == "darwin" {
 							return path
 						}
 					}
diff --git a/compiler/gc.go b/compiler/gc.go
index e6b196141..d9679efca 100644
--- a/compiler/gc.go
+++ b/compiler/gc.go
@@ -18,7 +18,7 @@ func (c *Compiler) needsStackObjects() bool {
 		return false
 	}
 	for _, tag := range c.BuildTags {
-		if tag == "cortexm" || tag == "tinygo.riscv" {
+		if tag == "baremetal" {
 			return false
 		}
 	}