aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-11-16 01:27:24 +0000
committerUlrich Drepper <drepper@redhat.com>2001-11-16 01:27:24 +0000
commit74bd2300b57fdb2540478e8698ef7f9067db792c (patch)
tree5adf4e4f6294bb2c418c211c686f918452420fab /elf
parent4acda75c3da212931811a902e4658e0c681f83f2 (diff)
downloadglibc-74bd2300b57fdb2540478e8698ef7f9067db792c.tar
glibc-74bd2300b57fdb2540478e8698ef7f9067db792c.tar.gz
glibc-74bd2300b57fdb2540478e8698ef7f9067db792c.tar.bz2
glibc-74bd2300b57fdb2540478e8698ef7f9067db792c.zip
Update.
2001-10-02 Jakub Jelinek <jakub@redhat.com> H.J. Lu <hjl@gnu.org> * configure.in (libc_cv_gcc_static_libgcc): Set to -static-libgcc if gcc supports this flag. (EXPORT_UNWIND_FIND_FDE): Define unless target configure disables it. (gcc3): Allow glibc to be compiled with gcc 3.x. * config.h.in (EXPORT_UNWIND_FIND_FDE): Add. * config.make.in (static-libgcc, unwind-find-fde): Add. * Makerules (build-shlib-helper, build-module-helper): Use it. * scripts/versions.awk: Make sure GLIBC_ versions come first. * elf/soinit.c (__libc_global_ctors): Set tbases and dbases if necessary. (_fini): Call __deregister_frame_info_bases if __register_frame_info_bases was used to register. * elf/Versions (__register_frame_info, __deregister_frame_info): Add for GLIBC_2.0. (__register_frame_info_bases, __register_frame_info_table_bases, __deregister_frame_info_bases, _Unwind_Find_FDE): Add for GLIBC_2.2.5. * elf/Makefile (routines): Add unwind-dw2-fde. (shared-only-routines): Add unwind-dw2-fde. * sysdeps/alpha/gccframe.h: New file. * sysdeps/arm/gccframe.h: New file. * sysdeps/generic/framestate.c: New file. * sysdeps/generic/dwarf2.h: New file. * sysdeps/generic/gccframe.h (struct object): Update from gcc 3.0. * sysdeps/generic/unwind-dw2-fde.c: New file. * sysdeps/unix/sysv/linux/ia64/unwind-dw2-fde.c: New file. * sysdeps/generic/unwind-dw2-fde.h: New file. * sysdeps/generic/unwind-dw2.c: New file. * sysdeps/generic/unwind-pe.h: New file. * sysdeps/generic/unwind.h: New file. * sysdeps/hppa/gccframe.h: New file. * sysdeps/i386/gccframe.h: New file. * sysdeps/m68k/gccframe.h: New file. * sysdeps/mips/gccframe.h: New file. * sysdeps/powerpc/gccframe.h: New file. * sysdeps/s390/gccframe.h: New file. * sysdeps/sh/gccframe.h: New file. * sysdeps/sparc/gccframe.h: New file. * sysdeps/vax/gccframe.h: New file. * sysdeps/unix/sysv/linux/configure.in (libc_cv_gcc_unwind_find_fde): Set on all architectures except ia64. * sysdeps/mach/hurd/configure.in (libc_cv_gcc_unwind_find_fde): Set for i386. * sysdeps/mach/hurd/i386/Versions (__register_frame_info, __deregister_frame_info): Move to elf/Versions. * sysdeps/unix/sysv/linux/m68k/Versions: Likewise. * sysdeps/unix/sysv/linux/arm/Versions: Likewise. * sysdeps/unix/sysv/linux/alpha/Versions: Likewise. * sysdeps/unix/sysv/linux/i386/Versions: Likewise. * sysdeps/unix/sysv/linux/mips/Versions: Likewise. * sysdeps/unix/sysv/linux/powerpc/Versions: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/Versions: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/Versions: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/Versions: Likewise. * sysdeps/mach/hurd/i386/Makefile (sysdep-routines): Add framestate. * sysdeps/unix/sysv/linux/arm/Makefile: Likewise. * sysdeps/unix/sysv/linux/alpha/Makefile: Likewise. * sysdeps/unix/sysv/linux/i386/Makefile: Likewise. * sysdeps/unix/sysv/linux/m68k/Makefile: Likewise. * sysdeps/unix/sysv/linux/mips/Makefile: Likewise. * sysdeps/unix/sysv/linux/powerpc/Makefile: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/Makefile: Likewise. * sysdeps/unix/sysv/linux/sparc/Makefile: Likewise. * sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed: New file. * sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed: New file. * sysdeps/generic/strnlen.c: New file.
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile5
-rw-r--r--elf/Versions9
-rw-r--r--elf/soinit.c24
3 files changed, 38 insertions, 0 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 91d7e3a508..b39034c7bf 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -66,6 +66,11 @@ distribute := $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
include ../Makeconfig
+ifeq ($(unwind-find-fde),yes)
+routines += unwind-dw2-fde
+shared-only-routines = unwind-dw2-fde
+endif
+
before-compile = $(objpfx)trusted-dirs.h
generated := trusted-dirs.h trusted-dirs.st for-renamed/renamed.so
generated-dirs := for-renamed
diff --git a/elf/Versions b/elf/Versions
index 2506d100a6..a0e691c0ac 100644
--- a/elf/Versions
+++ b/elf/Versions
@@ -2,6 +2,9 @@ libc {
GLIBC_2.0 {
# functions used in other libraries
_dl_open; _dl_close; _dl_addr;
+%ifdef EXPORT_UNWIND_FIND_FDE
+ __register_frame_info; __deregister_frame_info;
+%endif
}
GLIBC_2.1 {
# functions used in other libraries
@@ -17,6 +20,12 @@ libc {
GLIBC_2.2.4 {
dl_iterate_phdr;
}
+%ifdef EXPORT_UNWIND_FIND_FDE
+ GLIBC_2.2.5 {
+ __register_frame_info_bases; __deregister_frame_info_bases;
+ __register_frame_info_table_bases; _Unwind_Find_FDE;
+ }
+%endif
}
ld {
diff --git a/elf/soinit.c b/elf/soinit.c
index ff65af4a36..32ed4454b5 100644
--- a/elf/soinit.c
+++ b/elf/soinit.c
@@ -4,6 +4,7 @@
calling those lists of functions. */
#include <libc-internal.h>
+#include <stdlib.h>
#ifdef HAVE_DWARF2_UNWIND_INFO_STATIC
# include <gccframe.h>
@@ -29,7 +30,10 @@ static char __EH_FRAME_BEGIN__[]
= { };
# 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 *);
@@ -47,7 +51,23 @@ __libc_global_ctors (void)
# 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__);
@@ -66,7 +86,11 @@ _fini (void)
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