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.

9 files changed, 70 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index a6d460e5d6..a45f728fe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+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.
+
 2003-04-15  Steven Munroe  <sjmunroe@us.ibm.com>
 
 	* sysdeps/powerpc/powerpc64/strcmp.S: Convert to full 64-bit.
diff --git a/Makeconfig b/Makeconfig
index 60d351946f..2245b9dc7d 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -505,7 +505,7 @@ link-libc-bounded = $(common-objpfx)libc_b.a $(gnulib) $(common-objpfx)libc_b.a
 link-extra-libs-bounded = $(foreach lib,$(LDLIBS-$(@F:%-bp=%)),$(common-objpfx)$(lib)_b.a)
 
 ifndef gnulib
-gnulib := -lgcc
+gnulib := -lgcc -lgcc_eh
 endif
 ifeq ($(elf),yes)
 +preinit = $(addprefix $(csu-objpfx),crti.o)
diff --git a/config.h.in b/config.h.in
index 29b809e8cf..d01b90a597 100644
--- a/config.h.in
+++ b/config.h.in
@@ -189,6 +189,9 @@
 /* Mach/i386 specific: define if the `i386_set_gdt' RPC is available.  */
 #undef	HAVE_I386_SET_GDT
 
+/* Defined if forced unwind support is available.  */
+#undef	HAVE_FORCED_UNWIND
+
 /*
  */
 
diff --git a/elf/dl-support.c b/elf/dl-support.c
index efeddb6fe1..1e547d3b4d 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -127,6 +127,8 @@ size_t _dl_phnum;
 #ifdef NEED_DL_SYSINFO
 /* Needed for improved syscall handling on at least x86/Linux.  */
 uintptr_t _dl_sysinfo = DL_SYSINFO_DEFAULT;
+/* Address of the unwind info for the vsyscall page.  */
+uintptr_t _dl_sysinfo_eh_frame;
 #endif
 
 /* During the program run we must not modify the global data of
diff --git a/elf/elf.h b/elf/elf.h
index 4a1f0fb4e0..69adde46ed 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -949,6 +949,7 @@ typedef struct
 /* Pointer to the global system page used for system calls and other
    nice things.  */
 #define AT_SYSINFO	32
+#define AT_SYSINFO_EH_FRAME	33
 
 
 /* Note section contents.  Each entry in the note section begins with
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index c457f39db9..394e224e1e 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-15  Ulrich Drepper  <drepper@redhat.com>
+
+	* pthreadP.h: Move THREAD_ATOMIC_* replacements to the top.
+
 2003-04-14  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Don't
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c
index 4d80dd7689..2c73b64f90 100644
--- a/sysdeps/generic/dl-sysdep.c
+++ b/sysdeps/generic/dl-sysdep.c
@@ -139,6 +139,9 @@ _dl_sysdep_start (void **start_argptr,
       case AT_SYSINFO:
 	GL(dl_sysinfo) = av->a_un.a_val;
 	break;
+      case AT_SYSINFO_EH_FRAME:
+	GL(dl_sysinfo_eh_frame) = av->a_un.a_val;
+	break;
 #endif
 #ifdef DL_PLATFORM_AUXV
       DL_PLATFORM_AUXV
@@ -160,7 +163,7 @@ _dl_sysdep_start (void **start_argptr,
   SEE (EGID, gid, egid);
 #endif
 
-  /* If one of the two pairs of IDs does not mattch this is a setuid
+  /* If one of the two pairs of IDs does not match this is a setuid
      or setgid run.  */
   INTUSE(__libc_enable_secure) = uid | gid;
 
