diff options
| author | Jozef Lawrynowicz <jozef.l@mittosystems.com> | 2019-11-04 12:41:56 +0000 |
|---|---|---|
| committer | Jozef Lawrynowicz <jozefl@gcc.gnu.org> | 2019-11-04 12:41:56 +0000 |
| commit | 62ec242ea1e75cf3200c59a97ea941046e5d6408 (patch) | |
| tree | 7ddd9ea89e7e001d57c82db5c113aca55b8d8508 | |
| parent | 02afb6a9321fbfb435452636cedc2cd43f0c4fd2 (diff) | |
| download | gcc-62ec242ea1e75cf3200c59a97ea941046e5d6408.zip gcc-62ec242ea1e75cf3200c59a97ea941046e5d6408.tar.gz gcc-62ec242ea1e75cf3200c59a97ea941046e5d6408.tar.bz2 | |
libgcc: Fix incorrect use of USE_TM_CLONE_REGISTRY
2019-11-04 Jozef Lawrynowicz <jozef.l@mittosystems.com>
* crtstuff.c: Define USE_TM_CLONE_REGISTRY to 0 if it's undefined and
the target output object format is not ELF.
s/defined(USE_TM_CLONE_REGISTRY)/USE_TM_CLONE_REGISTRY.
From-SVN: r277775
| -rw-r--r-- | libgcc/ChangeLog | 6 | ||||
| -rw-r--r-- | libgcc/crtstuff.c | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 806d048..c528cec 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2019-11-04 Jozef Lawrynowicz <jozef.l@mittosystems.com> + + * crtstuff.c: Define USE_TM_CLONE_REGISTRY to 0 if it's undefined and + the target output object format is not ELF. + s/defined(USE_TM_CLONE_REGISTRY)/USE_TM_CLONE_REGISTRY. + 2019-11-03 Oleg Endo <olegendo@gcc.gnu.org> PR libgcc/78804 diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c index c93e1cb..ae6328d 100644 --- a/libgcc/crtstuff.c +++ b/libgcc/crtstuff.c @@ -153,6 +153,8 @@ call_ ## FUNC (void) \ #if !defined(USE_TM_CLONE_REGISTRY) && defined(OBJECT_FORMAT_ELF) # define USE_TM_CLONE_REGISTRY 1 +#elif !defined(USE_TM_CLONE_REGISTRY) +# define USE_TM_CLONE_REGISTRY 0 #endif /* We do not want to add the weak attribute to the declarations of these @@ -450,8 +452,7 @@ CRT_CALL_STATIC_FUNCTION (__LIBGCC_INIT_SECTION_ASM_OP__, __do_global_dtors_aux_1) #endif -#if defined(USE_EH_FRAME_REGISTRY) \ - || defined(USE_TM_CLONE_REGISTRY) +#if defined(USE_EH_FRAME_REGISTRY) || USE_TM_CLONE_REGISTRY /* Stick a call to __register_frame_info into the .init section. For some reason calls with no arguments work more reliably in .init, so stick the call in another function. */ @@ -560,8 +561,7 @@ __do_global_dtors (void) #endif } -#if defined(USE_EH_FRAME_REGISTRY) \ - || defined(USE_TM_CLONE_REGISTRY) +#if defined(USE_EH_FRAME_REGISTRY) || USE_TM_CLONE_REGISTRY /* A helper function for __do_global_ctors, which is in crtend.o. Here in crtbegin.o, we can reference a couple of symbols not visible there. Plus, since we're before libgcc.a, we have no problems referencing @@ -733,8 +733,7 @@ void __do_global_ctors (void) { func_ptr *p; -#if defined(USE_EH_FRAME_REGISTRY) \ - || defined(USE_TM_CLONE_REGISTRY) +#if defined(USE_EH_FRAME_REGISTRY) || USE_TM_CLONE_REGISTRY __do_global_ctors_1(); #endif for (p = __CTOR_END__ - 1; *p != (func_ptr) -1; p--) |