about summary refs log tree commit diff
path: root/sysdeps/generic/libc-start.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-04-15 22:46:40 +0000
committerUlrich Drepper <drepper@redhat.com>2003-04-15 22:46:40 +0000
commit162434a68226eb9a81fe92979fb59c8081aefcc0 (patch)
treecb2d459833468ea3e841def74ce2f3a5429df765 /sysdeps/generic/libc-start.c
parent482eb33c43d5a281625ce440c869a306e46fb367 (diff)
downloadglibc-162434a68226eb9a81fe92979fb59c8081aefcc0.tar.gz
glibc-162434a68226eb9a81fe92979fb59c8081aefcc0.tar.xz
glibc-162434a68226eb9a81fe92979fb59c8081aefcc0.zip
Update.
2003-04-15  Ulrich Drepper  <drepper@redhat.com>

	* elf/elf.h: Define AT_SYSINFO_EH_FRAME.
	* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Handle
	AT_SYSINFO_EH_FRAME.
	(_dl_show_auxv):Display AT_SYSINFO_EH_FRAME value.
	* sysdeps/generic/ldsodefs.h [NEED_DL_SYSINFO] (struct rtld_global):
	Add _dl_sysinfo_eh_frame field.
	* elf/dl-support.c [NEED_DL_SYSINFO]: Define _dl_sysinfo_eh_frame.
	* sysdeps/generic/libc-start.c [NEED_DL_SYSINFO] Define eh_obj
	variable.
	[NEED_DL_SYSINFO] (LIBC_START_MAIN): Call __register_frame_info_bases
	if _dl_sysinfo_eh_frame is non-NULL.

	* Makeconfig (gnulib): Add -lgcc_eh.

	* config.h.in: Define HAVE_FORCED_UNWIND.
Diffstat (limited to 'sysdeps/generic/libc-start.c')
-rw-r--r--sysdeps/generic/libc-start.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index b98f0a2aa0..318d070f4b 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -28,6 +28,11 @@ extern void __libc_init_first (int argc, char **argv, char **envp);
 extern int __libc_multiple_libcs;
 extern void *__libc_stack_end;
 
+#ifdef NEED_DL_SYSINFO
+# include "unwind-dw2-fde.h"
+static struct object eh_obj;
+#endif
+
 #include <tls.h>
 #ifndef SHARED
 # include <dl-osinfo.h>
@@ -150,6 +155,13 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
     __libc_check_standard_fds ();
 #endif
 
+#ifdef NEED_DL_SYSINFO
+  /* Register the kernel's unwind table.  */
+  if (GL(dl_sysinfo_eh_frame) != 0)
+    INTUSE(__register_frame_info_bases) ((void *) GL(dl_sysinfo_eh_frame),
+					 &eh_obj, 0, 0);
+#endif
+
   /* Register the destructor of the dynamic linker if there is any.  */
   if (__builtin_expect (rtld_fini != NULL, 1))
     __cxa_atexit ((void (*) (void *)) rtld_fini, NULL, NULL);