@@ -228,27 +231,28 @@ _dl_show_auxv (void)
 	enum { dec, hex, str } form;
       } auxvars[] =
 	{
-	  [AT_EXECFD - 2] =		{ "AT_EXECFD:      ", dec },
-	  [AT_PHDR - 2] =		{ "AT_PHDR:        0x", hex },
-	  [AT_PHENT - 2] =		{ "AT_PHENT:       ", dec },
-	  [AT_PHNUM - 2] =		{ "AT_PHNUM:       ", dec },
-	  [AT_PAGESZ - 2] =		{ "AT_PAGESZ:      ", dec },
-	  [AT_BASE - 2] =		{ "AT_BASE:        0x", hex },
-	  [AT_FLAGS - 2] =		{ "AT_FLAGS:       0x", hex },
-	  [AT_ENTRY - 2] =		{ "AT_ENTRY:       0x", hex },
-	  [AT_NOTELF - 2] =		{ "AT_NOTELF:      ", hex },
-	  [AT_UID - 2] =		{ "AT_UID:         ", dec },
-	  [AT_EUID - 2] =		{ "AT_EUID:        ", dec },
-	  [AT_GID - 2] =		{ "AT_GID:         ", dec },
-	  [AT_EGID - 2] =		{ "AT_EGID:        ", dec },
-	  [AT_PLATFORM - 2] =		{ "AT_PLATFORM:    ", str },
-	  [AT_HWCAP - 2] =		{ "AT_HWCAP:       ", hex },
-	  [AT_CLKTCK - 2] =		{ "AT_CLKTCK:      ", dec },
-	  [AT_FPUCW - 2] =		{ "AT_FPUCW:       ", hex },
-	  [AT_DCACHEBSIZE - 2] =	{ "AT_DCACHEBSIZE: 0x", hex },
-	  [AT_ICACHEBSIZE - 2] =	{ "AT_ICACHEBSIZE: 0x", hex },
-	  [AT_UCACHEBSIZE - 2] =	{ "AT_UCACHEBSIZE: 0x", hex },
-	  [AT_SYSINFO - 2] =		{ "AT_SYSINFO:     0x", hex }
+	  [AT_EXECFD - 2] =		{ "AT_EXECFD:           ", dec },
+	  [AT_PHDR - 2] =		{ "AT_PHDR:             0x", hex },
+	  [AT_PHENT - 2] =		{ "AT_PHENT:            ", dec },
+	  [AT_PHNUM - 2] =		{ "AT_PHNUM:            ", dec },
+	  [AT_PAGESZ - 2] =		{ "AT_PAGESZ:           ", dec },
+	  [AT_BASE - 2] =		{ "AT_BASE:             0x", hex },
+	  [AT_FLAGS - 2] =		{ "AT_FLAGS:            0x", hex },
+	  [AT_ENTRY - 2] =		{ "AT_ENTRY:            0x", hex },
+	  [AT_NOTELF - 2] =		{ "AT_NOTELF:           ", hex },
+	  [AT_UID - 2] =		{ "AT_UID:              ", dec },
+	  [AT_EUID - 2] =		{ "AT_EUID:             ", dec },
+	  [AT_GID - 2] =		{ "AT_GID:              ", dec },
+	  [AT_EGID - 2] =		{ "AT_EGID:             ", dec },
+	  [AT_PLATFORM - 2] =		{ "AT_PLATFORM:         ", str },
+	  [AT_HWCAP - 2] =		{ "AT_HWCAP:            ", hex },
+	  [AT_CLKTCK - 2] =		{ "AT_CLKTCK:           ", dec },
+	  [AT_FPUCW - 2] =		{ "AT_FPUCW:            ", hex },
+	  [AT_DCACHEBSIZE - 2] =	{ "AT_DCACHEBSIZE:      0x", hex },
+	  [AT_ICACHEBSIZE - 2] =	{ "AT_ICACHEBSIZE:      0x", hex },
+	  [AT_UCACHEBSIZE - 2] =	{ "AT_UCACHEBSIZE:      0x", hex },
+	  [AT_SYSINFO - 2] =		{ "AT_SYSINFO:          0x", hex },
+	  [AT_SYSINFO_EH_FRAME - 2] =	{ "AT_SYSINFO_EH_FRAME: 0x", hex }
 	};
       unsigned int idx = (unsigned int) (av->a_type - 2);
 
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index e8234026e8..8be15b1cae 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -394,6 +394,9 @@ struct rtld_global
 #ifdef NEED_DL_SYSINFO
   /* Syscall handling improvements.  This is very specific to x86.  */
   EXTERN uintptr_t _dl_sysinfo;
+
+  /* Address of the unwind info for the vsyscall page.  */
+  EXTERN uintptr_t _dl_sysinfo_eh_frame;
 #endif
 
 #ifdef SHARED
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);