[BZ #2644]

2006-05-09  Ulrich Drepper  <drepper@redhat.com>
	[BZ #2644]
	* sysdeps/pthread/unwind-forcedunwind.c: Different solution for
	the reload problem.  Change the one path in pthread_cancel_init
	which causes the problem.  Force gcc to reload.  Simplify callers.
	* sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c
	(_Unwind_GetBSP): Undo last patch.

1 files changed, 2 insertions, 5 deletions

diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c b/nptl/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c
index a788fa31f9..d0c77a62e6 100644
--- a/nptl/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c
+++ b/nptl/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c
@@ -33,10 +33,7 @@ _Unwind_Word
 _Unwind_GetBSP (struct _Unwind_Context *context)
 {
   if (__builtin_expect (libgcc_s_getbsp == NULL, 0))
-    {
-      pthread_cancel_init ();
-      /* The function pointer has changed, ensure we reload it.  */
-      asm volatile ("" : "+m" (libgcc_s_getbsp));
-    }
+    pthread_cancel_init ();
+
   return libgcc_s_getbsp (context);
 }