mirror of
https://github.com/apache/nuttx.git
synced 2026-05-31 14:27:37 +08:00
boards: Remove -std=c++1x from Make.defs
let the implementation of standard library choice what they want Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
committed by
Gustavo Henrique Nihei
parent
7f91fcdf89
commit
b12c0a1e31
@@ -41,7 +41,6 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHCFLAGS += -mabi=aapcs
|
ARCHCFLAGS += -mabi=aapcs
|
||||||
ARCHCXXFLAGS += -std=c++11
|
|
||||||
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
||||||
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
||||||
ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
|
ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
|
||||||
|
|||||||
@@ -41,10 +41,6 @@ CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
|
|||||||
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
|
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
|
||||||
AFLAGS := $(CFLAGS) -D__ASSEMBLY__
|
AFLAGS := $(CFLAGS) -D__ASSEMBLY__
|
||||||
|
|
||||||
ifeq ($(CONFIG_LIBCXX),y)
|
|
||||||
CXXFLAGS += -std=c++14
|
|
||||||
endif
|
|
||||||
|
|
||||||
NXFLATLDFLAGS1 = -r -d -warn-common
|
NXFLATLDFLAGS1 = -r -d -warn-common
|
||||||
NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
|
NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
|
||||||
LDNXFLATFLAGS = -e main -s 2048
|
LDNXFLATFLAGS = -e main -s 2048
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHCPUFLAGS += -mno-relax
|
ARCHCPUFLAGS += -mno-relax
|
||||||
ARCHCXXFLAGS += -std=c++17 -pipe
|
ARCHCXXFLAGS += -pipe
|
||||||
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
||||||
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
||||||
ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
|
ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHCFLAGS += -msmall-data-limit=0
|
ARCHCFLAGS += -msmall-data-limit=0
|
||||||
ARCHCXXFLAGS += -msmall-data-limit=0 -std=c++17
|
ARCHCXXFLAGS += -msmall-data-limit=0
|
||||||
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
||||||
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -116,16 +116,6 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
|
|||||||
RUSTFLAGS := $(ARCHOPTIMIZATIONRUST)
|
RUSTFLAGS := $(ARCHOPTIMIZATIONRUST)
|
||||||
|
|
||||||
ifeq ($(CONFIG_LIBCXX),y)
|
ifeq ($(CONFIG_LIBCXX),y)
|
||||||
# Why c++17?
|
|
||||||
# * libcxx seems to require c++11.
|
|
||||||
# * The compiler defaults varies:
|
|
||||||
# clang/macOS (from xcode): 199711L
|
|
||||||
# gcc/ubuntu: 201402L
|
|
||||||
# * There is a precedent to use c++14.
|
|
||||||
# (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)
|
ifeq ($(CONFIG_HOST_MACOS),y)
|
||||||
# macOS uses libc++abi
|
# macOS uses libc++abi
|
||||||
CXXFLAGS += -DLIBCXX_BUILDING_LIBCXXABI
|
CXXFLAGS += -DLIBCXX_BUILDING_LIBCXXABI
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
|
|||||||
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing
|
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHCXXFLAGS += -std=c++17
|
|
||||||
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
||||||
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
|
|||||||
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing
|
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHCXXFLAGS += -std=c++17
|
|
||||||
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
||||||
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
|
|||||||
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing
|
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHCXXFLAGS += -std=c++17
|
|
||||||
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
||||||
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
|
|||||||
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing
|
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHCXXFLAGS += -std=c++17
|
|
||||||
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
||||||
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
|
|||||||
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing
|
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHCXXFLAGS += -std=c++17
|
|
||||||
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
||||||
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
|
|||||||
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce
|
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCHCXXFLAGS += -std=c++17
|
|
||||||
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
|
||||||
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
|
||||||
ARCHPICFLAGS = -fpic
|
ARCHPICFLAGS = -fpic
|
||||||
|
|||||||
Reference in New Issue
Block a user