You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/05/15 12:40:44 UTC
[incubator-nuttx] 03/05: arch/sparc: Move toolchain macro from board's Make.defs to Toolchain.defs
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 4f090eb7fd128eadc56b9118622d39572dae806a
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu May 12 21:44:51 2022 +0800
arch/sparc: Move toolchain macro from board's Make.defs to Toolchain.defs
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/sparc/src/sparc_v8/Toolchain.defs | 10 ++++++++++
boards/sparc/bm3803/xx3803/scripts/Make.defs | 10 ----------
boards/sparc/bm3823/xx3823/scripts/Make.defs | 10 ----------
3 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/arch/sparc/src/sparc_v8/Toolchain.defs b/arch/sparc/src/sparc_v8/Toolchain.defs
index 67a04686a0..d46a893ac3 100644
--- a/arch/sparc/src/sparc_v8/Toolchain.defs
+++ b/arch/sparc/src/sparc_v8/Toolchain.defs
@@ -101,3 +101,13 @@ ifeq ($(CONFIG_SPARC_TOOLCHAIN),CODEREDW)
LDFLAGS += -nostartfiles -nodefaultlibs
LDSCRIPT = sparc-elf-debug.ld
endif
+
+CC = $(CROSSDEV)gcc
+CXX = $(CROSSDEV)g++
+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
diff --git a/boards/sparc/bm3803/xx3803/scripts/Make.defs b/boards/sparc/bm3803/xx3803/scripts/Make.defs
index ebb9f81a85..18c189fa57 100644
--- a/boards/sparc/bm3803/xx3803/scripts/Make.defs
+++ b/boards/sparc/bm3803/xx3803/scripts/Make.defs
@@ -28,16 +28,6 @@ ARCHSCRIPT += $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_
ARCHINCLUDES = -I. -isystem $(call CONVERT_PATH,$(TOPDIR)/include)
ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem $(call CONVERT_PATH,$(TOPDIR)/include/cxx)
-CC = $(CROSSDEV)gcc
-CXX = $(CROSSDEV)g++
-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
-
# ARCHOPTIMIZATION += -fno-zero-initialized-in-bss
# 20210818 zouboan
diff --git a/boards/sparc/bm3823/xx3823/scripts/Make.defs b/boards/sparc/bm3823/xx3823/scripts/Make.defs
index 15507a3853..6a956bc2b4 100644
--- a/boards/sparc/bm3823/xx3823/scripts/Make.defs
+++ b/boards/sparc/bm3823/xx3823/scripts/Make.defs
@@ -28,16 +28,6 @@ ARCHSCRIPT += $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_
ARCHINCLUDES = -I. -isystem $(call CONVERT_PATH,$(TOPDIR)/include)
ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem $(call CONVERT_PATH,$(TOPDIR)/include/cxx)
-CC = $(CROSSDEV)gcc
-CXX = $(CROSSDEV)g++
-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
-
# ARCHOPTIMIZATION += -fno-zero-initialized-in-bss
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef