From 065126e270d29c00622d28a29fea67e01dd57055 Mon Sep 17 00:00:00 2001 From: Haolan Date: Fri, 14 Nov 2025 16:00:40 +0800 Subject: [PATCH] feat: make defer tls stub for baremetal --- runtime/internal/clite/tls/tls_common.go | 2 +- runtime/internal/clite/tls/tls_gc.go | 2 +- runtime/internal/clite/tls/tls_nogc.go | 2 +- runtime/internal/clite/tls/tls_stub.go | 2 +- runtime/internal/runtime/z_defer_gc.go | 2 +- runtime/internal/runtime/z_defer_nogc.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runtime/internal/clite/tls/tls_common.go b/runtime/internal/clite/tls/tls_common.go index 4741365e..1a6707cd 100644 --- a/runtime/internal/clite/tls/tls_common.go +++ b/runtime/internal/clite/tls/tls_common.go @@ -1,4 +1,4 @@ -//go:build llgo +//go:build llgo && !baremetal /* * Copyright (c) 2025 The GoPlus Authors (goplus.org). All rights reserved. diff --git a/runtime/internal/clite/tls/tls_gc.go b/runtime/internal/clite/tls/tls_gc.go index d6341827..ce672440 100644 --- a/runtime/internal/clite/tls/tls_gc.go +++ b/runtime/internal/clite/tls/tls_gc.go @@ -1,4 +1,4 @@ -//go:build llgo && !nogc +//go:build llgo && !baremetal && !nogc /* * Copyright (c) 2025 The GoPlus Authors (goplus.org). All rights reserved. diff --git a/runtime/internal/clite/tls/tls_nogc.go b/runtime/internal/clite/tls/tls_nogc.go index 15f7cd1e..81c172f0 100644 --- a/runtime/internal/clite/tls/tls_nogc.go +++ b/runtime/internal/clite/tls/tls_nogc.go @@ -1,4 +1,4 @@ -//go:build llgo && nogc +//go:build llgo && (nogc || baremetal) /* * Copyright (c) 2025 The GoPlus Authors (goplus.org). All rights reserved. diff --git a/runtime/internal/clite/tls/tls_stub.go b/runtime/internal/clite/tls/tls_stub.go index f209bb5a..657d2bb7 100644 --- a/runtime/internal/clite/tls/tls_stub.go +++ b/runtime/internal/clite/tls/tls_stub.go @@ -1,4 +1,4 @@ -//go:build !llgo +//go:build !llgo || baremetal /* * Copyright (c) 2025 The GoPlus Authors (goplus.org). All rights reserved. diff --git a/runtime/internal/runtime/z_defer_gc.go b/runtime/internal/runtime/z_defer_gc.go index fdfd008b..3d8fe8ec 100644 --- a/runtime/internal/runtime/z_defer_gc.go +++ b/runtime/internal/runtime/z_defer_gc.go @@ -1,4 +1,4 @@ -//go:build !nogc +//go:build !nogc && !baremetal /* * Copyright (c) 2025 The GoPlus Authors (goplus.org). All rights reserved. diff --git a/runtime/internal/runtime/z_defer_nogc.go b/runtime/internal/runtime/z_defer_nogc.go index 336462c8..3a7f2bce 100644 --- a/runtime/internal/runtime/z_defer_nogc.go +++ b/runtime/internal/runtime/z_defer_nogc.go @@ -1,4 +1,4 @@ -//go:build nogc +//go:build nogc || baremetal /* * Copyright (c) 2025 The GoPlus Authors (goplus.org). All rights reserved.