feat(crosscompile): extend Export struct and add target-based configuration
- Add LLVMTarget, CPU, Features, BuildTags fields to Export struct - Implement UseTarget() function for target name-based configuration loading - Add UseWithTarget() function combining target and goos/goarch fallback - Include comprehensive unit tests for target integration - Support 206+ embedded platform configurations with inheritance 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Li Jie
319
internal/crosscompile/crosscompile.go
Normal file
319
internal/crosscompile/crosscompile.go
Normal file
@@ -0,0 +1,319 @@
|
||||
package crosscompile
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"strings"
|
||||
|
||||
"github.com/goplus/llgo/internal/env"
|
||||
"github.com/goplus/llgo/internal/targets"
|
||||
"github.com/goplus/llgo/internal/xtool/llvm"
|
||||
)
|
||||
|
||||
type Export struct {
|
||||
CC string // Compiler to use
|
||||
CCFLAGS []string
|
||||
CFLAGS []string
|
||||
LDFLAGS []string
|
||||
EXTRAFLAGS []string
|
||||
|
||||
// Additional fields from target configuration
|
||||
LLVMTarget string
|
||||
CPU string
|
||||
Features string
|
||||
BuildTags []string
|
||||
GOOS string
|
||||
GOARCH string
|
||||
Linker string // Linker to use (e.g., "ld.lld", "avr-ld")
|
||||
}
|
||||
|
||||
const wasiSdkUrl = "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-macos.tar.gz"
|
||||
|
||||
func cacheDir() string {
|
||||
return filepath.Join(env.LLGoCacheDir(), "crosscompile")
|
||||
}
|
||||
|
||||
func Use(goos, goarch string, wasiThreads bool) (export Export, err error) {
|
||||
targetTriple := llvm.GetTargetTriple(goos, goarch)
|
||||
|
||||
if runtime.GOOS == goos && runtime.GOARCH == goarch {
|
||||
// not cross compile
|
||||
// Set up basic flags for non-cross-compile
|
||||
export.LDFLAGS = []string{
|
||||
"-target", targetTriple,
|
||||
"-Wno-override-module",
|
||||
"-Wl,--error-limit=0",
|
||||
"-fuse-ld=lld",
|
||||
}
|
||||
|
||||
// Add OS-specific flags
|
||||
switch goos {
|
||||
case "darwin": // ld64.lld (macOS)
|
||||
export.LDFLAGS = append(
|
||||
export.LDFLAGS,
|
||||
"-Xlinker", "-dead_strip",
|
||||
)
|
||||
case "windows": // lld-link (Windows)
|
||||
// TODO(lijie): Add options for Windows.
|
||||
default: // ld.lld (Unix)
|
||||
export.CCFLAGS = append(
|
||||
export.CCFLAGS,
|
||||
"-fdata-sections",
|
||||
"-ffunction-sections",
|
||||
)
|
||||
export.LDFLAGS = append(
|
||||
export.LDFLAGS,
|
||||
"-fdata-sections",
|
||||
"-ffunction-sections",
|
||||
"-Xlinker",
|
||||
"--gc-sections",
|
||||
"-lm",
|
||||
"-latomic",
|
||||
"-lpthread", // libpthread is built-in since glibc 2.34 (2021-08-01); we need to support earlier versions.
|
||||
)
|
||||
}
|
||||
return
|
||||
}
|
||||
if goarch != "wasm" {
|
||||
return
|
||||
}
|
||||
|
||||
// Configure based on GOOS
|
||||
switch goos {
|
||||
case "wasip1":
|
||||
sdkDir := filepath.Join(cacheDir(), llvm.GetTargetTriple(goos, goarch))
|
||||
if _, err = os.Stat(sdkDir); err != nil {
|
||||
if !errors.Is(err, fs.ErrNotExist) {
|
||||
return
|
||||
}
|
||||
|
||||
if err = downloadAndExtract(wasiSdkUrl, sdkDir); err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
// WASI-SDK configuration
|
||||
triple := "wasm32-wasip1"
|
||||
if wasiThreads {
|
||||
triple = "wasm32-wasip1-threads"
|
||||
}
|
||||
|
||||
// Set up flags for the WASI-SDK
|
||||
wasiSdkRoot := filepath.Join(sdkDir, "wasi-sdk-25.0-x86_64-macos")
|
||||
sysrootDir := filepath.Join(wasiSdkRoot, "share", "wasi-sysroot")
|
||||
libclangDir := filepath.Join(wasiSdkRoot, "lib", "clang", "19")
|
||||
includeDir := filepath.Join(sysrootDir, "include", triple)
|
||||
libDir := filepath.Join(sysrootDir, "lib", triple)
|
||||
|
||||
// Use system clang and sysroot of wasi-sdk
|
||||
// Add compiler flags
|
||||
export.CCFLAGS = []string{
|
||||
"-target", targetTriple,
|
||||
"--sysroot=" + sysrootDir,
|
||||
"-resource-dir=" + libclangDir,
|
||||
"-matomics",
|
||||
"-mbulk-memory",
|
||||
}
|
||||
export.CFLAGS = []string{
|
||||
"-I" + includeDir,
|
||||
}
|
||||
// Add WebAssembly linker flags
|
||||
export.LDFLAGS = append(export.LDFLAGS, export.CCFLAGS...)
|
||||
export.LDFLAGS = append(export.LDFLAGS, []string{
|
||||
"-Wno-override-module",
|
||||
"-Wl,--error-limit=0",
|
||||
"-L" + libDir,
|
||||
"-Wl,--allow-undefined",
|
||||
"-Wl,--import-memory,", // unknown import: `env::memory` has not been defined
|
||||
"-Wl,--export-memory",
|
||||
"-Wl,--initial-memory=67108864", // 64MB
|
||||
"-mbulk-memory",
|
||||
"-mmultimemory",
|
||||
"-z", "stack-size=10485760", // 10MB
|
||||
"-Wl,--export=malloc", "-Wl,--export=free",
|
||||
"-lc",
|
||||
"-lcrypt",
|
||||
"-lm",
|
||||
"-lrt",
|
||||
"-lutil",
|
||||
"-lsetjmp",
|
||||
"-lwasi-emulated-mman",
|
||||
"-lwasi-emulated-getpid",
|
||||
"-lwasi-emulated-process-clocks",
|
||||
"-lwasi-emulated-signal",
|
||||
"-fwasm-exceptions",
|
||||
"-mllvm", "-wasm-enable-sjlj",
|
||||
}...)
|
||||
// Add thread support if enabled
|
||||
if wasiThreads {
|
||||
export.CCFLAGS = append(
|
||||
export.CCFLAGS,
|
||||
"-pthread",
|
||||
)
|
||||
export.LDFLAGS = append(export.LDFLAGS, export.CCFLAGS...)
|
||||
export.LDFLAGS = append(
|
||||
export.LDFLAGS,
|
||||
"-lwasi-emulated-pthread",
|
||||
"-lpthread",
|
||||
)
|
||||
}
|
||||
|
||||
case "js":
|
||||
targetTriple := "wasm32-unknown-emscripten"
|
||||
// Emscripten configuration using system installation
|
||||
// Specify emcc as the compiler
|
||||
export.CC = "emcc"
|
||||
// Add compiler flags
|
||||
export.CCFLAGS = []string{
|
||||
"-target", targetTriple,
|
||||
}
|
||||
export.CFLAGS = []string{}
|
||||
// Add WebAssembly linker flags for Emscripten
|
||||
export.LDFLAGS = []string{
|
||||
"-target", targetTriple,
|
||||
"-Wno-override-module",
|
||||
"-Wl,--error-limit=0",
|
||||
"-s", "ALLOW_MEMORY_GROWTH=1",
|
||||
"-Wl,--allow-undefined",
|
||||
// "-Wl,--import-memory,",
|
||||
// "-Wl,--export-memory",
|
||||
// "-Wl,--initial-memory=67108864", // 64MB
|
||||
// "-mbulk-memory",
|
||||
// "-mmultimemory",
|
||||
// "-z", "stack-size=10485760", // 10MB
|
||||
// "-Wl,--export=malloc", "-Wl,--export=free",
|
||||
}
|
||||
export.EXTRAFLAGS = []string{
|
||||
"-sENVIRONMENT=web,worker",
|
||||
"-DPLATFORM_WEB",
|
||||
"-sEXPORT_KEEPALIVE=1",
|
||||
"-sEXPORT_ES6=1",
|
||||
"-sALLOW_MEMORY_GROWTH=1",
|
||||
"-sRESERVED_FUNCTION_POINTERS=1",
|
||||
"-sEXPORTED_RUNTIME_METHODS=cwrap,allocateUTF8,stringToUTF8,UTF8ToString,FS,setValue,getValue",
|
||||
"-sWASM=1",
|
||||
"-sEXPORT_ALL=1",
|
||||
"-sASYNCIFY=1",
|
||||
"-sSTACK_SIZE=5242880", // 50MB
|
||||
}
|
||||
|
||||
default:
|
||||
err = errors.New("unsupported GOOS for WebAssembly: " + goos)
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// useTarget loads configuration from a target name (e.g., "rp2040", "wasi")
|
||||
func useTarget(targetName string) (export Export, err error) {
|
||||
resolver := targets.NewDefaultResolver()
|
||||
|
||||
config, err := resolver.Resolve(targetName)
|
||||
if err != nil {
|
||||
return export, fmt.Errorf("failed to resolve target %s: %w", targetName, err)
|
||||
}
|
||||
|
||||
// Convert target config to Export - only export necessary fields
|
||||
export.BuildTags = config.BuildTags
|
||||
export.GOOS = config.GOOS
|
||||
export.GOARCH = config.GOARCH
|
||||
|
||||
// Convert LLVMTarget, CPU, Features to CCFLAGS/LDFLAGS
|
||||
var ccflags []string
|
||||
var ldflags []string
|
||||
|
||||
target := config.LLVMTarget
|
||||
if target == "" {
|
||||
target = llvm.GetTargetTriple(config.GOOS, config.GOARCH)
|
||||
}
|
||||
|
||||
ccflags = append(ccflags, "-Wno-override-module", "--target="+config.LLVMTarget)
|
||||
|
||||
// Inspired by tinygo
|
||||
cpu := config.CPU
|
||||
if cpu != "" {
|
||||
if strings.HasPrefix(target, "i386") || strings.HasPrefix(target, "x86_64") {
|
||||
ccflags = append(ccflags, "-march="+cpu)
|
||||
} else if strings.HasPrefix(target, "avr") {
|
||||
ccflags = append(ccflags, "-mmcu="+cpu)
|
||||
} else {
|
||||
ccflags = append(ccflags, "-mcpu="+cpu)
|
||||
}
|
||||
// Only add -mllvm flags for non-WebAssembly linkers
|
||||
if config.Linker == "ld.lld" {
|
||||
ldflags = append(ldflags, "-mllvm", "-mcpu="+cpu)
|
||||
}
|
||||
}
|
||||
|
||||
// Handle Features
|
||||
if config.Features != "" {
|
||||
// Only add -mllvm flags for non-WebAssembly linkers
|
||||
if config.Linker == "ld.lld" {
|
||||
ldflags = append(ldflags, "-mllvm", "-mattr="+config.Features)
|
||||
}
|
||||
}
|
||||
|
||||
// Handle Linker - keep it for external usage
|
||||
export.Linker = config.Linker
|
||||
|
||||
// Combine with config flags
|
||||
export.CFLAGS = config.CFlags
|
||||
export.CCFLAGS = ccflags
|
||||
export.LDFLAGS = append(ldflags, filterCompatibleLDFlags(config.LDFlags)...)
|
||||
export.EXTRAFLAGS = []string{}
|
||||
|
||||
return export, nil
|
||||
}
|
||||
|
||||
// UseWithTarget extends the original Use function to support target-based configuration
|
||||
// If targetName is provided, it takes precedence over goos/goarch
|
||||
func UseWithTarget(goos, goarch string, wasiThreads bool, targetName string) (export Export, err error) {
|
||||
if targetName != "" {
|
||||
return useTarget(targetName)
|
||||
}
|
||||
return Use(goos, goarch, wasiThreads)
|
||||
}
|
||||
|
||||
// filterCompatibleLDFlags filters out linker flags that are incompatible with clang/lld
|
||||
func filterCompatibleLDFlags(ldflags []string) []string {
|
||||
if len(ldflags) == 0 {
|
||||
return ldflags
|
||||
}
|
||||
|
||||
var filtered []string
|
||||
|
||||
incompatiblePrefixes := []string{
|
||||
"--defsym=", // Use -Wl,--defsym= instead
|
||||
"-T", // Linker script, needs special handling
|
||||
}
|
||||
|
||||
i := 0
|
||||
for i < len(ldflags) {
|
||||
flag := ldflags[i]
|
||||
|
||||
// Check incompatible prefixes
|
||||
skip := false
|
||||
for _, prefix := range incompatiblePrefixes {
|
||||
if strings.HasPrefix(flag, prefix) {
|
||||
skip = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if skip {
|
||||
// Skip -T and its argument if separate
|
||||
if flag == "-T" && i+1 < len(ldflags) {
|
||||
i += 2 // Skip both -T and the script path
|
||||
} else {
|
||||
i++
|
||||
}
|
||||
continue
|
||||
}
|
||||
filtered = append(filtered, flag)
|
||||
i++
|
||||
}
|
||||
|
||||
return filtered
|
||||
}
|
||||
Reference in New Issue
Block a user