From b0fa2329185fa8b2e694cfd03391a0f18ba65703 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 13 Feb 2022 06:26:35 +0800 Subject: [PATCH] boards: Remove -D__NuttX__ from the individual Make.defs since it is defined globally in tools/Config.mk now Signed-off-by: Xiang Xiao --- Documentation/guides/cpp_cmake.rst | 2 +- boards/risc-v/bl602/bl602evb/scripts/Make.defs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/guides/cpp_cmake.rst b/Documentation/guides/cpp_cmake.rst index 498f5ed0b5..00c45bb21e 100644 --- a/Documentation/guides/cpp_cmake.rst +++ b/Documentation/guides/cpp_cmake.rst @@ -147,7 +147,7 @@ Creating the project set(AC_HW_FLAGS "-mcpu=cortex-m4 -mthumb -mfloat-abi=soft ") set(AC_HW_FLAGS "${AC_HW_FLAGS} -isystem ${NUTTX_PATH}/include") - set(AC_HW_FLAGS "${AC_HW_FLAGS} -pipe -D__NuttX__") + set(AC_HW_FLAGS "${AC_HW_FLAGS} -pipe") set(AC_LINKER_FLAGS "--entry=__start -nostartfiles -nodefaultlibs -T${MCU_LINKER_SCRIPT}") diff --git a/boards/risc-v/bl602/bl602evb/scripts/Make.defs b/boards/risc-v/bl602/bl602evb/scripts/Make.defs index 0ab4838258..76943d4ea7 100644 --- a/boards/risc-v/bl602/bl602evb/scripts/Make.defs +++ b/boards/risc-v/bl602/bl602evb/scripts/Make.defs @@ -46,7 +46,7 @@ endif ARCHCPUFLAGS += -mno-relax ARCHCFLAGS = -fno-common -fno-builtin -ffunction-sections -fdata-sections -ARCHCXXFLAGS = -fno-common -fno-builtin -ffunction-sections -fdata-sections -fno-exceptions -fcheck-new -std=c++17 -D__NuttX__ -pipe -nostdinc++ +ARCHCXXFLAGS = -fno-common -fno-builtin -ffunction-sections -fdata-sections -fno-exceptions -fcheck-new -std=c++17 -pipe -nostdinc++ ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHWARNINGSXX = -Wall -Wshadow -Wundef ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10