This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 37b5b71 libs/libxx: use built-in __aeabi_atexit() if LIBSUPCXX is
enabled
37b5b71 is described below
commit 37b5b7137f6bfe46cec4d2fc5ca4d0268a7e10dd
Author: chao.an <anc...@xiaomi.com>
AuthorDate: Wed Jan 13 19:41:09 2021 +0800
libs/libxx: use built-in __aeabi_atexit() if LIBSUPCXX is enabled
ld error caused by multiple definition:
ld: arm-none-eabi/lib/thumb/v8-m.main+fp/hard/libsupc++.a(atexit_arm.o): in
function `__aeabi_atexit':
atexit_arm.cc:(.text.__aeabi_atexit+0x0): multiple definition of
`__aeabi_atexit';
nuttx/staging/libxx.a(libxx_eabi_atexit.o):nuttx/libs/libxx/libxx_eabi_atexit.cxx:75:
first defined here
Signed-off-by: chao.an <anc...@xiaomi.com>
---
libs/libxx/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libs/libxx/Makefile b/libs/libxx/Makefile
index 6c787fe..8b4b19e 100644
--- a/libs/libxx/Makefile
+++ b/libs/libxx/Makefile
@@ -35,10 +35,12 @@
include $(TOPDIR)/Make.defs
-CXXSRCS = libxx_cxa_atexit.cxx libxx_eabi_atexit.cxx
+CXXSRCS = libxx_cxa_atexit.cxx
ifeq ($(CONFIG_CXX_LIBSUPCXX),y)
CXXSRCS += libxx_impure.cxx
+else
+CXXSRCS += libxx_eabi_atexit.cxx
endif
# Include the uClibc++ Make.defs file if selected. If it is included,
