Add non-GCC toolchain configs and flexible flag handling

Author: BernardXiong

ebuild/README.md

@@ -140,6 +140,13 @@ TOOLCHAIN_CONFIG = {
 POST_ACTION = "$OBJCOPY -O binary $TARGET build/stm32f103.bin"
 ```
 
+非 GCC 工具链可通过以下配置项定制命令行参数：
+
+- DEVICE_FLAGS：编译器的设备参数（支持 `{cpu}` 占位符）
+- AS_DEVICE_FLAGS：汇编器的设备参数（支持 `{cpu}` 占位符）
+- LINK_DEVICE_FLAGS：链接器的设备参数（支持 `{cpu}` 占位符）
+- LINK_SCRIPT_FLAG：链接脚本参数前缀（如 `-T`、`--scatter`）
+
 ## 命令行选项
 
 | 选项 | 说明 |
@@ -149,32 +156,29 @@ POST_ACTION = "$OBJCOPY -O binary $TARGET build/stm32f103.bin"
 | `--attach=NAME` | 应用 attachconfig 方案（`?` 查看列表，`default` 恢复） |
 | `--verbose` | 显示完整编译命令 |
 | `--cross-compile=PREFIX` | 交叉编译器前缀 |
-| `--cpu=CPU` | 目标 CPU 类型 |
-| `--fpu=FPU` | FPU 类型 |
-| `--float-abi=ABI` | 浮点 ABI |
 
 ## 支持的工具链
 
 | 架构 | 配置模块 |
 |------|----------|
 | ARM | `ebuild.configs.arm_gcc` |
+| ARM (Keil MDK, ARMCC) | `ebuild.configs.armcc` |
+| ARM (Keil MDK, ARMCLANG) | `ebuild.configs.armclang` |
 | AArch64 | `ebuild.configs.aarch64_gcc` |
 | RISC-V | `ebuild.configs.riscv_gcc` |
 | Linux | `ebuild.configs.linux_gcc` |
+| Windows MSVC | `ebuild.configs.msvc` |
 
 ## 项目结构
 
 ```
 project/
-├── SConstruct              # 主构建脚本
+├── .config                 # menuconfig 配置输出
 ├── proj_config.py          # 项目配置
-├── Kconfig                 # 配置菜单定义
 ├── proj_config.h           # 生成的配置头文件
-├── .config                 # menuconfig 配置输出
-├── SConscript              # 组件注册脚本
-├── .vscode/                # VS Code 配置（导出后）
-├── CMakeLists.txt          # CMake 配置（导出后）
-└── *.uvprojx               # Keil 工程（导出后）
+├── Kconfig                 # 配置菜单定义
+├── SConstruct              # 主构建脚本
+└── SConscript              # 组件注册脚本
 ```
 
 ## 高级功能

ebuild/configs/armcc.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+"""Default config template for Keil MDK ARMCC (data only)."""
+
+CROSS_TOOL = "armcc"
+PLATFORM = "armcc"
+EXEC_PATH = ""
+CC_PREFIX = ""
+
+TOOLCHAIN_COMMANDS = {
+    "CC": "armcc",
+    "CXX": "armcc",
+    "AS": "armasm",
+    "AR": "armar",
+    "LINK": "armlink",
+    "SIZE": "fromelf",
+    "OBJDUMP": "fromelf",
+    "OBJCOPY": "fromelf",
+}
+
+BASE_CFLAGS = ["--c99"]
+BASE_CXXFLAGS = ["--cpp"]
+BASE_ASFLAGS = []
+BASE_LINKFLAGS = []
+BASE_DEFINES = ["armcc"]
+
+CPU_FLAG_FORMAT = "--cpu={cpu}"
+THUMB_FLAG = "--thumb"
+LINK_SCRIPT_FLAG = "--scatter"
+SECTION_FLAGS = []
+
+LINK_DEVICE_FLAGS = ["--cpu={cpu}"]

ebuild/configs/armclang.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+"""Default config template for Keil MDK ARMCLANG (data only)."""
+
+CROSS_TOOL = "armclang"
+PLATFORM = "armclang"
+EXEC_PATH = ""
+CC_PREFIX = ""
+
+TOOLCHAIN_COMMANDS = {
+    "CC": "armclang",
+    "CXX": "armclang",
+    "AS": "armasm",
+    "AR": "armar",
+    "LINK": "armlink",
+    "SIZE": "fromelf",
+    "OBJDUMP": "fromelf",
+    "OBJCOPY": "fromelf",
+}
+
+BASE_CFLAGS = ["-std=c99"]
+BASE_CXXFLAGS = ["-std=c++11"]
+BASE_ASFLAGS = []
+BASE_LINKFLAGS = []
+BASE_DEFINES = ["armclang"]
+
+DEVICE_FLAGS = ["-mcpu={cpu}", "-mthumb", "-ffunction-sections", "-fdata-sections"]
+AS_DEVICE_FLAGS = ["--cpu={cpu}", "--thumb"]
+LINK_DEVICE_FLAGS = ["--cpu={cpu}"]
+LINK_SCRIPT_FLAG = "--scatter"

ebuild/configs/msvc.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+"""Default config template for Windows MSVC (data only)."""
+
+CROSS_TOOL = "msvc"
+EXEC_PATH = ""
+CC_PREFIX = ""
+
+TOOLCHAIN_COMMANDS = {
+    "CC": "cl",
+    "CXX": "cl",
+    "AS": "ml",
+    "AR": "lib",
+    "LINK": "link",
+    "SIZE": "",
+    "OBJDUMP": "dumpbin",
+    "OBJCOPY": "",
+}
+
+ARFLAGS = None
+USE_ASPPCOM = False
+
+BASE_CFLAGS = []
+BASE_CXXFLAGS = []
+BASE_ASFLAGS = []
+BASE_LINKFLAGS = []
+BASE_DEFINES = ["msvc"]

ebuild/system.py

@@ -264,33 +264,48 @@ def apply_toolchain_options(self, base_cflags: Optional[List[str]] = None) -> To
         from SCons.Script import GetOption
 
         cflags = list(base_cflags) if base_cflags else []
+        cc_flags: List[str] = []
+        arch_flags: List[str] = []
 
         def option_value(name: str, default: str = "") -> str:
             value = GetOption(name)
             return value or default
 
         cc_prefix = option_value('cross-compile', '')
         if cc_prefix:
-            self.env['CC'] = cc_prefix + 'gcc'
-            self.env['AR'] = cc_prefix + 'ar'
-            self.env['AS'] = cc_prefix + 'gcc'
-            self.env['RANLIB'] = cc_prefix + 'ranlib'
-            cflags.append('-ffreestanding')
+            commands = {
+                "CC": "gcc",
+                "CXX": "g++",
+                "AS": "gcc",
+                "AR": "ar",
+                "LINK": "gcc",
+                "SIZE": "size",
+                "OBJDUMP": "objdump",
+                "OBJCOPY": "objcopy",
+                "RANLIB": "ranlib",
+            }
+            for key, value in commands.items():
+                self.env[key] = cc_prefix + value
+            cc_flags.append('-ffreestanding')
 
         cpu = option_value('cpu', '')
         if cpu:
-            cflags.append(f'-mcpu={cpu}')
+            arch_flags.append(f'-mcpu={cpu}')
 
         fpu = option_value('fpu', '')
         if fpu:
-            cflags.append(f'-mfpu={fpu}')
+            arch_flags.append(f'-mfpu={fpu}')
 
         float_abi = option_value('float-abi', '')
         if float_abi:
-            cflags.append(f'-mfloat-abi={float_abi}')
+            arch_flags.append(f'-mfloat-abi={float_abi}')
 
         if cflags:
             self.env.Append(CFLAGS=cflags)
+        if cc_flags or arch_flags:
+            self.env.Append(CCFLAGS=cc_flags + arch_flags)
+        if arch_flags:
+            self.env.Append(ASFLAGS=arch_flags, LINKFLAGS=arch_flags)
 
         build_program = not cc_prefix
         return ToolchainSettings(cc_prefix=cc_prefix, build_program=build_program)
@@ -385,4 +400,5 @@ def prepare(env, workspace_root: Optional[str] = None, project_root: Optional[st
             from .toolchain import setup_project
 
             setup_project(env, build.project_root, config_module)
+    build.apply_toolchain_options()
     return build