Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

boards/sim: fix cxx build break

Browse Source 
revert commit:

commit ecd66eb90c
Author: YAMAMOTO Takashi <yamamoto@midokura.com>
Date:   Fri Oct 23 09:28:27 2020 +0900

    sim: libcxx: Use __GLIBCXX__ ABI for non macOS

-----------------------------------------------------------------
commit 3fc06ff2d1
Author: YAMAMOTO Takashi <yamamoto@midokura.com>
Date:   Thu Oct 22 10:47:08 2020 +0900

    sim: Specify -fshort-wchar as NuttX wchar_t is 16-bit
-----------------------------------------------------------------

Change-Id: Idefd81ca3b0a88a38fcdfa0796c1a2897b4a015b
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an
2021-08-10 11:42:59 +08:00
parent 7afb3354cc
commit 0c06c44258
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/sim/sim/sim/scripts/Make.defs
+3 -16
View File
@@ -98,13 +98,10 @@ OBJDUMP = $(CROSSDEV)objdump
# Note: -fshort-wchar for the case where NuttX and the host OS have
# different wchar_t. On NuttX, it's uint16_t. On macOS, it's 32-bit.
CFLAGS := $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
$(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe \
-fshort-wchar
$(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
CXXFLAGS := $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
$(ARCHCPUFLAGSXX) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe \
-fshort-wchar
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) \
-fshort-wchar
$(ARCHCPUFLAGSXX) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
AFLAGS := $(CFLAGS) -D__ASSEMBLY__
ifeq ($(CONFIG_LIBCXX),y)
@@ -117,16 +114,6 @@ ifeq ($(CONFIG_LIBCXX),y)
# (boards/arm/stm32l4/nucleo-l476rg/scripts/Make.defs)
# * libs/libxx/libcxx/src/barrier.cpp depends on aligned new
CXXFLAGS += -std=c++17
ifeq ($(CONFIG_HOST_MACOS),y)
# macOS uses libc++abi
CXXFLAGS += -DLIBCXX_BUILDING_LIBCXXABI
else
# Linux C++ ABI seems vary.
# Probably __GLIBCXX__ is the best bet.
# XXX what to do for windows?
CXXFLAGS += -D__GLIBCXX__
endif
endif
# Loadable module definitions