Merge GDB 7.5.1

gdb/ia64-tdep.h

 /* Target-dependent code for the ia64.
 
    Copyright (C) 2004-2005, 2007-2012 Free Software Foundation, 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
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef IA64_TDEP_H
 #define IA64_TDEP_H
 
+#ifdef HAVE_LIBUNWIND_IA64_H
+#include "libunwind-ia64.h"
+#include "ia64-libunwind-tdep.h"
+#endif
+
 /* Register numbers of various important registers.  */
 
 /* General registers; there are 128 of these 64 bit wide registers.
    The first 32 are static and the last 96 are stacked.  */
 #define IA64_GR0_REGNUM         0
 #define IA64_GR1_REGNUM         (IA64_GR0_REGNUM + 1)
 #define IA64_GR2_REGNUM         (IA64_GR0_REGNUM + 2)
 #define IA64_GR3_REGNUM         (IA64_GR0_REGNUM + 3)
 #define IA64_GR4_REGNUM         (IA64_GR0_REGNUM + 4)
 #define IA64_GR5_REGNUM         (IA64_GR0_REGNUM + 5)
@@ skipping 210 matching lines @@
                                                CORE_ADDR faddr);
 
   /* ISA-specific data types.  */
   struct type *ia64_ext_type;
 
   struct ia64_infcall_ops infcall_ops;
 };
 
 extern void ia64_write_pc (struct regcache *, CORE_ADDR);
 
+#ifdef HAVE_LIBUNWIND_IA64_H
+extern unw_accessors_t ia64_unw_accessors;
+extern unw_accessors_t ia64_unw_rse_accessors;
+extern struct libunwind_descr ia64_libunwind_descr;
+#endif
+
 #endif /* ia64-tdep.h */