diff options
| author | Jozef Lawrynowicz <jozef.l@mittosystems.com> | 2019-12-09 12:35:55 +0000 |
|---|---|---|
| committer | Jozef Lawrynowicz <jozefl@gcc.gnu.org> | 2019-12-09 12:35:55 +0000 |
| commit | 21a098f4a173fd5da3a36e86e4e41e6a8c920b51 (patch) | |
| tree | dfedb924707d9462747776b27cda98dab560c6ed /libgcc | |
| parent | fdc5359fb65458577a9d2a529d64cb0a54618cff (diff) | |
| download | gcc-21a098f4a173fd5da3a36e86e4e41e6a8c920b51.zip gcc-21a098f4a173fd5da3a36e86e4e41e6a8c920b51.tar.gz gcc-21a098f4a173fd5da3a36e86e4e41e6a8c920b51.tar.bz2 | |
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
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 5 | ||||
| -rw-r--r-- | libgcc/crtstuff.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 0359f3a..c8480cd 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,5 +1,10 @@ 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 if it will have contents. diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c index 80cc78d..9346cc5 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 |