Merge GDB 7.5.1

gdb/ia64-libunwind-tdep.c

-/* Frame unwinder for frames using the libunwind library.
+/* Frame unwinder for ia64 frames using the libunwind library.
 
    Copyright (C) 2003-2004, 2006-2012 Free Software Foundation, Inc.
 
    Written by Jeff Johnston, contributed by Red Hat Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
@@ skipping 17 matching lines @@
 #include "gdbtypes.h"
 #include "symtab.h"
 #include "objfiles.h"
 #include "regcache.h"
 
 #include <dlfcn.h>
 
 #include "gdb_assert.h"
 #include "gdb_string.h"
 
-#include "libunwind-frame.h"
+#include "ia64-libunwind-tdep.h"
 
 #include "complaints.h"
 
+/* IA-64 is the only target that currently uses ia64-libunwind-tdep.
+   Note how UNW_TARGET, UNW_OBJ, etc. are compile time constants below.
+   Those come from libunwind's headers, and are target dependent.
+   Also, some of libunwind's typedefs are target dependent, as e.g.,
+   unw_word_t.  If some other target wants to use this, we will need
+   to do some abstracting in order to make it possible to select which
+   libunwind we're talking to at runtime (and have one per arch).  */
+
 /* The following two macros are normally defined in <endian.h>.
    But systems such as ia64-hpux do not provide such header, so
    we just define them here if not already defined.  */
 #ifndef __LITTLE_ENDIAN
 #define __LITTLE_ENDIAN 1234
 #endif
 #ifndef __BIG_ENDIAN
 #define __BIG_ENDIAN    4321
 #endif
 
@@ skipping 27 matching lines @@
 
 /* We need to qualify the function names with a platform-specific prefix
    to match the names used by the libunwind library.  The UNW_OBJ macro is
    provided by the libunwind.h header file.  */
 #define STRINGIFY2(name)        #name
 #define STRINGIFY(name)         STRINGIFY2(name)
 
 #ifndef LIBUNWIND_SO
 /* Use the stable ABI major version number.  `libunwind-ia64.so' is a link time
    only library, not a runtime one.  */
-#define LIBUNWIND_SO "libunwind-" STRINGIFY(UNW_TARGET) ".so.7"
+#define LIBUNWIND_SO "libunwind-" STRINGIFY(UNW_TARGET) ".so.8"
+
+/* Provide also compatibility with older .so.  The two APIs are compatible, .8
+   is only extended a bit, GDB does not use the extended API at all.  */
+#define LIBUNWIND_SO_7 "libunwind-" STRINGIFY(UNW_TARGET) ".so.7"
 #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));
 static char *is_signal_frame_name = STRINGIFY(UNW_OBJ(is_signal_frame));
 static char *step_name = STRINGIFY(UNW_OBJ(step));
 static char *init_remote_name = STRINGIFY(UNW_OBJ(init_remote));
 static char *create_addr_space_name = STRINGIFY(UNW_OBJ(create_addr_space));
 static char *destroy_addr_space_name = STRINGIFY(UNW_OBJ(destroy_addr_space));
@@ skipping 125 matching lines @@
   if (cache->as)
     unw_destroy_addr_space_p (cache->as);
 }
 
 unw_word_t
 libunwind_find_dyn_list (unw_addr_space_t as, unw_dyn_info_t *di, void *arg)
 {
   return unw_find_dyn_list_p (as, di, arg);
 }
 
-static const struct frame_unwind libunwind_frame_unwind =
-{
-  NORMAL_FRAME,
-  default_frame_unwind_stop_reason,
-  libunwind_frame_this_id,
-  libunwind_frame_prev_register,
-  NULL,
-  libunwind_frame_sniffer,
-  libunwind_frame_dealloc_cache,
-};
-
 /* Verify if there is sufficient libunwind information for the frame to use
    libunwind frame unwinding.  */
 int
 libunwind_frame_sniffer (const struct frame_unwind *self,
                          struct frame_info *this_frame, void **this_cache)
 {
   unw_cursor_t cursor;
   unw_accessors_t *acc;
   unw_addr_space_t as;
   struct libunwind_descr *descr;
@@ skipping 112 matching lines @@
               return frame_unwind_got_constant (this_frame, regnum, 0);
             val = frame_unwind_got_constant (this_frame, regnum, intval);
           }
         break;
       }
     }
 
   return val;
 } 
 
-CORE_ADDR
-libunwind_frame_base_address (struct frame_info *this_frame, void **this_cache)
-{
-  struct libunwind_frame_cache *cache =
-    libunwind_frame_cache (this_frame, this_cache);
-
-  if (cache == NULL)
-    return (CORE_ADDR)NULL;
-  return cache->base;
-}
-
 /* The following is a glue routine to call the libunwind unwind table
    search function to get unwind information for a specified ip address.  */ 
 int
 libunwind_search_unwind_table (void *as, long ip, void *di,
                                void *pi, int need_unwind_info, void *args)
 {
   return unw_search_unwind_table_p (*(unw_addr_space_t *)as, (unw_word_t )ip, 
                                     di, pi, need_unwind_info, args);
 }
 
@@ skipping 98 matching lines @@
   if (buf)
     memcpy (buf, ptr, register_size (gdbarch, regnum));
 
   return 0;
 }
   
 static int
 libunwind_load (void)
 {
   void *handle;
+  char *so_error = NULL;
 
   handle = dlopen (LIBUNWIND_SO, RTLD_NOW);
   if (handle == NULL)
+    {
+      so_error = xstrdup (dlerror ());
+#ifdef LIBUNWIND_SO_7
+      handle = dlopen (LIBUNWIND_SO_7, RTLD_NOW);
+#endif /* LIBUNWIND_SO_7 */
+    }
+  if (handle == NULL)
+    {
+      fprintf_unfiltered (gdb_stderr, _("[GDB failed to load %s: %s]\n"),
+                          LIBUNWIND_SO, so_error);
+#ifdef LIBUNWIND_SO_7
+      fprintf_unfiltered (gdb_stderr, _("[GDB failed to load %s: %s]\n"),
+                          LIBUNWIND_SO_7, dlerror ());
+#endif /* LIBUNWIND_SO_7 */
+    }
+  xfree (so_error);
+  if (handle == NULL)
     return 0;
 
   /* Initialize pointers to the dynamic library functions we will use.  */
 
   unw_get_reg_p = dlsym (handle, get_reg_name);
   if (unw_get_reg_p == NULL)
     return 0;
 
   unw_get_fpreg_p = dlsym (handle, get_fpreg_name);
   if (unw_get_fpreg_p == NULL)
@@ skipping 44 matching lines @@
 void _initialize_libunwind_frame (void);
 
 void
 _initialize_libunwind_frame (void)
 {
   libunwind_descr_handle
     = gdbarch_data_register_post_init (libunwind_descr_init);
 
   libunwind_initialized = libunwind_load ();
 }