diff --git a/arch/arm/src/arm/Toolchain.defs b/arch/arm/src/arm/Toolchain.defs index b9d3025b5fb..1884947359a 100644 --- a/arch/arm/src/arm/Toolchain.defs +++ b/arch/arm/src/arm/Toolchain.defs @@ -88,7 +88,7 @@ ifeq ($(CONFIG_ARM_TOOLCHAIN),GNU_EABI) endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/arm/src/armv6-m/Toolchain.defs b/arch/arm/src/armv6-m/Toolchain.defs index 63ef66ca763..7a7caabaa63 100644 --- a/arch/arm/src/armv6-m/Toolchain.defs +++ b/arch/arm/src/armv6-m/Toolchain.defs @@ -157,7 +157,7 @@ ifeq ($(CONFIG_MM_KASAN),y) endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/arm/src/armv7-a/Toolchain.defs b/arch/arm/src/armv7-a/Toolchain.defs index b50ca4d8737..5837c049205 100644 --- a/arch/arm/src/armv7-a/Toolchain.defs +++ b/arch/arm/src/armv7-a/Toolchain.defs @@ -119,7 +119,7 @@ else endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs index 84c264f5052..96c27fa79b7 100644 --- a/arch/arm/src/armv7-m/Toolchain.defs +++ b/arch/arm/src/armv7-m/Toolchain.defs @@ -212,7 +212,7 @@ endif # Architecture flags ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/arm/src/armv7-r/Toolchain.defs b/arch/arm/src/armv7-r/Toolchain.defs index c012e2e06fd..e42d8ff0cc4 100644 --- a/arch/arm/src/armv7-r/Toolchain.defs +++ b/arch/arm/src/armv7-r/Toolchain.defs @@ -111,7 +111,7 @@ ifeq ($(CONFIG_ARMV7R_TOOLCHAIN),GNU_EABI) endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/arm/src/armv8-m/Toolchain.defs b/arch/arm/src/armv8-m/Toolchain.defs index 43f707fcbe1..32ecf4de9be 100644 --- a/arch/arm/src/armv8-m/Toolchain.defs +++ b/arch/arm/src/armv8-m/Toolchain.defs @@ -221,7 +221,7 @@ endif # Architecture flags ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/avr/src/avr/Toolchain.defs b/arch/avr/src/avr/Toolchain.defs index 6f5c7d1c6e3..c6508b68442 100644 --- a/arch/avr/src/avr/Toolchain.defs +++ b/arch/avr/src/avr/Toolchain.defs @@ -91,7 +91,7 @@ else endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/avr/src/avr32/Toolchain.defs b/arch/avr/src/avr32/Toolchain.defs index 7938772fdf7..ba91d7f8ca0 100644 --- a/arch/avr/src/avr32/Toolchain.defs +++ b/arch/avr/src/avr32/Toolchain.defs @@ -37,7 +37,7 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y) endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/ceva/src/xc5/Toolchain.defs b/arch/ceva/src/xc5/Toolchain.defs index 8962cad9b24..099d9d9171d 100644 --- a/arch/ceva/src/xc5/Toolchain.defs +++ b/arch/ceva/src/xc5/Toolchain.defs @@ -56,7 +56,7 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y) endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ARCHCPUFLAGS = -mrtl-version-$(RTL_VERSION) -Wa,-rtl$(RTL_VERSION) ARCHCPUFLAGS += -Wa,-p -mmsg-full-path -TARG:arch=cevaxc5 -Wa,-vdiv4 -Wno-unused diff --git a/arch/ceva/src/xm6/Toolchain.defs b/arch/ceva/src/xm6/Toolchain.defs index 92244482731..b9d4778513e 100644 --- a/arch/ceva/src/xm6/Toolchain.defs +++ b/arch/ceva/src/xm6/Toolchain.defs @@ -56,7 +56,7 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y) endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ARCHCPUFLAGS = -mrtl-version-$(RTL_VERSION) -Wa,-rtl$(RTL_VERSION) ARCHCPUFLAGS += -Wa,-p diff --git a/arch/mips/src/mips32/Toolchain.defs b/arch/mips/src/mips32/Toolchain.defs index d05f8fb764d..b3673869197 100644 --- a/arch/mips/src/mips32/Toolchain.defs +++ b/arch/mips/src/mips32/Toolchain.defs @@ -284,7 +284,7 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y) endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/misoc/src/lm32/Toolchain.defs b/arch/misoc/src/lm32/Toolchain.defs index 11d5d141749..ec8e8f8ceeb 100644 --- a/arch/misoc/src/lm32/Toolchain.defs +++ b/arch/misoc/src/lm32/Toolchain.defs @@ -61,7 +61,7 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y) endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/misoc/src/minerva/Toolchain.defs b/arch/misoc/src/minerva/Toolchain.defs index 959c902181e..c5b91c72014 100644 --- a/arch/misoc/src/minerva/Toolchain.defs +++ b/arch/misoc/src/minerva/Toolchain.defs @@ -33,7 +33,7 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y) endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ # Default toolchain diff --git a/arch/or1k/src/mor1kx/Toolchain.defs b/arch/or1k/src/mor1kx/Toolchain.defs index a86136da896..403a82da92f 100644 --- a/arch/or1k/src/mor1kx/Toolchain.defs +++ b/arch/or1k/src/mor1kx/Toolchain.defs @@ -44,7 +44,7 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y) endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/risc-v/src/common/Toolchain.defs b/arch/risc-v/src/common/Toolchain.defs index 9e9522bb187..d2e1503c9b5 100644 --- a/arch/risc-v/src/common/Toolchain.defs +++ b/arch/risc-v/src/common/Toolchain.defs @@ -56,7 +56,7 @@ else endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/sparc/src/sparc_v8/Toolchain.defs b/arch/sparc/src/sparc_v8/Toolchain.defs index b1a42a0f12e..98c7e943b17 100644 --- a/arch/sparc/src/sparc_v8/Toolchain.defs +++ b/arch/sparc/src/sparc_v8/Toolchain.defs @@ -72,7 +72,7 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y) endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/xtensa/src/lx6/Toolchain.defs b/arch/xtensa/src/lx6/Toolchain.defs index 9debdb461f1..a852f70dced 100644 --- a/arch/xtensa/src/lx6/Toolchain.defs +++ b/arch/xtensa/src/lx6/Toolchain.defs @@ -60,7 +60,7 @@ else endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/arch/xtensa/src/lx7/Toolchain.defs b/arch/xtensa/src/lx7/Toolchain.defs index 5c56d234acf..cd1f3b7e849 100644 --- a/arch/xtensa/src/lx7/Toolchain.defs +++ b/arch/xtensa/src/lx7/Toolchain.defs @@ -60,7 +60,7 @@ else endif ARCHCFLAGS += -fno-common -ARCHCXXFLAGS += -fno-common +ARCHCXXFLAGS += -fno-common -nostdinc++ ifneq ($(CONFIG_CXX_EXCEPTION),y) ARCHCXXFLAGS += -fno-exceptions -fcheck-new diff --git a/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs b/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs index 11d4a1d0ffc..06aab144d37 100644 --- a/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs +++ b/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs @@ -38,7 +38,6 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y) ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing endif -ARCHCXXFLAGS += -nostdinc++ ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHWARNINGSXX = -Wall -Wshadow -Wundef ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10