From: Jozef Lawrynowicz Date: Mon, 9 Dec 2019 12:35:55 +0000 (+0000) Subject: libgcc: Fix misuse of USE_EH_FRAME_REGISTRY in crtstuff.c X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=21a098f4a173fd5da3a36e86e4e41e6a8c920b51;p=gcc.git libgcc: Fix misuse of USE_EH_FRAME_REGISTRY in crtstuff.c 2019-12-09 Jozef Lawrynowicz * crtstuff.c (__do_global_dtors_aux): Check if USE_EH_FRAME_REGISTRY is defined instead of its value. From-SVN: r279125 --- diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 0359f3a3116..c8480cd35a5 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2019-12-09 Jozef Lawrynowicz + + * crtstuff.c (__do_global_dtors_aux): Check if USE_EH_FRAME_REGISTRY is + defined instead of its value. + 2019-12-09 Jozef Lawrynowicz * crtstuff.c (__do_global_dtors_aux): Wrap in #if so it's only defined diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c index 80cc78d0dcd..9346cc5ca54 100644 --- a/libgcc/crtstuff.c +++ b/libgcc/crtstuff.c @@ -369,7 +369,7 @@ extern void __cxa_finalize (void *) TARGET_ATTRIBUTE_WEAK; This routine does not need to be run if none of the following clauses are true, as it will not do anything, so can be removed. */ #if defined(CRTSTUFFS_O) || !defined(FINI_ARRAY_SECTION_ASM_OP) \ - || USE_TM_CLONE_REGISTRY || USE_EH_FRAME_REGISTRY + || USE_TM_CLONE_REGISTRY || defined(USE_EH_FRAME_REGISTRY) static void __attribute__((used)) __do_global_dtors_aux (void) { @@ -456,7 +456,7 @@ CRT_CALL_STATIC_FUNCTION (__LIBGCC_INIT_SECTION_ASM_OP__, __do_global_dtors_aux_1) #endif #endif /* defined(CRTSTUFFS_O) || !defined(FINI_ARRAY_SECTION_ASM_OP) - || defined(USE_TM_CLONE_REGISTRY) || defined(USE_EH_FRAME_REGISTRY) */ + || USE_TM_CLONE_REGISTRY || defined(USE_EH_FRAME_REGISTRY) */ #if defined(USE_EH_FRAME_REGISTRY) || USE_TM_CLONE_REGISTRY /* Stick a call to __register_frame_info into the .init section. For some