lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

* configure.in (libc_cv_gcc_dwarf2_unwind_info): Delete.

Browse Source 
(HAVE_DWARF2_UNWIND_INFO{,_STATIC}): Remove AC_DEFINEs.
	* configure: Regenerate.
	* config.h.in (HAVE_DWARF2_UNWIND_INFO{,_STATIC}): Remove undefs.
	* elf/soinit.c: Don't include gccframe.h.
	(__EH_FRAME_BEGIN__): Define unconditionally.
	(__register_frame_info, __deregister_frame_info)
	(__register_frame_info_bases, __deregister_frame_info_bases)
	(__register_frame, __deregister_frame): Remove declarations.
	(__libc_global_ctors, __libc_fini): Don't call registry functions.
	* elf/sofini.c (__EH_FRAME_END__): Define unconditionally.
This commit is contained in:
Roland McGrath
2006-02-22 02:09:08 +00:00
parent 7aaa17343d
commit 7d93246124
6 changed files with 14 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
elf/soinit.c
View File

@ -6,10 +6,6 @@
#include <libc-internal.h>
#include <stdlib.h>
#ifdef HAVE_DWARF2_UNWIND_INFO_STATIC
# include <gccframe.h>
#endif
static void (*const __CTOR_LIST__[1]) (void)
__attribute__ ((section (".ctors")))
= { (void (*) (void)) -1 };
@ -24,21 +20,9 @@ run_hooks (void (*const list[]) (void))
(**list) ();
}
#ifdef HAVE_DWARF2_UNWIND_INFO
static char __EH_FRAME_BEGIN__[]
__attribute__ ((section (".eh_frame")))
= { };
# ifdef HAVE_DWARF2_UNWIND_INFO_STATIC
extern void __register_frame_info (const void *, struct object *);
extern void __register_frame_info_bases (const void *, struct object *,
void *, void *);
extern void __deregister_frame_info (const void *);
extern void __deregister_frame_info_bases (const void *);
# else
extern void __register_frame (const void *);
extern void __deregister_frame (const void *);
# endif
#endif
/* This function will be called from _init in init-first.c. */
void
@ -46,33 +30,6 @@ __libc_global_ctors (void)
{
/* Call constructor functions. */
run_hooks (__CTOR_LIST__);
#ifdef HAVE_DWARF2_UNWIND_INFO
# ifdef HAVE_DWARF2_UNWIND_INFO_STATIC
{
static struct object ob;
# if defined CRT_GET_RFIB_TEXT || defined CRT_GET_RFIB_DATA
void *tbase, *dbase;
# ifdef CRT_GET_RFIB_TEXT
CRT_GET_RFIB_TEXT (tbase);
# else
tbase = NULL;
# endif
# ifdef CRT_GET_RFIB_DATA
CRT_GET_RFIB_DATA (dbase);
# else
dbase = NULL;
# endif
__register_frame_info_bases (__EH_FRAME_BEGIN__, &ob, tbase, dbase);
# else
__register_frame_info (__EH_FRAME_BEGIN__, &ob);
# endif
}
# else
__register_frame (__EH_FRAME_BEGIN__);
# endif
#endif
}
@ -83,17 +40,6 @@ __libc_fini (void)
{
/* Call destructor functions. */
run_hooks (__DTOR_LIST__);
#ifdef HAVE_DWARF2_UNWIND_INFO
# ifdef HAVE_DWARF2_UNWIND_INFO_STATIC
# if defined CRT_GET_RFIB_TEXT || defined CRT_GET_RFIB_DATA
__deregister_frame_info_bases (__EH_FRAME_BEGIN__);
# else
__deregister_frame_info (__EH_FRAME_BEGIN__);
# endif
# else
__deregister_frame (__EH_FRAME_BEGIN__);
# endif
#endif
}
void (*_fini_ptr) (void) __attribute__ ((section (".fini_array")))