You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/04/16 16:58:38 UTC
[incubator-nuttx] branch master updated (3a015d56b0 -> c08d9047b2)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from 3a015d56b0 Fixed a compile error, presumably caused by C&P error.
new aed21ba0bc arch/armv[7|8]m: enhance the clang support
new c08d9047b2 arch/Toolchain.defs: replace all ${/$} with $(/$)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/arm/Toolchain.defs | 6 +--
arch/arm/src/armv6-m/Toolchain.defs | 6 +--
arch/arm/src/armv7-a/Toolchain.defs | 6 +--
arch/arm/src/armv7-m/Toolchain.defs | 93 ++++++++++++++++++++++++++---------
arch/arm/src/armv7-r/Toolchain.defs | 6 +--
arch/arm/src/armv8-m/Toolchain.defs | 88 +++++++++++++++++++++++++++------
arch/avr/src/avr/Toolchain.defs | 6 +--
arch/avr/src/avr32/Toolchain.defs | 6 +--
arch/mips/src/mips32/Toolchain.defs | 6 +--
arch/misoc/src/lm32/Toolchain.defs | 6 +--
arch/misoc/src/minerva/Toolchain.defs | 6 +--
arch/or1k/src/mor1kx/Toolchain.defs | 6 +--
arch/risc-v/src/common/Toolchain.defs | 6 +--
arch/xtensa/src/lx6/Toolchain.defs | 6 +--
arch/xtensa/src/lx7/Toolchain.defs | 6 +--
arch/z16/src/z16f/Toolchain.defs | 20 ++++----
arch/z80/src/ez80/Toolchain.defs | 20 ++++----
arch/z80/src/z8/Toolchain.defs | 22 ++++-----
18 files changed, 212 insertions(+), 109 deletions(-)
[incubator-nuttx] 01/02: arch/armv[7|8]m: enhance the clang support
Posted by xi...@apache.org.
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/incubator-nuttx.git
commit aed21ba0bcb3c128f1b4a327f3a8c72d7be4215b
Author: chao.an <an...@xiaomi.com>
AuthorDate: Wed Apr 13 16:12:44 2022 +0800
arch/armv[7|8]m: enhance the clang support
Signed-off-by: chao.an <an...@xiaomi.com>
---
arch/arm/src/armv7-m/Toolchain.defs | 93 ++++++++++++++++++++++++++++---------
arch/arm/src/armv8-m/Toolchain.defs | 88 ++++++++++++++++++++++++++++-------
2 files changed, 142 insertions(+), 39 deletions(-)
diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs
index 5aed01a508..1c45efff8f 100644
--- a/arch/arm/src/armv7-m/Toolchain.defs
+++ b/arch/arm/src/armv7-m/Toolchain.defs
@@ -71,6 +71,8 @@ endif
ifeq ($(CONFIG_DEBUG_CUSTOMOPT),y)
MAXOPTIMIZATION := $(CONFIG_DEBUG_OPTLEVEL)
+else ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CLANG)
+ MAXOPTIMIZATION ?= -Oz
else
MAXOPTIMIZATION ?= -Os
endif
@@ -118,6 +120,28 @@ else
TOOLCHAIN_MFLOAT += -mfloat-abi=soft
endif
+# Clang Configuration files
+
+ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CLANG)
+
+ ifeq ($(CONFIG_ARCH_CORTEXM4),y)
+ ifeq ($(CONFIG_ARCH_FPU),y)
+ TOOLCHAIN_MARCH += --config armv7em_hard_fpv4_sp_d16_nosys
+ else
+ TOOLCHAIN_MARCH += --config armv7em_soft_nofp_nosys
+ endif
+ else ifeq ($(CONFIG_ARCH_CORTEXM7),y)
+ ifeq ($(CONFIG_ARCH_FPU),y)
+ TOOLCHAIN_MARCH += --config armv7em_hard_fpv5_d16_nosys
+ else
+ TOOLCHAIN_MARCH += --config armv7em_soft_nofp_nosys
+ endif
+ else # ifeq ($(CONFIG_ARCH_CORTEXM3),y)
+ TOOLCHAIN_MARCH += --config armv7m_soft_nofp_nosys
+ endif
+
+endif
+
# NuttX buildroot under Linux or Cygwin
ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),BUILDROOT)
@@ -141,6 +165,43 @@ ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),GNU_EABI)
ARCHCPUFLAGS = $(TOOLCHAIN_MARCH) $(TOOLCHAIN_MTUNE) -mthumb $(TOOLCHAIN_MFLOAT)
endif
+# Clang toolchain
+
+ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CLANG)
+ ARCHCPUFLAGS = $(TOOLCHAIN_MARCH) $(TOOLCHAIN_MTUNE) $(TOOLCHAIN_MFLOAT)
+
+ CC = clang
+ CXX = clang++
+ CPP = clang -E -P -x c
+ LD = ld.lld -m armelf
+ STRIP = llvm-strip --strip-unneeded
+ AR = llvm-ar rcs
+ NM = llvm-nm
+ OBJCOPY = llvm-objcopy
+ OBJDUMP = llvm-objdump
+
+ # Since the no_builtin attribute is not fully supported on Clang
+ # disable the built-in functions, refer:
+ # https://github.com/apache/incubator-nuttx/pull/5971
+
+ MAXOPTIMIZATION += -fno-builtin
+
+# Default toolchain
+
+else
+ CC = $(CROSSDEV)gcc
+ CXX = $(CROSSDEV)g++
+ CPP = $(CROSSDEV)gcc -E -P -x c
+ LD = $(CROSSDEV)ld
+ STRIP = $(CROSSDEV)strip --strip-unneeded
+ AR = $(CROSSDEV)ar rcs
+ NM = $(CROSSDEV)nm
+ OBJCOPY = $(CROSSDEV)objcopy
+ OBJDUMP = $(CROSSDEV)objdump
+endif
+
+# Architecture flags
+
ARCHCFLAGS =
ARCHCXXFLAGS =
@@ -152,35 +213,21 @@ ifneq ($(CONFIG_CXX_RTTI),y)
ARCHCXXFLAGS += -fno-rtti
endif
-# Clang toolchain
+# Add the builtin library
-ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CLANG)
- CROSSDEV ?= arm-none-eabi-
- ARCHCPUFLAGS = -target arm-none-eabi $(TOOLCHAIN_MARCH) $(TOOLCHAIN_MTUNE) $(TOOLCHAIN_MFLOAT)
- CC = clang
- CXX = clang++
- CPP = clang -E -P -x c
-else
- CC = $(CROSSDEV)gcc
- CXX = $(CROSSDEV)g++
- CPP = $(CROSSDEV)gcc -E -P -x c
+COMPILER_RT_LIB = $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name)
+ifeq ($(wildcard $(COMPILER_RT_LIB)),)
+ # if "--print-libgcc-file-name" unable to find the correct libgcc PATH
+ # then go ahead and try "--print-file-name"
+ COMPILER_RT_LIB := $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name $(notdir $(COMPILER_RT_LIB))))
endif
-LD = $(CROSSDEV)ld
-STRIP = $(CROSSDEV)strip --strip-unneeded
-AR = $(CROSSDEV)ar rcs
-NM = $(CROSSDEV)nm
-OBJCOPY = $(CROSSDEV)objcopy
-OBJDUMP = $(CROSSDEV)objdump
-
-# Add the builtin library
-
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(COMPILER_RT_LIB)
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/arm/src/armv8-m/Toolchain.defs b/arch/arm/src/armv8-m/Toolchain.defs
index cfa14bfc1a..81321ea145 100644
--- a/arch/arm/src/armv8-m/Toolchain.defs
+++ b/arch/arm/src/armv8-m/Toolchain.defs
@@ -71,6 +71,8 @@ endif
ifeq ($(CONFIG_DEBUG_CUSTOMOPT),y)
MAXOPTIMIZATION := $(CONFIG_DEBUG_OPTLEVEL)
+else ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),CLANG)
+ MAXOPTIMIZATION ?= -Oz
else
MAXOPTIMIZATION ?= -Os
endif
@@ -82,6 +84,7 @@ else
endif
# Parametrization for ARCHCPUFLAGS
+
ifeq ($(CONFIG_ARCH_CORTEXM23),y)
TOOLCHAIN_MTUNE := -mtune=cortex-m23
TOOLCHAIN_MARCH := -march=armv8-m.main
@@ -120,6 +123,34 @@ else
TOOLCHAIN_MFLOAT += -mfloat-abi=soft
endif
+# Clang Configuration files
+
+ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),CLANG)
+
+ ifeq ($(CONFIG_ARCH_CORTEXM23),y)
+ TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp_nosys
+ else ifeq ($(CONFIG_ARCH_CORTEXM33),y)
+ ifeq ($(CONFIG_ARCH_FPU),y)
+ TOOLCHAIN_MARCH += --config armv8m.main_hard_fp_nosys
+ else
+ TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp_nosys
+ endif
+ else ifeq ($(CONFIG_ARCH_CORTEXM35P),y)
+ ifeq ($(CONFIG_ARCH_FPU),y)
+ TOOLCHAIN_MARCH += --config armv8m.main_hard_fp_nosys
+ else
+ TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp_nosys
+ endif
+ else ifeq ($(CONFIG_ARCH_CORTEXM55),y)
+ ifeq ($(CONFIG_ARCH_FPU),y)
+ TOOLCHAIN_MARCH += --config armv8.1m.main_hard_fp_nosys
+ else
+ TOOLCHAIN_MARCH += --config armv8.1m.main_soft_nofp_nomve_nosys
+ endif
+ endif
+
+endif
+
# NuttX buildroot under Linux or Cygwin
ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),BUILDROOT)
@@ -146,10 +177,40 @@ endif
# Clang toolchain
ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),CLANG)
- CROSSDEV ?= arm-none-eabi-
ARCHCPUFLAGS = $(TOOLCHAIN_MARCH) $(TOOLCHAIN_MTUNE) -mthumb $(TOOLCHAIN_MFLOAT)
+
+ CC = clang
+ CXX = clang++
+ CPP = clang -E -P -x c
+ LD = ld.lld -m armelf
+ STRIP = llvm-strip --strip-unneeded
+ AR = llvm-ar rcs
+ NM = llvm-nm
+ OBJCOPY = llvm-objcopy
+ OBJDUMP = llvm-objdump
+
+ # Since the no_builtin attribute is not fully supported on Clang
+ # disable the built-in functions, refer:
+ # https://github.com/apache/incubator-nuttx/pull/5971
+
+ MAXOPTIMIZATION += -fno-builtin
+
+# Default toolchain
+
+else
+ CC = $(CROSSDEV)gcc
+ CXX = $(CROSSDEV)g++
+ CPP = $(CROSSDEV)gcc -E -P -x c
+ LD = $(CROSSDEV)ld
+ STRIP = $(CROSSDEV)strip --strip-unneeded
+ AR = $(CROSSDEV)ar rcs
+ NM = $(CROSSDEV)nm
+ OBJCOPY = $(CROSSDEV)objcopy
+ OBJDUMP = $(CROSSDEV)objdump
endif
+# Architecture flags
+
ARCHCFLAGS =
ARCHCXXFLAGS =
@@ -161,26 +222,21 @@ ifneq ($(CONFIG_CXX_RTTI),y)
ARCHCXXFLAGS += -fno-rtti
endif
-# Default toolchain
-
-CC = $(CROSSDEV)gcc
-CXX = $(CROSSDEV)g++
-CPP = $(CROSSDEV)gcc -E -P -x c
-LD = $(CROSSDEV)ld
-STRIP = $(CROSSDEV)strip --strip-unneeded
-AR = $(CROSSDEV)ar rcs
-NM = $(CROSSDEV)nm
-OBJCOPY = $(CROSSDEV)objcopy
-OBJDUMP = $(CROSSDEV)objdump
-
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+COMPILER_RT_LIB = $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name)
+ifeq ($(wildcard $(COMPILER_RT_LIB)),)
+ # if "--print-libgcc-file-name" unable to find the correct libgcc PATH
+ # then go ahead and try "--print-file-name"
+ COMPILER_RT_LIB := $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name $(notdir $(COMPILER_RT_LIB))))
+endif
+
+EXTRA_LIBS += $(COMPILER_RT_LIB)
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
[incubator-nuttx] 02/02: arch/Toolchain.defs: replace all ${/$} with $(/$)
Posted by xi...@apache.org.
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/incubator-nuttx.git
commit c08d9047b2f33d361c8a810134e248ab888465b8
Author: chao.an <an...@xiaomi.com>
AuthorDate: Fri Apr 15 15:05:16 2022 +0800
arch/Toolchain.defs: replace all ${/$} with $(/$)
Signed-off-by: chao.an <an...@xiaomi.com>
---
arch/arm/src/arm/Toolchain.defs | 6 +++---
arch/arm/src/armv6-m/Toolchain.defs | 6 +++---
arch/arm/src/armv7-a/Toolchain.defs | 6 +++---
arch/arm/src/armv7-r/Toolchain.defs | 6 +++---
arch/avr/src/avr/Toolchain.defs | 6 +++---
arch/avr/src/avr32/Toolchain.defs | 6 +++---
arch/mips/src/mips32/Toolchain.defs | 6 +++---
arch/misoc/src/lm32/Toolchain.defs | 6 +++---
arch/misoc/src/minerva/Toolchain.defs | 6 +++---
arch/or1k/src/mor1kx/Toolchain.defs | 6 +++---
arch/risc-v/src/common/Toolchain.defs | 6 +++---
arch/xtensa/src/lx6/Toolchain.defs | 6 +++---
arch/xtensa/src/lx7/Toolchain.defs | 6 +++---
arch/z16/src/z16f/Toolchain.defs | 20 ++++++++++----------
arch/z80/src/ez80/Toolchain.defs | 20 ++++++++++----------
arch/z80/src/z8/Toolchain.defs | 22 +++++++++++-----------
16 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/arch/arm/src/arm/Toolchain.defs b/arch/arm/src/arm/Toolchain.defs
index 39bd95af80..2af7790b24 100644
--- a/arch/arm/src/arm/Toolchain.defs
+++ b/arch/arm/src/arm/Toolchain.defs
@@ -118,12 +118,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/arm/src/armv6-m/Toolchain.defs b/arch/arm/src/armv6-m/Toolchain.defs
index 1f2e8e1f3e..4270fd0899 100644
--- a/arch/arm/src/armv6-m/Toolchain.defs
+++ b/arch/arm/src/armv6-m/Toolchain.defs
@@ -110,12 +110,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/arm/src/armv7-a/Toolchain.defs b/arch/arm/src/armv7-a/Toolchain.defs
index d940b39103..465f0c220f 100644
--- a/arch/arm/src/armv7-a/Toolchain.defs
+++ b/arch/arm/src/armv7-a/Toolchain.defs
@@ -165,12 +165,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/arm/src/armv7-r/Toolchain.defs b/arch/arm/src/armv7-r/Toolchain.defs
index f819f3be89..06186dd881 100644
--- a/arch/arm/src/armv7-r/Toolchain.defs
+++ b/arch/arm/src/armv7-r/Toolchain.defs
@@ -141,12 +141,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/avr/src/avr/Toolchain.defs b/arch/avr/src/avr/Toolchain.defs
index bed4f32ea5..c2d23892cb 100644
--- a/arch/avr/src/avr/Toolchain.defs
+++ b/arch/avr/src/avr/Toolchain.defs
@@ -126,12 +126,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/avr/src/avr32/Toolchain.defs b/arch/avr/src/avr32/Toolchain.defs
index 87b61352b9..851503f71c 100644
--- a/arch/avr/src/avr32/Toolchain.defs
+++ b/arch/avr/src/avr32/Toolchain.defs
@@ -50,12 +50,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/mips/src/mips32/Toolchain.defs b/arch/mips/src/mips32/Toolchain.defs
index 5a89a868d6..ef928fe8e6 100644
--- a/arch/mips/src/mips32/Toolchain.defs
+++ b/arch/mips/src/mips32/Toolchain.defs
@@ -279,12 +279,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/misoc/src/lm32/Toolchain.defs b/arch/misoc/src/lm32/Toolchain.defs
index 7207180965..0ba33d9da0 100644
--- a/arch/misoc/src/lm32/Toolchain.defs
+++ b/arch/misoc/src/lm32/Toolchain.defs
@@ -87,12 +87,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/misoc/src/minerva/Toolchain.defs b/arch/misoc/src/minerva/Toolchain.defs
index a75c4468b2..eddd3fc264 100644
--- a/arch/misoc/src/minerva/Toolchain.defs
+++ b/arch/misoc/src/minerva/Toolchain.defs
@@ -41,12 +41,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/or1k/src/mor1kx/Toolchain.defs b/arch/or1k/src/mor1kx/Toolchain.defs
index 43320d7a09..8fc28358f5 100644
--- a/arch/or1k/src/mor1kx/Toolchain.defs
+++ b/arch/or1k/src/mor1kx/Toolchain.defs
@@ -68,12 +68,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/risc-v/src/common/Toolchain.defs b/arch/risc-v/src/common/Toolchain.defs
index a9b4f97e18..0be47e2679 100644
--- a/arch/risc-v/src/common/Toolchain.defs
+++ b/arch/risc-v/src/common/Toolchain.defs
@@ -144,12 +144,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/xtensa/src/lx6/Toolchain.defs b/arch/xtensa/src/lx6/Toolchain.defs
index 0390c06b77..e6a76079c8 100644
--- a/arch/xtensa/src/lx6/Toolchain.defs
+++ b/arch/xtensa/src/lx6/Toolchain.defs
@@ -94,12 +94,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/xtensa/src/lx7/Toolchain.defs b/arch/xtensa/src/lx7/Toolchain.defs
index c91be775f3..7b18be03b3 100644
--- a/arch/xtensa/src/lx7/Toolchain.defs
+++ b/arch/xtensa/src/lx7/Toolchain.defs
@@ -94,12 +94,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library
-EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}}
+EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
- EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}
+ EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif
diff --git a/arch/z16/src/z16f/Toolchain.defs b/arch/z16/src/z16f/Toolchain.defs
index 4b963f4a17..e11e10e0d5 100644
--- a/arch/z16/src/z16f/Toolchain.defs
+++ b/arch/z16/src/z16f/Toolchain.defs
@@ -43,7 +43,7 @@ endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSINSTALLDIR = $(INSTALLROOT)/ZDSII_ZNEO_$(ZDSVERSION)
- INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
+ INSTALLDIR = $(shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g")
ZDSBINDIR = $(INSTALLDIR)\bin
ZDSSTDINCDIR = $(INSTALLDIR)\include\std
ZDSZILOGINCDIR = $(INSTALLDIR)\include\zilog
@@ -51,7 +51,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSZILOGLIBDIR = $(INSTALLDIR)\lib\zilog
else
ZDSINSTALLDIR = $(INSTALLROOT)/ZDSII_ZNEO_$(ZDSVERSION)
- INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
+ INSTALLDIR = $(shell cygpath -u "$(ZDSINSTALLDIR)")
ZDSBINDIR = $(INSTALLDIR)/bin
ZDSSTDINCDIR = $(INSTALLDIR)/include/std
ZDSZILOGINCDIR = $(INSTALLDIR)/include/zilog
@@ -61,17 +61,17 @@ else
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
- WTOPDIR = ${shell cygpath -w "$(TOPDIR)"}
- WZDSSTDINCDIR = ${shell cygpath -w "$(ZDSSTDINCDIR)"}
- WZDSZILOGINCDIR = ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
- WZDSSTDLIBDIR = ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
- WZDSZILOGLIBDIR = ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
+ WTOPDIR = $(shell cygpath -w "$(TOPDIR)")
+ WZDSSTDINCDIR = $(shell cygpath -w "$(ZDSSTDINCDIR)")
+ WZDSZILOGINCDIR = $(shell cygpath -w "$(ZDSZILOGINCDIR)")
+ WZDSSTDLIBDIR = $(shell cygpath -w "$(ZDSSTDLIBDIR)")
+ WZDSZILOGLIBDIR = $(shell cygpath -w "$(ZDSZILOGLIBDIR)")
# Escaped versions
- ETOPDIR = ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
- EZDSSTDINCDIR = ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
- EZDSZILOGINCDIR = ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
+ ETOPDIR = $(shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g")
+ EZDSSTDINCDIR = $(shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g")
+ EZDSZILOGINCDIR = $(shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g")
endif
# CPU Identification
diff --git a/arch/z80/src/ez80/Toolchain.defs b/arch/z80/src/ez80/Toolchain.defs
index 87c094eff0..10821d2483 100644
--- a/arch/z80/src/ez80/Toolchain.defs
+++ b/arch/z80/src/ez80/Toolchain.defs
@@ -114,14 +114,14 @@ endif
ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
- INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
+ INSTALLDIR = $(shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g")
ZDSBINDIR := $(INSTALLDIR)\bin
ZDSSTDINCDIR := $(INSTALLDIR)\include\std
ZDSZILOGINCDIR := $(INSTALLDIR)\include\zilog
ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
else
- INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
+ INSTALLDIR = $(shell cygpath -u "$(ZDSINSTALLDIR)")
ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
@@ -131,17 +131,17 @@ else
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
- WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
- WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
- WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
- WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
- WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
+ WTOPDIR := $(shell cygpath -w "$(TOPDIR)")
+ WZDSSTDINCDIR := $(shell cygpath -w "$(ZDSSTDINCDIR)")
+ WZDSZILOGINCDIR := $(shell cygpath -w "$(ZDSZILOGINCDIR)")
+ WZDSSTDLIBDIR := $(shell cygpath -w "$(ZDSSTDLIBDIR)")
+ WZDSZILOGLIBDIR := $(shell cygpath -w "$(ZDSZILOGLIBDIR)")
# Escaped versions
- ETOPDIR := ${shell echo $(WTOPDIR) | sed -e "s/ /%20/g"}
- EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
- EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
+ ETOPDIR := $(shell echo $(WTOPDIR) | sed -e "s/ /%20/g")
+ EZDSSTDINCDIR := $(shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g")
+ EZDSZILOGINCDIR := $(shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g")
endif
# Optimization level
diff --git a/arch/z80/src/z8/Toolchain.defs b/arch/z80/src/z8/Toolchain.defs
index 5e0fbcb807..3284769867 100644
--- a/arch/z80/src/z8/Toolchain.defs
+++ b/arch/z80/src/z8/Toolchain.defs
@@ -35,7 +35,7 @@ endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
- INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
+ INSTALLDIR = $(shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g")
ZDSBINDIR = $(INSTALLDIR)\bin
ZDSSTDINCDIR = $(INSTALLDIR)\include\std
ZDSZILOGINCDIR = $(INSTALLDIR)\include\zilog
@@ -49,7 +49,7 @@ endif
ZDSZILOGLIBDIR = $(INSTALLDIR)\lib\zilog
else
ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
- INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
+ INSTALLDIR = $(shell cygpath -u "$(ZDSINSTALLDIR)")
ZDSBINDIR = $(INSTALLDIR)/bin
ZDSSTDINCDIR = $(INSTALLDIR)/include/std
ZDSZILOGINCDIR = $(INSTALLDIR)/include/zilog
@@ -65,18 +65,18 @@ endif
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
- WTOPDIR = ${shell cygpath -w "$(TOPDIR)"}
- WZDSSTDINCDIR = ${shell cygpath -w "$(ZDSSTDINCDIR)"}
- WZDSZILOGINCDIR = ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
- WZDSDEVINCDIR = ${shell cygpath -w "$(ZDSDEVINCDIR)"}
- WZDSSTDLIBDIR = ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
- WZDSZILOGLIBDIR = ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
+ WTOPDIR = $(shell cygpath -w "$(TOPDIR)")
+ WZDSSTDINCDIR = $(shell cygpath -w "$(ZDSSTDINCDIR)")
+ WZDSZILOGINCDIR = $(shell cygpath -w "$(ZDSZILOGINCDIR)")
+ WZDSDEVINCDIR = $(shell cygpath -w "$(ZDSDEVINCDIR)")
+ WZDSSTDLIBDIR = $(shell cygpath -w "$(ZDSSTDLIBDIR)")
+ WZDSZILOGLIBDIR = $(shell cygpath -w "$(ZDSZILOGLIBDIR)")
# Escaped versions
- ETOPDIR = ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
- EZDSSTDINCDIR = ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
- EZDSZILOGINCDIR = ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
+ ETOPDIR = $(shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g")
+ EZDSSTDINCDIR = $(shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g")
+ EZDSZILOGINCDIR = $(shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g")
endif
# CPU Identification