boards/sim: Rename ARCHCPUFLAGS[XX] to ARCHC[XX]FLAGS

follow other board files usage

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2022-02-20 08:20:21 +08:00
committed by Petro Karashchenko
parent 7047ba1b79
commit 746b68befc
+13 -15
View File
@@ -59,10 +59,13 @@ ifeq ($(CONFIG_ARCH_COVERAGE),y)
ARCHOPTIMIZATION += -fprofile-arcs -ftest-coverage ARCHOPTIMIZATION += -fprofile-arcs -ftest-coverage
endif endif
ARCHCPUFLAGS = -fno-builtin # Add -fno-common because macOS "ld -r" doesn't seem to pick objects
ARCHCPUFLAGSXX = -fno-builtin -nostdinc++ # for common symbols.
ARCHCFLAGS = -fno-common -fno-builtin
ARCHCXXFLAGS = -fno-common -fno-builtin -nostdinc++
ifeq ($(CONFIG_CXX_EXCEPTION),) ifeq ($(CONFIG_CXX_EXCEPTION),)
ARCHCPUFLAGSXX += -fno-exceptions -fcheck-new ARCHCXXFLAGS += -fno-exceptions -fcheck-new
endif endif
ARCHPICFLAGS = -fpic ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
@@ -71,17 +74,12 @@ ARCHWARNINGSXX = -Wall -Wshadow -Wundef
# Add -fvisibility=hidden # Add -fvisibility=hidden
# Because we don't want export nuttx's symbols to share libraries # Because we don't want export nuttx's symbols to share libraries
ARCHCPUFLAGS += -fvisibility=hidden ARCHCFLAGS += -fvisibility=hidden
ARCHCPUFLAGSXX += -fvisibility=hidden ARCHCXXFLAGS += -fvisibility=hidden
# Add -fno-common because macOS "ld -r" doesn't seem to pick objects
# for common symbols.
ARCHCPUFLAGS += -fno-common
ARCHCPUFLAGSXX += -fno-common
ifeq ($(CONFIG_SIM_M32),y) ifeq ($(CONFIG_SIM_M32),y)
ARCHCPUFLAGS += -m32 ARCHCFLAGS += -m32
ARCHCPUFLAGSXX += -m32 ARCHCXXFLAGS += -m32
endif endif
CC = $(CROSSDEV)cc CC = $(CROSSDEV)cc
@@ -101,9 +99,9 @@ OBJDUMP = $(CROSSDEV)objdump
RUSTC = rustc --edition 2021 RUSTC = rustc --edition 2021
CFLAGS := $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ CFLAGS := $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
$(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe $(ARCHCFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
CXXFLAGS := $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \ CXXFLAGS := $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
$(ARCHCPUFLAGSXX) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe $(ARCHCXXFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
AFLAGS := $(CFLAGS) -D__ASSEMBLY__ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
RUSTFLAGS := $(ARCHOPTIMIZATIONRUST) RUSTFLAGS := $(ARCHOPTIMIZATIONRUST)
@@ -244,4 +242,4 @@ else
endif endif
HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
$(ARCHCPUFLAGS) $(HOSTINCLUDES) $(EXTRAFLAGS) -D__SIM__ -pipe $(ARCHCFLAGS) $(HOSTINCLUDES) $(EXTRAFLAGS) -D__SIM__ -pipe