Merge GDB 7.5.1

gdb/ia64-libunwind-tdep.h

Index: gdb/ia64-libunwind-tdep.h
diff --git a/gdb/libunwind-frame.h b/gdb/ia64-libunwind-tdep.h
similarity index 79%
rename from gdb/libunwind-frame.h
rename to gdb/ia64-libunwind-tdep.h
index 0251819058b41c2f9e3760db53c32611e9a47a36..88f385719e76829949f37e6d8d3cc1859ce22987 100644
--- a/gdb/libunwind-frame.h
+++ b/gdb/ia64-libunwind-tdep.h
@@ -1,4 +1,4 @@
-/* Frame unwinder for frames with libunwind frame information.
+/* Frame unwinder for ia64 frames with libunwind frame information.
 
    Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
 
@@ -19,17 +19,22 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_LIBUNWIND_H
+#ifndef IA64_LIBUNWIND_TDEP_H
+#define IA64_LIBUNWIND_TDEP_H 1
 
 struct frame_info;
 struct frame_id;
 struct regcache;
 struct gdbarch;
+struct frame_unwind;
 
-#ifndef LIBUNWIND_FRAME_H
-#define LIBUNWIND_FRAME_H 1
-
-#include "libunwind.h"
+/* IA-64 is the only target that currently uses libunwind.  If some
+   other target wants to use it, we will need to do some abstracting
+   in order to make it possible to have more than one
+   ia64-libunwind-tdep instance.  Including "libunwind.h" is wrong as
+   that ends up including the libunwind-$(arch).h for the host gdb is
+   running on.  */
+#include "libunwind-ia64.h"
 
 struct libunwind_descr
 {
@@ -56,8 +61,6 @@ void libunwind_frame_this_id (struct frame_info *this_frame, void **this_cache,
 struct value *libunwind_frame_prev_register (struct frame_info *this_frame,
                                              void **this_cache, int regnum);
 void libunwind_frame_dealloc_cache (struct frame_info *self, void *cache);
-CORE_ADDR libunwind_frame_base_address (struct frame_info *this_frame,
-                                        void **this_cache);
 
 int libunwind_is_initialized (void);
 
@@ -71,6 +74,4 @@ int libunwind_get_reg_special (struct gdbarch *gdbarch,
 			       struct regcache *regcache,
 			       int regnum, void *buf);
 
-#endif /* libunwind-frame.h */
-
-#endif /* HAVE_LIBUNWIND_H  */
+#endif /* IA64_LIBUNWIND_TDEP_H */