From 34a53788fec49e0a85bd32b51b057cfaae0200c8 Mon Sep 17 00:00:00 2001 From: Jozef Lawrynowicz Date: Wed, 11 Dec 2019 18:59:38 +0000 Subject: [PATCH] libgcc: Declare __dso_handle only if DEFAULT_USE_CXA_ATEXIT is true 2019-12-11 Jozef Lawrynowicz * crtstuff.c: Declare __dso_handle only if DEFAULT_USE_CXA_ATEXIT is true. From-SVN: r279243 --- libgcc/ChangeLog | 5 +++++ libgcc/crtstuff.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index c8480cd35a5..b415d78a8af 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2019-12-11 Jozef Lawrynowicz + + * crtstuff.c: Declare __dso_handle only if DEFAULT_USE_CXA_ATEXIT is + true. + 2019-12-09 Jozef Lawrynowicz * crtstuff.c (__do_global_dtors_aux): Check if USE_EH_FRAME_REGISTRY is diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c index 9346cc5ca54..e282cb1aabb 100644 --- a/libgcc/crtstuff.c +++ b/libgcc/crtstuff.c @@ -325,11 +325,14 @@ register_tm_clones (void) #ifdef OBJECT_FORMAT_ELF +#if DEFAULT_USE_CXA_ATEXIT /* Declare the __dso_handle variable. It should have a unique value in every shared-object; in a main program its value is zero. The object should in any case be protected. This means the instance in one DSO or the main program is not used in another object. The - dynamic linker takes care of this. */ + dynamic linker takes care of this. + If __cxa_atexit is not being used, __dso_handle will not be used and + doesn't need to be defined. */ #ifdef TARGET_LIBGCC_SDATA_SECTION extern void *__dso_handle __attribute__ ((__section__ (TARGET_LIBGCC_SDATA_SECTION))); @@ -342,6 +345,7 @@ void *__dso_handle = &__dso_handle; #else void *__dso_handle = 0; #endif +#endif /* DEFAULT_USE_CXA_ATEXIT */ /* The __cxa_finalize function may not be available so we use only a weak declaration. */ -- 2.30.2