2004-08-05 Jeff Johnston <jjohnstn@redhat.com>

        * libunwind-frame.c (LIBUNWIND_SO): Change to be of form:
        libunwind-xxxx.so" where xxxx is UNW_TARGET.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7ecacf8ba6427fbc5b54753d8c6ce496df67c5ff..3ed9cbd553c2740fabfd2cfb4639e618826d1850 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -677,7 +677,6 @@
 
        * Makefile.in (CONFIG_CLEAN): Delete duplicate definition.
 
->>>>>>> 1.6211
 2004-07-28  Andrew Cagney  <cagney@gnu.org>
 
        * PROBLEMS: Mention threads/1650.

diff --git a/gdb/libunwind-frame.c b/gdb/libunwind-frame.c
index 3462625f3e43b1fe01dce1234cad8e57f6ae7469..fd953d2bd9ce8af43e854f09c3aa5c62524a148e 100644 (file)
--- a/gdb/libunwind-frame.c
+++ b/gdb/libunwind-frame.c
@@ -45,10 +45,6 @@
 static int libunwind_initialized;
 static struct gdbarch_data *libunwind_descr_handle;
 
-#ifndef LIBUNWIND_SO
-#define LIBUNWIND_SO "libunwind.so"
-#endif
-
 /* Required function pointers from libunwind.  */
 static int (*unw_get_reg_p) (unw_cursor_t *, unw_regnum_t, unw_word_t *);
 static int (*unw_get_fpreg_p) (unw_cursor_t *, unw_regnum_t, unw_fpreg_t *);
@@ -75,6 +71,10 @@ struct libunwind_frame_cache
 #define STRINGIFY2(name)       #name
 #define STRINGIFY(name)                STRINGIFY2(name)
 
+#ifndef LIBUNWIND_SO
+#define LIBUNWIND_SO "libunwind-" STRINGIFY(UNW_TARGET) ".so"
+#endif
+
 static char *get_reg_name = STRINGIFY(UNW_OBJ(get_reg));
 static char *get_fpreg_name = STRINGIFY(UNW_OBJ(get_fpreg));
 static char *get_saveloc_name = STRINGIFY(UNW_OBJ(get_save_loc));