You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2020/07/22 05:11:45 UTC
[incubator-nuttx] branch master updated (6c03a4e -> b4b413e)
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 6c03a4e libc: Add uuid implemenation
new 1a901d7 board/arm: Remove -march and -mcpu option
new b4b413e arch/arm/src/arm/Toolchain.defs: Append "-P -x c" for CPP macro
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 | 2 +-
boards/arm/stm32/stm32f4discovery/scripts/Make.defs | 4 ++--
boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
[incubator-nuttx] 01/02: board/arm: Remove -march and -mcpu option
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 1a901d72c07e6f6b3972f34296ec1a458fa5627f
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Jul 21 11:14:30 2020 +0800
board/arm: Remove -march and -mcpu option
Already add in arch/arm/src/armv7-m/Toolchain.defs
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/arm/stm32/stm32f4discovery/scripts/Make.defs | 4 ++--
boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/boards/arm/stm32/stm32f4discovery/scripts/Make.defs b/boards/arm/stm32/stm32f4discovery/scripts/Make.defs
index 21cbd96..59aa60b 100644
--- a/boards/arm/stm32/stm32f4discovery/scripts/Make.defs
+++ b/boards/arm/stm32/stm32f4discovery/scripts/Make.defs
@@ -45,8 +45,8 @@ ARCHWARNINGSXX = -Wall -Wshadow -Wundef
ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_CLANGL),y)
- ARCHCFLAGS += -nostdlib -ffreestanding -target arm-none-eabi -march=armv7-m -mcpu=cortex-m4
- ARCHCXXFLAGS += -nostdlib -ffreestanding -target arm-none-eabi -march=armv7-m -mcpu=cortex-m4 -DCONFIG_WCHAR_BUILTIN
+ ARCHCFLAGS += -nostdlib -ffreestanding
+ ARCHCXXFLAGS += -nostdlib -ffreestanding -DCONFIG_WCHAR_BUILTIN
else
ARCHCFLAGS += -funwind-tables
ARCHCXXFLAGS += -fno-rtti -funwind-tables
diff --git a/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs b/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs
index c687a90..2639e5b 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs
+++ b/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs
@@ -53,8 +53,8 @@ ARCHCFLAGS = -fno-builtin
ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fcheck-new -fno-rtti
ifeq ($(CONFIG_ARMV7M_TOOLCHAIN_CLANGL),y)
- ARCHCFLAGS += -nostdlib -ffreestanding -target arm-none-eabi -march=armv7-m -mcpu=cortex-m7
- ARCHCXXFLAGS += -nostdlib -ffreestanding -target arm-none-eabi -march=armv7-m -mcpu=cortex-m7 -DCONFIG_WCHAR_BUILTIN
+ ARCHCFLAGS += -nostdlib -ffreestanding
+ ARCHCXXFLAGS += -nostdlib -ffreestanding -DCONFIG_WCHAR_BUILTIN
else
ARCHCXXFLAGS += -fno-rtti
ifneq ($(CONFIG_DEBUG_NOOPT),y)
[incubator-nuttx] 02/02: arch/arm/src/arm/Toolchain.defs: Append
"-P -x c" for CPP macro
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit b4b413e2f47ba238df9b12689af7b52893d5646a
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Jul 21 11:18:09 2020 +0800
arch/arm/src/arm/Toolchain.defs: Append "-P -x c" for CPP macro
like other Toolchain.defs
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/arm/Toolchain.defs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/arm/Toolchain.defs b/arch/arm/src/arm/Toolchain.defs
index c4ee756..b527699 100644
--- a/arch/arm/src/arm/Toolchain.defs
+++ b/arch/arm/src/arm/Toolchain.defs
@@ -87,7 +87,7 @@ endif
CC = $(CROSSDEV)gcc
CXX = $(CROSSDEV)g++
-CPP = $(CROSSDEV)gcc -E
+CPP = $(CROSSDEV)gcc -E -P -x c
LD = $(CROSSDEV)ld
STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)ar rcs