From 657be7aff1202e2422538818aa6c20ad88a64766 Mon Sep 17 00:00:00 2001 From: Jeffrey A Law Date: Fri, 11 Jun 1999 03:12:22 +0000 Subject: Makefile.in (libgcc2): Pass MAYBE_USE_COLLECT2 as an argument. * Makefile.in (libgcc2): Pass MAYBE_USE_COLLECT2 as an argument. * libgcc2.c (__CTOR_LIST, __DTOR_LIST); Do not provide initializers is some circumstances. From-SVN: r27489 --- gcc/libgcc2.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'gcc/libgcc2.c') diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c index a902dd3b..6d8fb0b 100644 --- a/gcc/libgcc2.c +++ b/gcc/libgcc2.c @@ -2903,17 +2903,26 @@ SYMBOL__MAIN () #include "gbl-ctors.h" /* Provide default definitions for the lists of constructors and - destructors, so that we don't get linker errors. - - The old code sometimes put these into the data segment and sometimes - into the bss segment. Putting these into the data segment should always - work and avoids a little bit of complexity. */ + destructors, so that we don't get linker errors. These symbols are + intentionally bss symbols, so that gld and/or collect will provide + the right values. */ /* We declare the lists here with two elements each, - so that they are valid empty lists if no other definition is loaded. */ + so that they are valid empty lists if no other definition is loaded. + + If we are using the old "set" extensions to have the gnu linker + collect ctors and dtors, then we __CTOR_LIST__ and __DTOR_LIST__ + must be in the bss/common section. + + Long term no port should use those extensions. But many still do. */ #if !defined(INIT_SECTION_ASM_OP) && !defined(CTOR_LISTS_DEFINED_EXTERNALLY) +#if defined (ASM_OUTPUT_CONSTRUCTOR) || defined (USE_COLLECT2) func_ptr __CTOR_LIST__[2] = {0, 0}; func_ptr __DTOR_LIST__[2] = {0, 0}; +#else +func_ptr __CTOR_LIST__[2]; +func_ptr __DTOR_LIST__[2]; +#endif #endif /* no INIT_SECTION_ASM_OP and not CTOR_LISTS_DEFINED_EXTERNALLY */ #endif /* L_ctors */ -- cgit v1.1