Merge ../libunwind-v0.98

Conflicts:

	configure
	configure.in
	src/ia64/Ginit.c

2 files changed, 4 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 74986949..83ac810a 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,10 @@
 * News for v0.98.6:
 
 ** Fix address-leak triggered by invalid byte-order.  Fixed by Andreas Schwab.
+** On ia64, get_static_proc_name() no longer uses a weak reference to
+   _Uelf64_get_proc_name(), since that was causing problems with archive
+   libraries and no longer served any apparent purpose.  Fixed by
+   Curt Wohlgemuth.
 
 * News for v0.98.5:
 
diff --git a/src/ia64/Ginit.c b/src/ia64/Ginit.c
index 0ba95546..5afa9ab1 100644
--- a/src/ia64/Ginit.c
+++ b/src/ia64/Ginit.c
@@ -348,11 +348,6 @@ get_static_proc_name (unw_addr_space_t as, unw_word_t ip,
 		      char *buf, size_t buf_len, unw_word_t *offp,
 		      void *arg)
 {
-#ifndef _UNW_LOCAL_ONLY
-# pragma weak _Uelf64_get_proc_name
-  if (!_Uelf64_get_proc_name)
-    return -UNW_EINVAL;
-#endif
   return _Uelf64_get_proc_name (as, getpid (), ip, buf, buf_len, offp);
 }