From 8f96e59aee9cd0c5bbb82e01044d109f8588fec2 Mon Sep 17 00:00:00 2001 From: simbit18 <101105604+simbit18@users.noreply.github.com> Date: Tue, 24 Oct 2023 12:31:51 +0200 Subject: [PATCH] libs/libc/stdlib/lib_exit.c: fix multiple definition of __dso_handle in msys2 CPP: nuttx-names.in-> nuttx-names.dat LD: nuttx /usr/lib/gcc/x86_64-pc-msys/13.2.0/../../../../x86_64-pc-msys/bin/ld: nuttx.rel:/d/a/nuttx_windows/nuttx_windows/nuttxspace/nuttx/libs/libc/stdlib/lib_exit.c:48: multiple definition of `__dso_handle'; /usr/lib/gcc/x86_64-pc-msys/13.2.0/crtbegin.o:cygming-crtbeg:(.data+0x0): first defined here --- libs/libc/stdlib/lib_exit.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/libc/stdlib/lib_exit.c b/libs/libc/stdlib/lib_exit.c index 562cae251a8..3dc35bfb69e 100644 --- a/libs/libc/stdlib/lib_exit.c +++ b/libs/libc/stdlib/lib_exit.c @@ -45,7 +45,10 @@ ****************************************************************************/ extern FAR void *__dso_handle weak_data; + +#ifndef CONFIG_HOST_WINDOWS FAR void *__dso_handle = &__dso_handle; +#endif /**************************************************************************** * Public Functions