build: apply ctxreg flags only to llgo IR

Author: cpunion

internal/build/build.go

@@ -41,6 +41,7 @@ import (
 	"github.com/goplus/llgo/internal/cabi"
 	"github.com/goplus/llgo/internal/clang"
 	"github.com/goplus/llgo/internal/crosscompile"
+	"github.com/goplus/llgo/internal/ctxreg"
 	"github.com/goplus/llgo/internal/env"
 	"github.com/goplus/llgo/internal/firmware"
 	"github.com/goplus/llgo/internal/flash"
@@ -1231,6 +1232,10 @@ func exportObject(ctx *context, pkgPath string, exportFile string, data []byte)
 	if targetTriple != "" && !hasTargetFlag(ctx.crossCompile.CCFLAGS) && !hasTargetFlag(ctx.crossCompile.CFLAGS) {
 		args = append(args, "--target="+targetTriple)
 	}
+	ctxArch := ctxGoarch(ctx.buildConf.Goarch, ctx.crossCompile.LLVMTarget)
+	if reserve := ctxreg.ReserveFlags(ctxArch); len(reserve) > 0 {
+		args = appendMissingFlags(args, reserve)
+	}
 	if ctx.shouldPrintCommands(false) {
 		fmt.Fprintf(os.Stderr, "# compiling %s for pkg: %s\n", f.Name(), pkgPath)
 		fmt.Fprintln(os.Stderr, "clang", args)

internal/crosscompile/crosscompile.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	"github.com/goplus/llgo/internal/crosscompile/compile"
-	"github.com/goplus/llgo/internal/ctxreg"
 	"github.com/goplus/llgo/internal/env"
 	"github.com/goplus/llgo/internal/flash"
 	"github.com/goplus/llgo/internal/targets"
@@ -82,11 +81,6 @@ func buildEnvMap(llgoRoot string) map[string]string {
 	return envs
 }
 
-// reserveRegisterFlags returns clang flags to reserve the closure ctx register.
-func reserveRegisterFlags(goarch string) []string {
-	return ctxreg.ReserveFlags(goarch)
-}
-
 func appendMissingFlags(dst []string, flags []string) []string {
 	for i := 0; i < len(flags); i++ {
 		flag := flags[i]
@@ -279,11 +273,6 @@ func use(goos, goarch string, wasiThreads, forceEspClang bool) (export Export, e
 			"-Qunused-arguments",
 			"-Wno-unused-command-line-argument",
 		}
-		if reserve := reserveRegisterFlags(goarch); len(reserve) > 0 {
-			export.CCFLAGS = appendMissingFlags(export.CCFLAGS, reserve)
-			export.CFLAGS = appendMissingFlags(export.CFLAGS, reserve)
-		}
-
 		// Add sysroot for macOS only
 		if goos == "darwin" {
 			sysrootPath, sysrootErr := getMacOSSysroot()
@@ -528,10 +517,6 @@ func UseTarget(targetName string) (export Export, err error) {
 		cflags = append(cflags, "--target="+config.LLVMTarget)
 		ccflags = append(ccflags, "--target="+config.LLVMTarget)
 	}
-	if reserve := reserveRegisterFlags(config.GOARCH); len(reserve) > 0 {
-		cflags = appendMissingFlags(cflags, reserve)
-		ccflags = appendMissingFlags(ccflags, reserve)
-	}
 	// Expand template variables in cflags
 	expandedCFlags := env.ExpandEnvSlice(config.CFlags, envs)
 	cflags = append(cflags, expandedCFlags...)