sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 committed by Gustavo Henrique Nihei
parent e3ab1179fa
commit b0c782255c
23 changed files with 24 additions and 24 deletions
Show Stats 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

@ -281,7 +281,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