Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-20 13:08:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

libxx: Change CXX_LIBSUPCXX to LIBSUPCXX

Browse source 
align with other Kconfig(e.g. LIBCXXABI, LIBCXX, UCLIBCXX)

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-08-28 00:13:21 +08:00
parent 3a7fcf743f
commit ab5d2adbca
23 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/src/arm/Toolchain.defs
View file

@ -105,7 +105,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L ${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += lsupc++
EXTRA_LIBPATHS += -L ${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}
endif

2
arch/arm/src/armv6-m/Toolchain.defs
View file

@ -97,7 +97,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/arm/src/armv7-a/Toolchain.defs
View file

@ -123,7 +123,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/arm/src/armv7-m/Toolchain.defs
View file

@ -159,7 +159,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/arm/src/armv7-r/Toolchain.defs
View file

@ -105,7 +105,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/arm/src/armv8-m/Toolchain.defs
View file

@ -147,7 +147,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/avr/src/avr/Toolchain.defs
View file

@ -138,7 +138,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/avr/src/avr32/Toolchain.defs
View file

@ -58,7 +58,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/hc/src/Makefile
View file

@ -95,7 +95,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${dir ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${dir ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}"
endif

2
arch/mips/src/mips32/Toolchain.defs
View file

@ -264,7 +264,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L ${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += lsupc++
EXTRA_LIBPATHS += -L ${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}
endif

2
arch/misoc/src/lm32/Toolchain.defs
View file

@ -95,7 +95,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/misoc/src/minerva/Toolchain.defs
View file

@ -49,7 +49,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/or1k/src/mor1kx/Toolchain.defs
View file

@ -76,7 +76,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/renesas/src/Makefile
View file

@ -88,7 +88,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L"${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L"${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/risc-v/src/rv32im/Toolchain.defs
View file

@ -91,7 +91,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/risc-v/src/rv64gc/Toolchain.defs
View file

@ -81,7 +81,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/x86/src/Makefile
View file

@ -92,7 +92,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${dir ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${dir ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}"
endif

2
arch/x86_64/src/Makefile
View file

@ -94,7 +94,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${dir ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${dir ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}}"
endif

2
arch/xtensa/src/lx6/Toolchain.defs
View file

@ -81,7 +81,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
arch/xtensa/src/lx7/Toolchain.defs
View file

@ -82,7 +82,7 @@ ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a`"}"
endif
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += -lsupc++
EXTRA_LIBPATHS += -L "${shell dirname "`$(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a`"}"
endif

2
boards/arm/stm32/stm32f4discovery/README.txt
View file

@ -1394,7 +1394,7 @@ Configuration Sub-directories
CONFIG_UCLIBCXX=y
CONFIG_CXX_EXCEPTION=y
CONFIG_CXX_LIBSUPCXX=y
CONFIG_LIBSUPCXX=y
CONFIG_UCLIBCXX_BUFSIZE=32
CONFIG_EXAMPLES_ELF_CXX=y

4
libs/libxx/Kconfig
View file

@ -54,7 +54,7 @@ if LIBCXX || UCLIBCXX
choice
prompt "C++ low level library select"
default CXX_LIBSUPCXX
default LIBSUPCXX
config LIBCXXABI
bool "LLVM low level C++ Library"
@ -63,7 +63,7 @@ config LIBCXXABI
https://libcxxabi.llvm.org/
Select if your use libc++abi as lower level c++ library
config CXX_LIBSUPCXX
config LIBSUPCXX
bool "GNU low level libsupc++"
---help---
Select if your toolchain provides libsupc++ and use libsupc++ as lower

2
libs/libxx/Makefile
View file

@ -21,7 +21,7 @@ include $(TOPDIR)/Make.defs
CXXSRCS = libxx_cxa_atexit.cxx
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
ifeq ($(CONFIG_LIBSUPCXX),y)
CXXSRCS += libxx_impure.cxx
else
CXXSRCS += libxx_eabi_atexit.cxx