This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new e2a51ee856 qemu-i486: Simplify Make.defs by include Toolchain.defs
e2a51ee856 is described below
commit e2a51ee8568d316c6389dfc7a997294a3f324537
Author: Huang Qi <huang...@xiaomi.com>
AuthorDate: Sun Jan 26 20:40:42 2025 +0800
qemu-i486: Simplify Make.defs by include Toolchain.defs
Summary:
- Simplified `Make.defs` by including `Toolchain.defs` from the x86 common
directory
- Removed redundant toolchain and flag definitions, consolidating them into
a single shared file
Impact:
- Reduces code duplication and improves maintainability by centralizing
toolchain configurations
- No functional changes - the build process remains the same, but the
configuration is now more modular and reusable
Signed-off-by: Huang Qi <huang...@xiaomi.com>
---
boards/x86/qemu/qemu-i486/scripts/Make.defs | 41 +----------------------------
1 file changed, 1 insertion(+), 40 deletions(-)
diff --git a/boards/x86/qemu/qemu-i486/scripts/Make.defs
b/boards/x86/qemu/qemu-i486/scripts/Make.defs
index 8fe92e276c..af40c3633f 100644
--- a/boards/x86/qemu/qemu-i486/scripts/Make.defs
+++ b/boards/x86/qemu/qemu-i486/scripts/Make.defs
@@ -22,47 +22,8 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
- ARCHOPTIMIZATION = -g
-endif
-
-ifneq ($(CONFIG_DEBUG_NOOPT),y)
- ARCHOPTIMIZATION += -O2
-endif
+include $(TOPDIR)/arch/x86/src/common/Toolchain.defs
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)qemu.ld
-ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-stack-protector
-ARCHPICFLAGS = -fpic
-ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
-
-# Check if building a 32-bit target with a 64-bit toolchain
-
-ifeq ($(CONFIG_ARCH_X86_M32),y)
-ARCHCPUFLAGS += -m32
-LDFLAGS += -m elf_i386
-endif
-
-# We have to use a cross-development toolchain under Cygwin because the native
-# Cygwin toolchains don't generate ELF binaries.
-
-ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
-CROSSDEV = i486-nuttx-elf-
-endif
-
-CC = $(CROSSDEV)gcc
-CPP = $(CROSSDEV)gcc -E
-LD = $(CROSSDEV)ld
-STRIP = $(CROSSDEV)strip --strip-unneeded
-AR = $(CROSSDEV)ar rcs
-NM = $(CROSSDEV)nm
-OBJCOPY = $(CROSSDEV)objcopy
-OBJDUMP = $(CROSSDEV)objdump
-
-CFLAGS := $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES)
$(ARCHDEFINES) $(EXTRAFLAGS) -pipe
-CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
EXEEXT = .elf
-
