libgcc: Fix misuse of USE_EH_FRAME_REGISTRY in crtstuff.c

2019-12-09  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* 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 0359f3a31167b67a6244ccdb2241021678942620..c8480cd35a5bba27724cb580a1fad76c595b0064 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-09  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+       * crtstuff.c (__do_global_dtors_aux): Check if USE_EH_FRAME_REGISTRY is
+       defined instead of its value.
+
 2019-12-09  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
        * 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 80cc78d0dcda0c5fb97d943801322f16dc799f75..9346cc5ca542472996e8e45d09cabe88b9bd8d4d 100644 (file)
--- 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