This is the mail archive of the gdb-cvs@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] Remove HPUX


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=61a12cfa7b25746914493cc0d94e5053a8492aa5

commit 61a12cfa7b25746914493cc0d94e5053a8492aa5
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Mar 13 20:24:22 2015 +0100

    Remove HPUX
    
    IIUC it is a pre-requisite for IPv6 support, some UNICes do not support
    getaddrinfo required for IPv6.  But coincidentally such UNICes are no longer
    really supported by GDB.  Therefore it was concluded we can remove all such
    UNICes and then we can implement IPv6 easily with getaddrinfo.
    
    In mail
            Re: getaddrinfo available on all GDB hosts? [Re: [PATCH v2] Add IPv6 support for remote TCP connections]
            Message-ID: <20140211034157.GG5485@adacore.com>
            https://sourceware.org/ml/gdb-patches/2014-02/msg00333.html
    Joel said:
    
    So I chose HP-UX first for this patch.
    
    gdb/ChangeLog
    2014-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
    
    	Remove HPUX.
    	* Makefile.in (ALL_64_TARGET_OBS): Remove ia64-hpux-tdep.o.
    	(ALL_TARGET_OBS): Remove hppa-hpux-tdep.o, solib-som.o and solib-pa64.o.
    	(HFILES_NO_SRCDIR): Remove solib-som.h, inf-ttrace.h, solib-pa64.h and
    	ia64-hpux-tdep.h, solib-ia64-hpux.h.
    	(ALLDEPFILES): Remove hppa-hpux-tdep.c, hppa-hpux-nat.c,
    	ia64-hpux-nat.c, ia64-hpux-tdep.c, somread.c and solib-som.c.
    	* config/djgpp/fnchange.lst: Remove hppa-hpux-nat.c and
    	hppa-hpux-tdep.c.
    	* config/ia64/hpux.mh: Remove file.
    	* config/pa/hpux.mh: Remove file.
    	* configure: Rebuilt.
    	* configure.ac (dlgetmodinfo, somread.o): Remove.
    	* configure.host (hppa*-*-hpux*, ia64-*-hpux*): Make them obsolete.
    	(ia64-*-hpux*): Remove its float format exception.
    	* configure.tgt (hppa*-*-hpux*, ia64-*-hpux*): Make them obsolete.
    	* hppa-hpux-nat.c: Remove file.
    	* hppa-hpux-tdep.c: Remove file.
    	* hppa-tdep.c (struct hppa_unwind_info, struct hppa_objfile_private):
    	Move them here from hppa-tdep.h
    	(hppa_objfile_priv_data, hppa_init_objfile_priv_data): Make it static.
    	(hppa_frame_prev_register_helper): Remove HPPA_FLAGS_REGNUM exception.
    	* hppa-tdep.h (struct hppa_unwind_info, struct hppa_objfile_private):
    	Move them to hppa-tdep.c.
    	(hppa_objfile_priv_data, hppa_init_objfile_priv_data): Remove
    	declarations.
    	* ia64-hpux-nat.c: Remove file.
    	* ia64-hpux-tdep.c: Remove file.
    	* ia64-hpux-tdep.h: Remove file.
    	* inf-ttrace.c: Remove file.
    	* inf-ttrace.h: Remove file.
    	* solib-ia64-hpux.c: Remove file.
    	* solib-ia64-hpux.h: Remove file.
    	* solib-pa64.c: Remove file.
    	* solib-pa64.h: Remove file.
    	* solib-som.c: Remove file.
    	* solib-som.h: Remove file.
    	* somread.c: Remove file.

Diff:
---
 gdb/ChangeLog                 |   41 ++
 gdb/Makefile.in               |   22 +-
 gdb/config/djgpp/fnchange.lst |    2 -
 gdb/config/ia64/hpux.mh       |    3 -
 gdb/config/pa/hpux.mh         |    3 -
 gdb/configure                 |  106 ---
 gdb/configure.ac              |   10 -
 gdb/configure.host            |   10 +-
 gdb/configure.tgt             |   10 +-
 gdb/hppa-hpux-nat.c           |  273 -------
 gdb/hppa-hpux-tdep.c          | 1572 -----------------------------------------
 gdb/hppa-tdep.c               |   43 +-
 gdb/hppa-tdep.h               |   35 -
 gdb/ia64-hpux-nat.c           |  756 --------------------
 gdb/ia64-hpux-tdep.c          |  434 ------------
 gdb/ia64-hpux-tdep.h          |   24 -
 gdb/inf-ttrace.c              | 1224 --------------------------------
 gdb/inf-ttrace.h              |   28 -
 gdb/solib-ia64-hpux.c         |  705 ------------------
 gdb/solib-ia64-hpux.h         |   25 -
 gdb/solib-pa64.c              |  654 -----------------
 gdb/solib-pa64.h              |   25 -
 gdb/solib-som.c               |  891 -----------------------
 gdb/solib-som.h               |   35 -
 gdb/somread.c                 |  547 --------------
 25 files changed, 88 insertions(+), 7390 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dd9d9e2..65a0051 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,44 @@
+2014-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Remove HPUX.
+	* Makefile.in (ALL_64_TARGET_OBS): Remove ia64-hpux-tdep.o.
+	(ALL_TARGET_OBS): Remove hppa-hpux-tdep.o, solib-som.o and solib-pa64.o.
+	(HFILES_NO_SRCDIR): Remove solib-som.h, inf-ttrace.h, solib-pa64.h and
+	ia64-hpux-tdep.h, solib-ia64-hpux.h.
+	(ALLDEPFILES): Remove hppa-hpux-tdep.c, hppa-hpux-nat.c,
+	ia64-hpux-nat.c, ia64-hpux-tdep.c, somread.c and solib-som.c.
+	* config/djgpp/fnchange.lst: Remove hppa-hpux-nat.c and
+	hppa-hpux-tdep.c.
+	* config/ia64/hpux.mh: Remove file.
+	* config/pa/hpux.mh: Remove file.
+	* configure: Rebuilt.
+	* configure.ac (dlgetmodinfo, somread.o): Remove.
+	* configure.host (hppa*-*-hpux*, ia64-*-hpux*): Make them obsolete.
+	(ia64-*-hpux*): Remove its float format exception.
+	* configure.tgt (hppa*-*-hpux*, ia64-*-hpux*): Make them obsolete.
+	* hppa-hpux-nat.c: Remove file.
+	* hppa-hpux-tdep.c: Remove file.
+	* hppa-tdep.c (struct hppa_unwind_info, struct hppa_objfile_private):
+	Move them here from hppa-tdep.h
+	(hppa_objfile_priv_data, hppa_init_objfile_priv_data): Make it static.
+	(hppa_frame_prev_register_helper): Remove HPPA_FLAGS_REGNUM exception.
+	* hppa-tdep.h (struct hppa_unwind_info, struct hppa_objfile_private):
+	Move them to hppa-tdep.c.
+	(hppa_objfile_priv_data, hppa_init_objfile_priv_data): Remove
+	declarations.
+	* ia64-hpux-nat.c: Remove file.
+	* ia64-hpux-tdep.c: Remove file.
+	* ia64-hpux-tdep.h: Remove file.
+	* inf-ttrace.c: Remove file.
+	* inf-ttrace.h: Remove file.
+	* solib-ia64-hpux.c: Remove file.
+	* solib-ia64-hpux.h: Remove file.
+	* solib-pa64.c: Remove file.
+	* solib-pa64.h: Remove file.
+	* solib-som.c: Remove file.
+	* solib-som.h: Remove file.
+	* somread.c: Remove file.
+
 2015-03-13  John Baldwin  <jhb@FreeBSD.org>
 
 	* configure.ac: AC_SEARCH_LIBS(kinfo_getvmmap, util).
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 7eefa5b..dbace2d 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -635,7 +635,7 @@ ALL_64_TARGET_OBS = \
 	amd64fbsd-tdep.o amd64-darwin-tdep.o amd64-dicos-tdep.o \
 	amd64-linux-tdep.o amd64nbsd-tdep.o \
 	amd64obsd-tdep.o amd64-sol2-tdep.o amd64-tdep.o amd64-windows-tdep.o \
-	ia64-hpux-tdep.o ia64-linux-tdep.o ia64-vms-tdep.o ia64-tdep.o \
+	ia64-linux-tdep.o ia64-vms-tdep.o ia64-tdep.o \
 	mips64obsd-tdep.o \
 	sparc64fbsd-tdep.o sparc64-linux-tdep.o sparc64nbsd-tdep.o \
 	sparc64obsd-tdep.o sparc64-sol2-tdep.o sparc64-tdep.o
@@ -653,7 +653,7 @@ ALL_TARGET_OBS = \
 	frv-linux-tdep.o frv-tdep.o \
 	h8300-tdep.o \
 	hppabsd-tdep.o hppanbsd-tdep.o hppaobsd-tdep.o \
-	hppa-hpux-tdep.o hppa-linux-tdep.o hppa-tdep.o \
+	hppa-linux-tdep.o hppa-tdep.o \
 	i386bsd-tdep.o i386-cygwin-tdep.o i386fbsd-tdep.o i386gnu-tdep.o \
 	i386-linux-tdep.o i386nbsd-tdep.o i386-nto-tdep.o i386obsd-tdep.o \
 	i386-sol2-tdep.o i386-tdep.o i387-tdep.o \
@@ -698,7 +698,7 @@ ALL_TARGET_OBS = \
 	nbsd-tdep.o obsd-tdep.o \
 	sol2-tdep.o \
 	solib-frv.o solib-svr4.o \
-	solib-som.o solib-pa64.o solib-darwin.o solib-dsbt.o \
+	solib-darwin.o solib-dsbt.o \
 	dbug-rom.o dink32-rom.o ppcbug-rom.o m32r-rom.o dsrec.o monitor.o \
 	remote-m32r-sdi.o remote-mips.o \
 	xcoffread.o \
@@ -894,7 +894,7 @@ common/gdb_signals.h nat/gdb_thread_db.h common/gdb_vecs.h \
 common/x86-xstate.h nat/linux-ptrace.h nat/mips-linux-watch.h \
 proc-utils.h aarch64-tdep.h arm-tdep.h ax-gdb.h ppcfbsd-tdep.h \
 ppcnbsd-tdep.h cli-out.h gdb_expat.h breakpoint.h infcall.h obsd-tdep.h \
-exec.h m32r-tdep.h osabi.h gdbcore.h solib-som.h amd64bsd-nat.h \
+exec.h m32r-tdep.h osabi.h gdbcore.h amd64bsd-nat.h \
 i386bsd-nat.h xml-support.h xml-tdesc.h alphabsd-tdep.h gdb_obstack.h \
 ia64-tdep.h ada-lang.h varobj.h varobj-iter.h frv-tdep.h \
 nto-tdep.h serial.h \
@@ -911,7 +911,7 @@ ser-unix.h inf-ptrace.h terminal.h ui-out.h frame-base.h \
 f-lang.h dwarf2loc.h value.h sparc-tdep.h defs.h target-descriptions.h \
 objfiles.h common/vec.h disasm.h mips-tdep.h ser-base.h \
 gdb_curses.h bfd-target.h memattr.h inferior.h ax.h dummy-frame.h \
-inflow.h fbsd-nat.h ia64-libunwind-tdep.h completer.h inf-ttrace.h \
+inflow.h fbsd-nat.h ia64-libunwind-tdep.h completer.h \
 solib-target.h gdb_vfork.h alpha-tdep.h dwarf2expr.h \
 m2-lang.h stack.h charset.h addrmap.h command.h solist.h source.h \
 target.h target-dcache.h prologue-value.h cp-abi.h tui/tui-hooks.h tui/tui.h \
@@ -928,7 +928,7 @@ complaints.h gdb_proc_service.h gdb_regex.h xtensa-tdep.h inf-loop.h \
 common/gdb_wait.h common/gdb_assert.h solib.h ppc-tdep.h cp-support.h glibc-tdep.h \
 interps.h auxv.h gdbcmd.h tramp-frame.h mipsnbsd-tdep.h	\
 amd64-linux-tdep.h linespec.h i387-tdep.h mn10300-tdep.h \
-sparc64-tdep.h monitor.h ppcobsd-tdep.h srec.h solib-pa64.h \
+sparc64-tdep.h monitor.h ppcobsd-tdep.h srec.h \
 coff-pe-read.h parser-defs.h gdb_ptrace.h mips-linux-tdep.h \
 m68k-tdep.h spu-tdep.h jv-lang.h environ.h amd64-tdep.h \
 doublest.h regset.h hppa-tdep.h ppc-linux-tdep.h ppc64-tdep.h \
@@ -945,7 +945,7 @@ annotate.h sim-regno.h dictionary.h dfp.h main.h frame-unwind.h	\
 remote-fileio.h i386-linux-tdep.h vax-tdep.h objc-lang.h \
 sentinel-frame.h bcache.h symfile.h windows-tdep.h linux-tdep.h \
 gdb_usleep.h jit.h xml-syscall.h microblaze-tdep.h \
-psymtab.h psympriv.h progspace.h bfin-tdep.h ia64-hpux-tdep.h \
+psymtab.h psympriv.h progspace.h bfin-tdep.h \
 amd64-darwin-tdep.h charset-list.h \
 config/djgpp/langinfo.h config/djgpp/nl_types.h darwin-nat.h \
 dicos-tdep.h filesystem.h gcore.h gdb_wchar.h hppabsd-tdep.h \
@@ -953,7 +953,7 @@ i386-darwin-tdep.h x86-nat.h linux-record.h moxie-tdep.h nios2-tdep.h \
 osdata.h procfs.h python/py-event.h python/py-events.h python/py-stopevent.h \
 python/python-internal.h python/python.h ravenscar-thread.h record.h \
 record-full.h solib-aix.h \
-solib-darwin.h solib-ia64-hpux.h solib-spu.h windows-nat.h xcoffread.h \
+solib-darwin.h solib-spu.h windows-nat.h xcoffread.h \
 gnulib/import/extra/snippet/arg-nonnull.h gnulib/import/extra/snippet/c++defs.h \
 gnulib/import/extra/snippet/warn-on-use.h \
 gnulib/import/stddef.in.h gnulib/import/inttypes.in.h inline-frame.h skip.h \
@@ -1657,7 +1657,7 @@ ALLDEPFILES = \
 	fork-child.c \
 	glibc-tdep.c \
 	go32-nat.c h8300-tdep.c \
-	hppa-tdep.c hppa-hpux-tdep.c hppa-hpux-nat.c \
+	hppa-tdep.c \
 	hppa-linux-tdep.c hppa-linux-nat.c \
 	hppabsd-tdep.c \
 	hppanbsd-nat.c hppanbsd-tdep.c \
@@ -1672,9 +1672,8 @@ ALLDEPFILES = \
 	i386-linux-tdep.c x86-nat.c \
 	i386-sol2-nat.c i386-sol2-tdep.c \
 	i386gnu-nat.c i386gnu-tdep.c \
-	ia64-hpux-nat.c ia64-hpux-tdep.c \
 	ia64-linux-nat.c ia64-linux-tdep.c ia64-tdep.c ia64-vms-tdep.c \
-	inf-ptrace.c inf-ttrace.c \
+	inf-ptrace.c \
 	ia64-libunwind-tdep.c \
 	linux-fork.c \
 	linux-tdep.c \
@@ -1697,7 +1696,6 @@ ALLDEPFILES = \
 	msp430-tdep.c \
 	nios2-tdep.c nios2-linux-tdep.c \
 	nbsd-nat.c nbsd-tdep.c obsd-nat.c obsd-tdep.c \
-	somread.c solib-som.c \
 	posix-hdep.c common/posix-strerror.c \
 	ppc-sysv-tdep.c ppc-linux-nat.c ppc-linux-tdep.c ppc64-tdep.c \
 	ppcfbsd-nat.c ppcfbsd-tdep.c \
diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst
index d977870..c05eb2c 100644
--- a/gdb/config/djgpp/fnchange.lst
+++ b/gdb/config/djgpp/fnchange.lst
@@ -510,8 +510,6 @@
 @V@/gdb/amd64-linux-nat.c @V@/gdb/amd64-lnat.c
 @V@/gdb/hppa-linux-tdep.c @V@/gdb/palnxtdep.c
 @V@/gdb/hppa-linux-nat.c @V@/gdb/palnxnat.c
-@V@/gdb/hppa-hpux-nat.c @V@/gdb/pahpuxnat.c
-@V@/gdb/hppa-hpux-tdep.c @V@/gdb/pahpuxtdep.c
 @V@/gdb/hppanbsd-nat.c @V@/gdb/panbsd-nat.c
 @V@/gdb/hppanbsd-tdep.c @V@/gdb/panbsd-tdep.c
 @V@/gdb/amd64-windows-nat.c @V@/gdb/amd64-wnat.c
diff --git a/gdb/config/ia64/hpux.mh b/gdb/config/ia64/hpux.mh
deleted file mode 100644
index 7bbfab4..0000000
--- a/gdb/config/ia64/hpux.mh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Host: ia64 running HP-UX
-NATDEPFILES= fork-child.o inf-ttrace.o ia64-hpux-nat.o \
-        solib-ia64-hpux.o
diff --git a/gdb/config/pa/hpux.mh b/gdb/config/pa/hpux.mh
deleted file mode 100644
index 3151120..0000000
--- a/gdb/config/pa/hpux.mh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Host: PA-RISC HP-UX
-NATDEPFILES= fork-child.o inf-ptrace.o inf-ttrace.o \
-	hppa-hpux-nat.o
diff --git a/gdb/configure b/gdb/configure
index 78d206b..db239b3 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -7101,64 +7101,6 @@ fi
   fi
 
 
-# On HP/UX we may need libxpdl for dlgetmodinfo (used by solib-pa64.c).
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlgetmodinfo" >&5
-$as_echo_n "checking for library containing dlgetmodinfo... " >&6; }
-if test "${ac_cv_search_dlgetmodinfo+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlgetmodinfo ();
-int
-main ()
-{
-return dlgetmodinfo ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' dl xpdl; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_dlgetmodinfo=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if test "${ac_cv_search_dlgetmodinfo+set}" = set; then :
-  break
-fi
-done
-if test "${ac_cv_search_dlgetmodinfo+set}" = set; then :
-
-else
-  ac_cv_search_dlgetmodinfo=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlgetmodinfo" >&5
-$as_echo "$ac_cv_search_dlgetmodinfo" >&6; }
-ac_res=$ac_cv_search_dlgetmodinfo
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-
 # On FreeBSD we may need libutil for kinfo_getvmmap (used by fbsd-nat.c).
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing kinfo_getvmmap" >&5
 $as_echo_n "checking for library containing kinfo_getvmmap... " >&6; }
@@ -13803,54 +13745,6 @@ if test $gdb_cv_var_macho = yes; then
   CONFIG_OBS="$CONFIG_OBS machoread.o"
 fi
 
-# Add SOM support to GDB, but only if BFD includes it.
-
-  OLD_CFLAGS=$CFLAGS
-  OLD_LDFLAGS=$LDFLAGS
-  OLD_LIBS=$LIBS
-  # Put the old CFLAGS/LDFLAGS last, in case the user's (C|LD)FLAGS
-  # points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
-  # always want our bfd.
-  CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
-  LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
-  intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
-  LIBS="-lbfd -liberty $intl $LIBS"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOM support in BFD" >&5
-$as_echo_n "checking for SOM support in BFD... " >&6; }
-if test "${gdb_cv_var_som+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-  #include "bfd.h"
-  #include "som.h"
-
-int
-main ()
-{
-return bfd_som_attach_aux_hdr (NULL, 0, NULL);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gdb_cv_var_som=yes
-else
-  gdb_cv_var_som=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_var_som" >&5
-$as_echo "$gdb_cv_var_som" >&6; }
-  CFLAGS=$OLD_CFLAGS
-  LDFLAGS=$OLD_LDFLAGS
-  LIBS=$OLD_LIBS
-if test $gdb_cv_var_som = yes; then
-  CONFIG_OBS="$CONFIG_OBS somread.o"
-fi
-
 # Add any host-specific objects to GDB.
 CONFIG_OBS="${CONFIG_OBS} ${gdb_host_obs}"
 
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 38747e8..ace033e 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -534,9 +534,6 @@ AC_SEARCH_LIBS(socketpair, socket)
 # Link in zlib if we can.  This allows us to read compressed debug sections.
 AM_ZLIB
 
-# On HP/UX we may need libxpdl for dlgetmodinfo (used by solib-pa64.c).
-AC_SEARCH_LIBS(dlgetmodinfo, [dl xpdl])
-
 # On FreeBSD we may need libutil for kinfo_getvmmap (used by fbsd-nat.c).
 AC_SEARCH_LIBS(kinfo_getvmmap, util,
   [AC_DEFINE(HAVE_KINFO_GETVMMAP, 1,
@@ -2134,13 +2131,6 @@ if test $gdb_cv_var_macho = yes; then
   CONFIG_OBS="$CONFIG_OBS machoread.o"
 fi
 
-# Add SOM support to GDB, but only if BFD includes it.
-GDB_AC_CHECK_BFD([for SOM support in BFD], gdb_cv_var_som,
-                 [bfd_som_attach_aux_hdr (NULL, 0, NULL)], som.h)
-if test $gdb_cv_var_som = yes; then
-  CONFIG_OBS="$CONFIG_OBS somread.o"
-fi
-
 # Add any host-specific objects to GDB.
 CONFIG_OBS="${CONFIG_OBS} ${gdb_host_obs}"
 
diff --git a/gdb/configure.host b/gdb/configure.host
index d07be4b..48714f4 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -44,6 +44,8 @@ case $host in
  vax-*-bsd* | \
  vax-*-netbsd* | \
  vax-*-ultrix* | \
+ hppa*-*-hpux* | \
+ ia64-*-hpux* | \
  null)
     echo "*** Configuration $host is obsolete." >&2
     echo "*** Support has been REMOVED." >&2
@@ -93,8 +95,6 @@ arm*-*-netbsdelf* | arm*-*-knetbsd*-gnu)
 			gdb_host=nbsdelf ;;
 arm*-*-openbsd*)	gdb_host=nbsdelf ;;
 
-hppa*-*-hpux*)
-			gdb_host=hpux ;;
 hppa*-*-linux*)		gdb_host=linux ;;
 hppa*-*-netbsd*)	gdb_host=nbsd ;;
 hppa*-*-openbsd*)	gdb_host=obsd ;;
@@ -117,7 +117,6 @@ i[34567]86-*-solaris2.1[0-9]* | x86_64-*-solaris2.1[0-9]*)
 i[34567]86-*-solaris*)	gdb_host=i386sol2 ;;
 i[34567]86-*-cygwin*)	gdb_host=cygwin ;;
 
-ia64-*-hpux*)		gdb_host=hpux ;;
 ia64-*-linux*)		gdb_host=linux ;;
 
 m68*-*-linux*)		gdb_host=linux ;;
@@ -211,11 +210,6 @@ m68*-*-*)
 	gdb_host_double_format="&floatformat_ieee_double_big"
 	gdb_host_long_double_format="&floatformat_m68881_ext"
 	;;
-ia64-*-hpux*)
-	gdb_host_float_format="&floatformat_ieee_single_big"
-	gdb_host_double_format="&floatformat_ieee_double_big"
-	gdb_host_long_double_format="&floatformat_ia64_quad_big"
-	;;
 *)
 	gdb_host_float_format=0
 	gdb_host_double_format=0
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 7fdd34e..c97ebdd 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -24,6 +24,8 @@ case $targ in
  mips*-*-pe | \
  rs6000-*-lynxos* | \
  sh*-*-pe | \
+ hppa*-*-hpux* | \
+ ia64-*-hpux* | \
  null)
     echo "*** Configuration $targ is obsolete." >&2
     echo "*** Support has been REMOVED." >&2
@@ -149,10 +151,6 @@ h8300-*-*)
 	gdb_sim=../sim/h8300/libsim.a
 	;;
 
-hppa*-*-hpux*)
-	# Target: HP PA-RISC running hpux
-	gdb_target_obs="hppa-tdep.o hppa-hpux-tdep.o solib-som.o solib-pa64.o"
-	;;
 hppa*-*-linux*)
 	# Target: HP PA-RISC running Linux
 	gdb_target_obs="hppa-tdep.o hppa-linux-tdep.o glibc-tdep.o \
@@ -247,10 +245,6 @@ i[34567]86-*-*)
 	gdb_target_obs="i386-tdep.o i387-tdep.o"
 	;;
 
-ia64-*-hpux*)
-	# Target: Intel IA-64 running HP-UX
-	gdb_target_obs="ia64-tdep.o ia64-hpux-tdep.o"
-	;;
 ia64-*-linux*)
 	# Target: Intel IA-64 running GNU/Linux
 	gdb_target_obs="ia64-tdep.o ia64-linux-tdep.o linux-tdep.o \
diff --git a/gdb/hppa-hpux-nat.c b/gdb/hppa-hpux-nat.c
deleted file mode 100644
index 0727568..0000000
--- a/gdb/hppa-hpux-nat.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Native-dependent code for PA-RISC HP-UX.
-
-   Copyright (C) 2004-2015 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/>.  */
-
-#include "defs.h"
-#include "inferior.h"
-#include "regcache.h"
-#include "target.h"
-
-#include <sys/ptrace.h>
-#include <sys/utsname.h>
-#include <machine/save_state.h>
-
-#ifdef HAVE_TTRACE
-#include <sys/ttrace.h>
-#endif
-
-#include "hppa-tdep.h"
-#include "solib-som.h"
-#include "inf-ptrace.h"
-#include "inf-ttrace.h"
-
-/* Return the offset of register REGNUM within `struct save_state'.
-   The offset returns depends on the flags in the "flags" register and
-   the register size (32-bit or 64-bit).  These are taken from
-   REGCACHE.  */
-
-static LONGEST
-hppa_hpux_save_state_offset (struct regcache *regcache, int regnum)
-{
-  LONGEST offset;
-
-  if (regnum == HPPA_FLAGS_REGNUM)
-    return ssoff (ss_flags);
-
-  if (HPPA_R0_REGNUM < regnum && regnum < HPPA_FP0_REGNUM)
-    {
-      struct gdbarch *arch = get_regcache_arch (regcache);
-      size_t size = register_size (arch, HPPA_R1_REGNUM);
-      ULONGEST flags;
-
-      gdb_assert (size == 4 || size == 8);
-
-      regcache_cooked_read_unsigned (regcache, HPPA_FLAGS_REGNUM, &flags);
-      if (flags & SS_WIDEREGS)
-	offset = ssoff (ss_wide) + (8 - size) + (regnum - HPPA_R0_REGNUM) * 8;
-      else
-	offset = ssoff (ss_narrow) + (regnum - HPPA_R1_REGNUM) * 4;
-    }
-  else
-    {
-      struct gdbarch *arch = get_regcache_arch (regcache);
-      size_t size = register_size (arch, HPPA_FP0_REGNUM);
-
-      gdb_assert (size == 4 || size == 8);
-      gdb_assert (regnum >= HPPA_FP0_REGNUM);
-      offset = ssoff(ss_fpblock) + (regnum - HPPA_FP0_REGNUM) * size;
-    }
-
-  gdb_assert (offset < sizeof (save_state_t));
-  return offset;
-}
-
-/* Just in case a future version of PA-RISC HP-UX won't have ptrace(2)
-   at all.  */
-#ifndef PTRACE_TYPE_RET
-#define PTRACE_TYPE_RET void
-#endif
-
-static void
-hppa_hpux_fetch_register (struct regcache *regcache, int regnum)
-{
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  CORE_ADDR addr;
-  size_t size;
-  PTRACE_TYPE_RET *buf;
-  pid_t pid;
-  int i;
-
-  pid = ptid_get_pid (inferior_ptid);
-
-  /* This isn't really an address, but ptrace thinks of it as one.  */
-  addr = hppa_hpux_save_state_offset (regcache, regnum);
-  size = register_size (gdbarch, regnum);
-
-  gdb_assert (size == 4 || size == 8);
-  buf = alloca (size);
-
-#ifdef HAVE_TTRACE
-  {
-    lwpid_t lwp = ptid_get_lwp (inferior_ptid);
-
-    if (ttrace (TT_LWP_RUREGS, pid, lwp, addr, size, (uintptr_t)buf) == -1)
-      error (_("Couldn't read register %s (#%d): %s"),
-	     gdbarch_register_name (gdbarch, regnum),
-	     regnum, safe_strerror (errno));
-  }
-#else
-  {
-    int i;
-
-    /* Read the register contents from the inferior a chuck at the time.  */
-    for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
-      {
-	errno = 0;
-	buf[i] = ptrace (PT_RUREGS, pid, (PTRACE_TYPE_ARG3) addr, 0, 0);
-	if (errno != 0)
-	  error (_("Couldn't read register %s (#%d): %s"),
-		 gdbarch_register_name (gdbarch, regnum),
-		 regnum, safe_strerror (errno));
-
-	addr += sizeof (PTRACE_TYPE_RET);
-      }
-  }
-#endif
-
-  /* Take care with the "flags" register.  It's stored as an `int' in
-     `struct save_state', even for 64-bit code.  */
-  if (regnum == HPPA_FLAGS_REGNUM && size == 8)
-    {
-      ULONGEST flags;
-      flags = extract_unsigned_integer ((gdb_byte *)buf, 4, byte_order);
-      store_unsigned_integer ((gdb_byte *)buf, 8, byte_order, flags);
-    }
-
-  regcache_raw_supply (regcache, regnum, buf);
-}
-
-static void
-hppa_hpux_fetch_inferior_registers (struct target_ops *ops,
-				    struct regcache *regcache, int regnum)
-{
-  if (regnum == -1)
-    for (regnum = 0;
-	 regnum < gdbarch_num_regs (get_regcache_arch (regcache));
-	 regnum++)
-      hppa_hpux_fetch_register (regcache, regnum);
-  else
-    hppa_hpux_fetch_register (regcache, regnum);
-}
-
-/* Store register REGNUM into the inferior.  */
-
-static void
-hppa_hpux_store_register (struct regcache *regcache, int regnum)
-{
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  CORE_ADDR addr;
-  size_t size;
-  PTRACE_TYPE_RET *buf;
-  pid_t pid;
-
-  pid = ptid_get_pid (inferior_ptid);
-
-  /* This isn't really an address, but ptrace thinks of it as one.  */
-  addr = hppa_hpux_save_state_offset (regcache, regnum);
-  size = register_size (gdbarch, regnum);
-
-  gdb_assert (size == 4 || size == 8);
-  buf = alloca (size);
-
-  regcache_raw_collect (regcache, regnum, buf);
-
-  /* Take care with the "flags" register.  It's stored as an `int' in
-     `struct save_state', even for 64-bit code.  */
-  if (regnum == HPPA_FLAGS_REGNUM && size == 8)
-    {
-      ULONGEST flags;
-      flags = extract_unsigned_integer ((gdb_byte *)buf, 8, byte_order);
-      store_unsigned_integer ((gdb_byte *)buf, 4, byte_order, flags);
-      size = 4;
-    }
-
-#ifdef HAVE_TTRACE
-  {
-    lwpid_t lwp = ptid_get_lwp (inferior_ptid);
-
-    if (ttrace (TT_LWP_WUREGS, pid, lwp, addr, size, (uintptr_t)buf) == -1)
-      error (_("Couldn't write register %s (#%d): %s"),
-	     gdbarch_register_name (gdbarch, regnum),
-	     regnum, safe_strerror (errno));
-  }
-#else
-  {
-    int i;
-
-    /* Write the register contents into the inferior a chunk at the time.  */
-    for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
-      {
-	errno = 0;
-	ptrace (PT_WUREGS, pid, (PTRACE_TYPE_ARG3) addr, buf[i], 0);
-	if (errno != 0)
-	  error (_("Couldn't write register %s (#%d): %s"),
-		 gdbarch_register_name (gdbarch, regnum),
-		 regnum, safe_strerror (errno));
-
-	addr += sizeof (PTRACE_TYPE_RET);
-      }
-  }
-#endif
-}
-
-/* Store register REGNUM back into the inferior.  If REGNUM is -1, do
-   this for all registers (including the floating point registers).  */
-
-static void
-hppa_hpux_store_inferior_registers (struct target_ops *ops,
-				    struct regcache *regcache, int regnum)
-{
-  if (regnum == -1)
-    for (regnum = 0;
-	 regnum < gdbarch_num_regs (get_regcache_arch (regcache));
-	 regnum++)
-      hppa_hpux_store_register (regcache, regnum);
-  else
-    hppa_hpux_store_register (regcache, regnum);
-}
-
-/* Set hpux_major_release variable to the value retrieved from a call to
-   uname function.  */
-
-static void
-set_hpux_major_release (void)
-{
-  struct utsname x;
-  char *p;
-
-  uname (&x);
-  p = strchr (x.release, '.');
-  if (p)
-    hpux_major_release = atoi (p + 1);
-}
-
-
-
-/* Prevent warning from -Wmissing-prototypes.  */
-void _initialize_hppa_hpux_nat (void);
-
-void
-_initialize_hppa_hpux_nat (void)
-{
-  struct target_ops *t;
-
-  set_hpux_major_release ();
-
-#ifdef HAVE_TTRACE
-  t = inf_ttrace_target ();
-#else
-  t = inf_ptrace_target ();
-#endif
-
-  t->to_fetch_registers = hppa_hpux_fetch_inferior_registers;
-  t->to_store_registers = hppa_hpux_store_inferior_registers;
-
-  add_target (t);
-}
diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c
deleted file mode 100644
index 3c0f390..0000000
--- a/gdb/hppa-hpux-tdep.c
+++ /dev/null
@@ -1,1572 +0,0 @@
-/* Target-dependent code for HP-UX on PA-RISC.
-
-   Copyright (C) 2002-2015 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/>.  */
-
-#include "defs.h"
-#include "arch-utils.h"
-#include "gdbcore.h"
-#include "osabi.h"
-#include "frame.h"
-#include "frame-unwind.h"
-#include "trad-frame.h"
-#include "symtab.h"
-#include "objfiles.h"
-#include "inferior.h"
-#include "infcall.h"
-#include "observer.h"
-#include "hppa-tdep.h"
-#include "solib-som.h"
-#include "solib-pa64.h"
-#include "regset.h"
-#include "regcache.h"
-
-#define IS_32BIT_TARGET(_gdbarch) \
-	((gdbarch_tdep (_gdbarch))->bytes_per_address == 4)
-
-/* Bit in the `ss_flag' member of `struct save_state' that indicates
-   that the 64-bit register values are live.  From
-   <machine/save_state.h>.  */
-#define HPPA_HPUX_SS_WIDEREGS		0x40
-
-/* Offsets of various parts of `struct save_state'.  From
-   <machine/save_state.h>.  */
-#define HPPA_HPUX_SS_FLAGS_OFFSET	0
-#define HPPA_HPUX_SS_NARROW_OFFSET	4
-#define HPPA_HPUX_SS_FPBLOCK_OFFSET 	256
-#define HPPA_HPUX_SS_WIDE_OFFSET        640
-
-/* The size of `struct save_state.  */
-#define HPPA_HPUX_SAVE_STATE_SIZE	1152
-
-/* The size of `struct pa89_save_state', which corresponds to PA-RISC
-   1.1, the lowest common denominator that we support.  */
-#define HPPA_HPUX_PA89_SAVE_STATE_SIZE	512
-
-
-/* Forward declarations.  */
-extern void _initialize_hppa_hpux_tdep (void);
-extern initialize_file_ftype _initialize_hppa_hpux_tdep;
-
-/* Return one if PC is in the call path of a trampoline, else return zero.
-
-   Note we return one for *any* call trampoline (long-call, arg-reloc), not
-   just shared library trampolines (import, export).  */
-
-static int
-hppa32_hpux_in_solib_call_trampoline (struct gdbarch *gdbarch, CORE_ADDR pc)
-{
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  struct bound_minimal_symbol minsym;
-  struct unwind_table_entry *u;
-
-  /* First see if PC is in one of the two C-library trampolines.  */
-  if (pc == hppa_symbol_address("$$dyncall") 
-      || pc == hppa_symbol_address("_sr4export"))
-    return 1;
-
-  minsym = lookup_minimal_symbol_by_pc (pc);
-  if (minsym.minsym
-      && strcmp (MSYMBOL_LINKAGE_NAME (minsym.minsym), ".stub") == 0)
-    return 1;
-
-  /* Get the unwind descriptor corresponding to PC, return zero
-     if no unwind was found.  */
-  u = find_unwind_entry (pc);
-  if (!u)
-    return 0;
-
-  /* If this isn't a linker stub, then return now.  */
-  if (u->stub_unwind.stub_type == 0)
-    return 0;
-
-  /* By definition a long-branch stub is a call stub.  */
-  if (u->stub_unwind.stub_type == LONG_BRANCH)
-    return 1;
-
-  /* The call and return path execute the same instructions within
-     an IMPORT stub!  So an IMPORT stub is both a call and return
-     trampoline.  */
-  if (u->stub_unwind.stub_type == IMPORT)
-    return 1;
-
-  /* Parameter relocation stubs always have a call path and may have a
-     return path.  */
-  if (u->stub_unwind.stub_type == PARAMETER_RELOCATION
-      || u->stub_unwind.stub_type == EXPORT)
-    {
-      CORE_ADDR addr;
-
-      /* Search forward from the current PC until we hit a branch
-         or the end of the stub.  */
-      for (addr = pc; addr <= u->region_end; addr += 4)
-	{
-	  unsigned long insn;
-
-	  insn = read_memory_integer (addr, 4, byte_order);
-
-	  /* Does it look like a bl?  If so then it's the call path, if
-	     we find a bv or be first, then we're on the return path.  */
-	  if ((insn & 0xfc00e000) == 0xe8000000)
-	    return 1;
-	  else if ((insn & 0xfc00e001) == 0xe800c000
-		   || (insn & 0xfc000000) == 0xe0000000)
-	    return 0;
-	}
-
-      /* Should never happen.  */
-      warning (_("Unable to find branch in parameter relocation stub."));
-      return 0;
-    }
-
-  /* Unknown stub type.  For now, just return zero.  */
-  return 0;
-}
-
-static int
-hppa64_hpux_in_solib_call_trampoline (struct gdbarch *gdbarch, CORE_ADDR pc)
-{
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-
-  /* PA64 has a completely different stub/trampoline scheme.  Is it
-     better?  Maybe.  It's certainly harder to determine with any
-     certainty that we are in a stub because we can not refer to the
-     unwinders to help.
-
-     The heuristic is simple.  Try to lookup the current PC value in th
-     minimal symbol table.  If that fails, then assume we are not in a
-     stub and return.
-
-     Then see if the PC value falls within the section bounds for the
-     section containing the minimal symbol we found in the first
-     step.  If it does, then assume we are not in a stub and return.
-
-     Finally peek at the instructions to see if they look like a stub.  */
-  struct bound_minimal_symbol minsym;
-  asection *sec;
-  CORE_ADDR addr;
-  int insn;
-
-  minsym = lookup_minimal_symbol_by_pc (pc);
-  if (! minsym.minsym)
-    return 0;
-
-  sec = MSYMBOL_OBJ_SECTION (minsym.objfile, minsym.minsym)->the_bfd_section;
-
-  if (bfd_get_section_vma (sec->owner, sec) <= pc
-      && pc < (bfd_get_section_vma (sec->owner, sec)
-		 + bfd_section_size (sec->owner, sec)))
-      return 0;
-
-  /* We might be in a stub.  Peek at the instructions.  Stubs are 3
-     instructions long.  */
-  insn = read_memory_integer (pc, 4, byte_order);
-
-  /* Find out where we think we are within the stub.  */
-  if ((insn & 0xffffc00e) == 0x53610000)
-    addr = pc;
-  else if ((insn & 0xffffffff) == 0xe820d000)
-    addr = pc - 4;
-  else if ((insn & 0xffffc00e) == 0x537b0000)
-    addr = pc - 8;
-  else
-    return 0;
-
-  /* Now verify each insn in the range looks like a stub instruction.  */
-  insn = read_memory_integer (addr, 4, byte_order);
-  if ((insn & 0xffffc00e) != 0x53610000)
-    return 0;
-	
-  /* Now verify each insn in the range looks like a stub instruction.  */
-  insn = read_memory_integer (addr + 4, 4, byte_order);
-  if ((insn & 0xffffffff) != 0xe820d000)
-    return 0;
-    
-  /* Now verify each insn in the range looks like a stub instruction.  */
-  insn = read_memory_integer (addr + 8, 4, byte_order);
-  if ((insn & 0xffffc00e) != 0x537b0000)
-    return 0;
-
-  /* Looks like a stub.  */
-  return 1;
-}
-
-/* Return one if PC is in the return path of a trampoline, else return zero.
-
-   Note we return one for *any* call trampoline (long-call, arg-reloc), not
-   just shared library trampolines (import, export).  */
-
-static int
-hppa_hpux_in_solib_return_trampoline (struct gdbarch *gdbarch,
-				      CORE_ADDR pc, const char *name)
-{
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  struct unwind_table_entry *u;
-
-  /* Get the unwind descriptor corresponding to PC, return zero
-     if no unwind was found.  */
-  u = find_unwind_entry (pc);
-  if (!u)
-    return 0;
-
-  /* If this isn't a linker stub or it's just a long branch stub, then
-     return zero.  */
-  if (u->stub_unwind.stub_type == 0 || u->stub_unwind.stub_type == LONG_BRANCH)
-    return 0;
-
-  /* The call and return path execute the same instructions within
-     an IMPORT stub!  So an IMPORT stub is both a call and return
-     trampoline.  */
-  if (u->stub_unwind.stub_type == IMPORT)
-    return 1;
-
-  /* Parameter relocation stubs always have a call path and may have a
-     return path.  */
-  if (u->stub_unwind.stub_type == PARAMETER_RELOCATION
-      || u->stub_unwind.stub_type == EXPORT)
-    {
-      CORE_ADDR addr;
-
-      /* Search forward from the current PC until we hit a branch
-         or the end of the stub.  */
-      for (addr = pc; addr <= u->region_end; addr += 4)
-	{
-	  unsigned long insn;
-
-	  insn = read_memory_integer (addr, 4, byte_order);
-
-	  /* Does it look like a bl?  If so then it's the call path, if
-	     we find a bv or be first, then we're on the return path.  */
-	  if ((insn & 0xfc00e000) == 0xe8000000)
-	    return 0;
-	  else if ((insn & 0xfc00e001) == 0xe800c000
-		   || (insn & 0xfc000000) == 0xe0000000)
-	    return 1;
-	}
-
-      /* Should never happen.  */
-      warning (_("Unable to find branch in parameter relocation stub."));
-      return 0;
-    }
-
-  /* Unknown stub type.  For now, just return zero.  */
-  return 0;
-
-}
-
-/* Figure out if PC is in a trampoline, and if so find out where
-   the trampoline will jump to.  If not in a trampoline, return zero.
-
-   Simple code examination probably is not a good idea since the code
-   sequences in trampolines can also appear in user code.
-
-   We use unwinds and information from the minimal symbol table to
-   determine when we're in a trampoline.  This won't work for ELF
-   (yet) since it doesn't create stub unwind entries.  Whether or
-   not ELF will create stub unwinds or normal unwinds for linker
-   stubs is still being debated.
-
-   This should handle simple calls through dyncall or sr4export,
-   long calls, argument relocation stubs, and dyncall/sr4export
-   calling an argument relocation stub.  It even handles some stubs
-   used in dynamic executables.  */
-
-static CORE_ADDR
-hppa_hpux_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
-{
-  struct gdbarch *gdbarch = get_frame_arch (frame);
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  int word_size = gdbarch_ptr_bit (gdbarch) / 8;
-  long orig_pc = pc;
-  long prev_inst, curr_inst, loc;
-  struct bound_minimal_symbol msym;
-  struct unwind_table_entry *u;
-
-  /* Addresses passed to dyncall may *NOT* be the actual address
-     of the function.  So we may have to do something special.  */
-  if (pc == hppa_symbol_address("$$dyncall"))
-    {
-      pc = (CORE_ADDR) get_frame_register_unsigned (frame, 22);
-
-      /* If bit 30 (counting from the left) is on, then pc is the address of
-         the PLT entry for this function, not the address of the function
-         itself.  Bit 31 has meaning too, but only for MPE.  */
-      if (pc & 0x2)
-	pc = (CORE_ADDR) read_memory_integer (pc & ~0x3, word_size,
-					      byte_order);
-    }
-  if (pc == hppa_symbol_address("$$dyncall_external"))
-    {
-      pc = (CORE_ADDR) get_frame_register_unsigned (frame, 22);
-      pc = (CORE_ADDR) read_memory_integer (pc & ~0x3, word_size, byte_order);
-    }
-  else if (pc == hppa_symbol_address("_sr4export"))
-    pc = (CORE_ADDR) get_frame_register_unsigned (frame, 22);
-
-  /* Get the unwind descriptor corresponding to PC, return zero
-     if no unwind was found.  */
-  u = find_unwind_entry (pc);
-  if (!u)
-    return 0;
-
-  /* If this isn't a linker stub, then return now.  */
-  /* elz: attention here! (FIXME) because of a compiler/linker 
-     error, some stubs which should have a non zero stub_unwind.stub_type 
-     have unfortunately a value of zero.  So this function would return here
-     as if we were not in a trampoline.  To fix this, we go look at the partial
-     symbol information, which reports this guy as a stub.
-     (FIXME): Unfortunately, we are not that lucky: it turns out that the 
-     partial symbol information is also wrong sometimes.  This is because 
-     when it is entered (somread.c::som_symtab_read()) it can happen that
-     if the type of the symbol (from the som) is Entry, and the symbol is
-     in a shared library, then it can also be a trampoline.  This would be OK,
-     except that I believe the way they decide if we are ina shared library
-     does not work.  SOOOO..., even if we have a regular function w/o
-     trampolines its minimal symbol can be assigned type mst_solib_trampoline.
-     Also, if we find that the symbol is a real stub, then we fix the unwind
-     descriptor, and define the stub type to be EXPORT.
-     Hopefully this is correct most of the times.  */
-  if (u->stub_unwind.stub_type == 0)
-    {
-
-/* elz: NOTE (FIXME!) once the problem with the unwind information is fixed
-   we can delete all the code which appears between the lines.  */
-/*--------------------------------------------------------------------------*/
-      msym = lookup_minimal_symbol_by_pc (pc);
-
-      if (msym.minsym == NULL
-	  || MSYMBOL_TYPE (msym.minsym) != mst_solib_trampoline)
-	return orig_pc == pc ? 0 : pc & ~0x3;
-
-      else if (msym.minsym != NULL
-	       && MSYMBOL_TYPE (msym.minsym) == mst_solib_trampoline)
-	{
-	  struct objfile *objfile;
-	  struct minimal_symbol *msymbol;
-	  int function_found = 0;
-
-	  /* Go look if there is another minimal symbol with the same name as 
-	     this one, but with type mst_text.  This would happen if the msym
-	     is an actual trampoline, in which case there would be another
-	     symbol with the same name corresponding to the real function.  */
-
-	  ALL_MSYMBOLS (objfile, msymbol)
-	  {
-	    if (MSYMBOL_TYPE (msymbol) == mst_text
-		&& strcmp (MSYMBOL_LINKAGE_NAME (msymbol),
-			   MSYMBOL_LINKAGE_NAME (msym.minsym)) == 0)
-	      {
-		function_found = 1;
-		break;
-	      }
-	  }
-
-	  if (function_found)
-	    /* The type of msym is correct (mst_solib_trampoline), but
-	       the unwind info is wrong, so set it to the correct value.  */
-	    u->stub_unwind.stub_type = EXPORT;
-	  else
-	    /* The stub type info in the unwind is correct (this is not a
-	       trampoline), but the msym type information is wrong, it
-	       should be mst_text.  So we need to fix the msym, and also
-	       get out of this function.  */
-	    {
-	      MSYMBOL_TYPE (msym.minsym) = mst_text;
-	      return orig_pc == pc ? 0 : pc & ~0x3;
-	    }
-	}
-
-/*--------------------------------------------------------------------------*/
-    }
-
-  /* It's a stub.  Search for a branch and figure out where it goes.
-     Note we have to handle multi insn branch sequences like ldil;ble.
-     Most (all?) other branches can be determined by examining the contents
-     of certain registers and the stack.  */
-
-  loc = pc;
-  curr_inst = 0;
-  prev_inst = 0;
-  while (1)
-    {
-      /* Make sure we haven't walked outside the range of this stub.  */
-      if (u != find_unwind_entry (loc))
-	{
-	  warning (_("Unable to find branch in linker stub"));
-	  return orig_pc == pc ? 0 : pc & ~0x3;
-	}
-
-      prev_inst = curr_inst;
-      curr_inst = read_memory_integer (loc, 4, byte_order);
-
-      /* Does it look like a branch external using %r1?  Then it's the
-         branch from the stub to the actual function.  */
-      if ((curr_inst & 0xffe0e000) == 0xe0202000)
-	{
-	  /* Yup.  See if the previous instruction loaded
-	     a value into %r1.  If so compute and return the jump address.  */
-	  if ((prev_inst & 0xffe00000) == 0x20200000)
-	    return (hppa_extract_21 (prev_inst) 
-		    + hppa_extract_17 (curr_inst)) & ~0x3;
-	  else
-	    {
-	      warning (_("Unable to find ldil X,%%r1 "
-			 "before ble Y(%%sr4,%%r1)."));
-	      return orig_pc == pc ? 0 : pc & ~0x3;
-	    }
-	}
-
-      /* Does it look like a be 0(sr0,%r21)? OR 
-         Does it look like a be, n 0(sr0,%r21)? OR 
-         Does it look like a bve (r21)? (this is on PA2.0)
-         Does it look like a bve, n(r21)? (this is also on PA2.0)
-         That's the branch from an
-         import stub to an export stub.
-
-         It is impossible to determine the target of the branch via
-         simple examination of instructions and/or data (consider
-         that the address in the plabel may be the address of the
-         bind-on-reference routine in the dynamic loader).
-
-         So we have try an alternative approach.
-
-         Get the name of the symbol at our current location; it should
-         be a stub symbol with the same name as the symbol in the
-         shared library.
-
-         Then lookup a minimal symbol with the same name; we should
-         get the minimal symbol for the target routine in the shared
-         library as those take precedence of import/export stubs.  */
-      if ((curr_inst == 0xe2a00000) ||
-	  (curr_inst == 0xe2a00002) ||
-	  (curr_inst == 0xeaa0d000) ||
-	  (curr_inst == 0xeaa0d002))
-	{
-	  struct bound_minimal_symbol stubsym;
-	  struct bound_minimal_symbol libsym;
-
-	  stubsym = lookup_minimal_symbol_by_pc (loc);
-	  if (stubsym.minsym == NULL)
-	    {
-	      warning (_("Unable to find symbol for 0x%lx"), loc);
-	      return orig_pc == pc ? 0 : pc & ~0x3;
-	    }
-
-	  libsym = lookup_minimal_symbol (MSYMBOL_LINKAGE_NAME (stubsym.minsym),
-					  NULL, NULL);
-	  if (libsym.minsym == NULL)
-	    {
-	      warning (_("Unable to find library symbol for %s."),
-		       MSYMBOL_PRINT_NAME (stubsym.minsym));
-	      return orig_pc == pc ? 0 : pc & ~0x3;
-	    }
-
-	  return MSYMBOL_VALUE (libsym.minsym);
-	}
-
-      /* Does it look like bl X,%rp or bl X,%r0?  Another way to do a
-         branch from the stub to the actual function.  */
-      /*elz */
-      else if ((curr_inst & 0xffe0e000) == 0xe8400000
-	       || (curr_inst & 0xffe0e000) == 0xe8000000
-	       || (curr_inst & 0xffe0e000) == 0xe800A000)
-	return (loc + hppa_extract_17 (curr_inst) + 8) & ~0x3;
-
-      /* Does it look like bv (rp)?   Note this depends on the
-         current stack pointer being the same as the stack
-         pointer in the stub itself!  This is a branch on from the
-         stub back to the original caller.  */
-      /*else if ((curr_inst & 0xffe0e000) == 0xe840c000) */
-      else if ((curr_inst & 0xffe0f000) == 0xe840c000)
-	{
-	  /* Yup.  See if the previous instruction loaded
-	     rp from sp - 8.  */
-	  if (prev_inst == 0x4bc23ff1)
-	    {
-	      CORE_ADDR sp;
-	      sp = get_frame_register_unsigned (frame, HPPA_SP_REGNUM);
-	      return read_memory_integer (sp - 8, 4, byte_order) & ~0x3;
-	    }
-	  else
-	    {
-	      warning (_("Unable to find restore of %%rp before bv (%%rp)."));
-	      return orig_pc == pc ? 0 : pc & ~0x3;
-	    }
-	}
-
-      /* elz: added this case to capture the new instruction
-         at the end of the return part of an export stub used by
-         the PA2.0: BVE, n (rp) */
-      else if ((curr_inst & 0xffe0f000) == 0xe840d000)
-	{
-	  return (read_memory_integer
-		  (get_frame_register_unsigned (frame, HPPA_SP_REGNUM) - 24,
-		   word_size, byte_order)) & ~0x3;
-	}
-
-      /* What about be,n 0(sr0,%rp)?  It's just another way we return to
-         the original caller from the stub.  Used in dynamic executables.  */
-      else if (curr_inst == 0xe0400002)
-	{
-	  /* The value we jump to is sitting in sp - 24.  But that's
-	     loaded several instructions before the be instruction.
-	     I guess we could check for the previous instruction being
-	     mtsp %r1,%sr0 if we want to do sanity checking.  */
-	  return (read_memory_integer
-		  (get_frame_register_unsigned (frame, HPPA_SP_REGNUM) - 24,
-		   word_size, byte_order)) & ~0x3;
-	}
-
-      /* Haven't found the branch yet, but we're still in the stub.
-         Keep looking.  */
-      loc += 4;
-    }
-}
-
-static void
-hppa_skip_permanent_breakpoint (struct regcache *regcache)
-{
-  /* To step over a breakpoint instruction on the PA takes some
-     fiddling with the instruction address queue.
-
-     When we stop at a breakpoint, the IA queue front (the instruction
-     we're executing now) points at the breakpoint instruction, and
-     the IA queue back (the next instruction to execute) points to
-     whatever instruction we would execute after the breakpoint, if it
-     were an ordinary instruction.  This is the case even if the
-     breakpoint is in the delay slot of a branch instruction.
-
-     Clearly, to step past the breakpoint, we need to set the queue
-     front to the back.  But what do we put in the back?  What
-     instruction comes after that one?  Because of the branch delay
-     slot, the next insn is always at the back + 4.  */
-
-  ULONGEST pcoq_tail, pcsq_tail;
-  regcache_cooked_read_unsigned (regcache, HPPA_PCOQ_TAIL_REGNUM, &pcoq_tail);
-  regcache_cooked_read_unsigned (regcache, HPPA_PCSQ_TAIL_REGNUM, &pcsq_tail);
-
-  regcache_cooked_write_unsigned (regcache, HPPA_PCOQ_HEAD_REGNUM, pcoq_tail);
-  regcache_cooked_write_unsigned (regcache, HPPA_PCSQ_HEAD_REGNUM, pcsq_tail);
-
-  regcache_cooked_write_unsigned (regcache,
-				  HPPA_PCOQ_TAIL_REGNUM, pcoq_tail + 4);
-  /* We can leave the tail's space the same, since there's no jump.  */
-}
-
-
-/* Signal frames.  */
-struct hppa_hpux_sigtramp_unwind_cache
-{
-  CORE_ADDR base;
-  struct trad_frame_saved_reg *saved_regs;
-};
-
-static int hppa_hpux_tramp_reg[] = {
-  HPPA_SAR_REGNUM,
-  HPPA_PCOQ_HEAD_REGNUM,
-  HPPA_PCSQ_HEAD_REGNUM,
-  HPPA_PCOQ_TAIL_REGNUM,
-  HPPA_PCSQ_TAIL_REGNUM,
-  HPPA_EIEM_REGNUM,
-  HPPA_IIR_REGNUM,
-  HPPA_ISR_REGNUM,
-  HPPA_IOR_REGNUM,
-  HPPA_IPSW_REGNUM,
-  -1,
-  HPPA_SR4_REGNUM,
-  HPPA_SR4_REGNUM + 1,
-  HPPA_SR4_REGNUM + 2,
-  HPPA_SR4_REGNUM + 3,
-  HPPA_SR4_REGNUM + 4,
-  HPPA_SR4_REGNUM + 5,
-  HPPA_SR4_REGNUM + 6,
-  HPPA_SR4_REGNUM + 7,
-  HPPA_RCR_REGNUM,
-  HPPA_PID0_REGNUM,
-  HPPA_PID1_REGNUM,
-  HPPA_CCR_REGNUM,
-  HPPA_PID2_REGNUM,
-  HPPA_PID3_REGNUM,
-  HPPA_TR0_REGNUM,
-  HPPA_TR0_REGNUM + 1,
-  HPPA_TR0_REGNUM + 2,
-  HPPA_CR27_REGNUM
-};
-
-static struct hppa_hpux_sigtramp_unwind_cache *
-hppa_hpux_sigtramp_frame_unwind_cache (struct frame_info *this_frame,
-				       void **this_cache)
-
-{
-  struct gdbarch *gdbarch = get_frame_arch (this_frame);
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  struct hppa_hpux_sigtramp_unwind_cache *info;
-  unsigned int flag;
-  CORE_ADDR sp, scptr, off;
-  int i, incr, szoff;
-
-  if (*this_cache)
-    return *this_cache;
-
-  info = FRAME_OBSTACK_ZALLOC (struct hppa_hpux_sigtramp_unwind_cache);
-  *this_cache = info;
-  info->saved_regs = trad_frame_alloc_saved_regs (this_frame);
-
-  sp = get_frame_register_unsigned (this_frame, HPPA_SP_REGNUM);
-
-  if (IS_32BIT_TARGET (gdbarch))
-    scptr = sp - 1352;
-  else
-    scptr = sp - 1520;
-
-  off = scptr;
-
-  /* See /usr/include/machine/save_state.h for the structure of the
-     save_state_t structure.  */
-  
-  flag = read_memory_unsigned_integer (scptr + HPPA_HPUX_SS_FLAGS_OFFSET,
-				       4, byte_order);
-
-  if (!(flag & HPPA_HPUX_SS_WIDEREGS))
-    {
-      /* Narrow registers.  */
-      off = scptr + HPPA_HPUX_SS_NARROW_OFFSET;
-      incr = 4;
-      szoff = 0;
-    }
-  else
-    {
-      /* Wide registers.  */
-      off = scptr + HPPA_HPUX_SS_WIDE_OFFSET + 8;
-      incr = 8;
-      szoff = (tdep->bytes_per_address == 4 ? 4 : 0);
-    }
-
-  for (i = 1; i < 32; i++)
-    {
-      info->saved_regs[HPPA_R0_REGNUM + i].addr = off + szoff;
-      off += incr;
-    }
-
-  for (i = 0; i < ARRAY_SIZE (hppa_hpux_tramp_reg); i++)
-    {
-      if (hppa_hpux_tramp_reg[i] > 0)
-        info->saved_regs[hppa_hpux_tramp_reg[i]].addr = off + szoff;
-
-      off += incr;
-    }
-
-  /* TODO: fp regs */
-
-  info->base = get_frame_register_unsigned (this_frame, HPPA_SP_REGNUM);
-
-  return info;
-}
-
-static void
-hppa_hpux_sigtramp_frame_this_id (struct frame_info *this_frame,
-				   void **this_prologue_cache,
-				   struct frame_id *this_id)
-{
-  struct hppa_hpux_sigtramp_unwind_cache *info
-    = hppa_hpux_sigtramp_frame_unwind_cache (this_frame, this_prologue_cache);
-
-  *this_id = frame_id_build (info->base, get_frame_pc (this_frame));
-}
-
-static struct value *
-hppa_hpux_sigtramp_frame_prev_register (struct frame_info *this_frame,
-					void **this_prologue_cache,
-					int regnum)
-{
-  struct hppa_hpux_sigtramp_unwind_cache *info
-    = hppa_hpux_sigtramp_frame_unwind_cache (this_frame, this_prologue_cache);
-
-  return hppa_frame_prev_register_helper (this_frame,
-					  info->saved_regs, regnum);
-}
-
-static int
-hppa_hpux_sigtramp_unwind_sniffer (const struct frame_unwind *self,
-                                   struct frame_info *this_frame,
-                                   void **this_cache)
-{
-  struct gdbarch *gdbarch = get_frame_arch (this_frame);
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  struct unwind_table_entry *u;
-  CORE_ADDR pc = get_frame_pc (this_frame);
-
-  u = find_unwind_entry (pc);
-
-  /* If this is an export stub, try to get the unwind descriptor for
-     the actual function itself.  */
-  if (u && u->stub_unwind.stub_type == EXPORT)
-    {
-      gdb_byte buf[HPPA_INSN_SIZE];
-      unsigned long insn;
-
-      if (!safe_frame_unwind_memory (this_frame, u->region_start,
-				     buf, sizeof buf))
-	return 0;
-
-      insn = extract_unsigned_integer (buf, sizeof buf, byte_order);
-      if ((insn & 0xffe0e000) == 0xe8400000)
-	u = find_unwind_entry(u->region_start + hppa_extract_17 (insn) + 8);
-    }
-
-  if (u && u->HP_UX_interrupt_marker)
-    return 1;
-
-  return 0;
-}
-
-static const struct frame_unwind hppa_hpux_sigtramp_frame_unwind = {
-  SIGTRAMP_FRAME,
-  default_frame_unwind_stop_reason,
-  hppa_hpux_sigtramp_frame_this_id,
-  hppa_hpux_sigtramp_frame_prev_register,
-  NULL,
-  hppa_hpux_sigtramp_unwind_sniffer
-};
-
-static CORE_ADDR
-hppa32_hpux_find_global_pointer (struct gdbarch *gdbarch,
-				 struct value *function)
-{
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  CORE_ADDR faddr;
-  
-  faddr = value_as_address (function);
-
-  /* Is this a plabel? If so, dereference it to get the gp value.  */
-  if (faddr & 2)
-    {
-      int status;
-      gdb_byte buf[4];
-
-      faddr &= ~3;
-
-      status = target_read_memory (faddr + 4, buf, sizeof (buf));
-      if (status == 0)
-	return extract_unsigned_integer (buf, sizeof (buf), byte_order);
-    }
-
-  return gdbarch_tdep (gdbarch)->solib_get_got_by_pc (faddr);
-}
-
-static CORE_ADDR
-hppa64_hpux_find_global_pointer (struct gdbarch *gdbarch,
-				 struct value *function)
-{
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  CORE_ADDR faddr;
-  gdb_byte buf[32];
-
-  faddr = value_as_address (function);
-
-  if (pc_in_section (faddr, ".opd"))
-    {
-      target_read_memory (faddr, buf, sizeof (buf));
-      return extract_unsigned_integer (&buf[24], 8, byte_order);
-    }
-  else
-    {
-      return gdbarch_tdep (gdbarch)->solib_get_got_by_pc (faddr);
-    }
-}
-
-static unsigned int ldsid_pattern[] = {
-  0x000010a0, /* ldsid (rX),rY */
-  0x00001820, /* mtsp rY,sr0 */
-  0xe0000000  /* be,n (sr0,rX) */
-};
-
-static CORE_ADDR
-hppa_hpux_search_pattern (struct gdbarch *gdbarch,
-			  CORE_ADDR start, CORE_ADDR end,
-			  unsigned int *patterns, int count)
-{
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  int num_insns = (end - start + HPPA_INSN_SIZE) / HPPA_INSN_SIZE;
-  unsigned int *insns;
-  gdb_byte *buf;
-  int offset, i;
-
-  buf = alloca (num_insns * HPPA_INSN_SIZE);
-  insns = alloca (num_insns * sizeof (unsigned int));
-
-  read_memory (start, buf, num_insns * HPPA_INSN_SIZE);
-  for (i = 0; i < num_insns; i++, buf += HPPA_INSN_SIZE)
-    insns[i] = extract_unsigned_integer (buf, HPPA_INSN_SIZE, byte_order);
-
-  for (offset = 0; offset <= num_insns - count; offset++)
-    {
-      for (i = 0; i < count; i++)
-        {
-	  if ((insns[offset + i] & patterns[i]) != patterns[i])
-	    break;
-	}
-      if (i == count)
-        break;
-    }
-
-  if (offset <= num_insns - count)
-    return start + offset * HPPA_INSN_SIZE;
-  else
-    return 0;
-}
-
-static CORE_ADDR
-hppa32_hpux_search_dummy_call_sequence (struct gdbarch *gdbarch, CORE_ADDR pc,
-					int *argreg)
-{
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  struct objfile *obj;
-  struct obj_section *sec;
-  struct hppa_objfile_private *priv;
-  struct frame_info *frame;
-  struct unwind_table_entry *u;
-  CORE_ADDR addr, rp;
-  gdb_byte buf[4];
-  unsigned int insn;
-
-  sec = find_pc_section (pc);
-  obj = sec->objfile;
-  priv = objfile_data (obj, hppa_objfile_priv_data);
-
-  if (!priv)
-    priv = hppa_init_objfile_priv_data (obj);
-  if (!priv)
-    error (_("Internal error creating objfile private data."));
-
-  /* Use the cached value if we have one.  */
-  if (priv->dummy_call_sequence_addr != 0)
-    {
-      *argreg = priv->dummy_call_sequence_reg;
-      return priv->dummy_call_sequence_addr;
-    }
-
-  /* First try a heuristic; if we are in a shared library call, our return
-     pointer is likely to point at an export stub.  */
-  frame = get_current_frame ();
-  rp = frame_unwind_register_unsigned (frame, 2);
-  u = find_unwind_entry (rp);
-  if (u && u->stub_unwind.stub_type == EXPORT)
-    {
-      addr = hppa_hpux_search_pattern (gdbarch,
-				       u->region_start, u->region_end,
-				       ldsid_pattern, 
-				       ARRAY_SIZE (ldsid_pattern));
-      if (addr)
-	goto found_pattern;
-    }
-
-  /* Next thing to try is to look for an export stub.  */
-  if (priv->unwind_info)
-    {
-      int i;
-
-      for (i = 0; i < priv->unwind_info->last; i++)
-        {
-	  struct unwind_table_entry *u;
-	  u = &priv->unwind_info->table[i];
-	  if (u->stub_unwind.stub_type == EXPORT)
-	    {
-	      addr = hppa_hpux_search_pattern (gdbarch,
-					       u->region_start, u->region_end,
-					       ldsid_pattern, 
-					       ARRAY_SIZE (ldsid_pattern));
-	      if (addr)
-	        {
-		  goto found_pattern;
-		}
-	    }
-	}
-    }
-
-  /* Finally, if this is the main executable, try to locate a sequence 
-     from noshlibs */
-  addr = hppa_symbol_address ("noshlibs");
-  sec = find_pc_section (addr);
-
-  if (sec && sec->objfile == obj)
-    {
-      CORE_ADDR start, end;
-
-      find_pc_partial_function (addr, NULL, &start, &end);
-      if (start != 0 && end != 0)
-        {
-	  addr = hppa_hpux_search_pattern (gdbarch, start, end, ldsid_pattern,
-					   ARRAY_SIZE (ldsid_pattern));
-	  if (addr)
-	    goto found_pattern;
-        }
-    }
-
-  /* Can't find a suitable sequence.  */
-  return 0;
-
-found_pattern:
-  target_read_memory (addr, buf, sizeof (buf));
-  insn = extract_unsigned_integer (buf, sizeof (buf), byte_order);
-  priv->dummy_call_sequence_addr = addr;
-  priv->dummy_call_sequence_reg = (insn >> 21) & 0x1f;
-
-  *argreg = priv->dummy_call_sequence_reg;
-  return priv->dummy_call_sequence_addr;
-}
-
-static CORE_ADDR
-hppa64_hpux_search_dummy_call_sequence (struct gdbarch *gdbarch, CORE_ADDR pc,
-					int *argreg)
-{
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  struct objfile *obj;
-  struct obj_section *sec;
-  struct hppa_objfile_private *priv;
-  CORE_ADDR addr;
-  struct minimal_symbol *msym;
-
-  sec = find_pc_section (pc);
-  obj = sec->objfile;
-  priv = objfile_data (obj, hppa_objfile_priv_data);
-
-  if (!priv)
-    priv = hppa_init_objfile_priv_data (obj);
-  if (!priv)
-    error (_("Internal error creating objfile private data."));
-
-  /* Use the cached value if we have one.  */
-  if (priv->dummy_call_sequence_addr != 0)
-    {
-      *argreg = priv->dummy_call_sequence_reg;
-      return priv->dummy_call_sequence_addr;
-    }
-
-  /* FIXME: Without stub unwind information, locating a suitable sequence is
-     fairly difficult.  For now, we implement a very naive and inefficient
-     scheme; try to read in blocks of code, and look for a "bve,n (rp)" 
-     instruction.  These are likely to occur at the end of functions, so
-     we only look at the last two instructions of each function.  */
-  ALL_OBJFILE_MSYMBOLS (obj, msym)
-    {
-      CORE_ADDR begin, end;
-      const char *name;
-      gdb_byte buf[2 * HPPA_INSN_SIZE];
-      int offset;
-
-      find_pc_partial_function (MSYMBOL_VALUE_ADDRESS (obj, msym), &name,
-      				&begin, &end);
-
-      if (name == NULL || begin == 0 || end == 0)
-        continue;
-
-      if (target_read_memory (end - sizeof (buf), buf, sizeof (buf)) == 0)
-        {
-	  for (offset = 0; offset < sizeof (buf); offset++)
-	    {
-	      unsigned int insn;
-
-	      insn = extract_unsigned_integer (buf + offset,
-					       HPPA_INSN_SIZE, byte_order);
-	      if (insn == 0xe840d002) /* bve,n (rp) */
-	        {
-		  addr = (end - sizeof (buf)) + offset;
-		  goto found_pattern;
-		}
-	    }
-	}
-    }
-
-  /* Can't find a suitable sequence.  */
-  return 0;
-
-found_pattern:
-  priv->dummy_call_sequence_addr = addr;
-  /* Right now we only look for a "bve,l (rp)" sequence, so the register is 
-     always HPPA_RP_REGNUM.  */
-  priv->dummy_call_sequence_reg = HPPA_RP_REGNUM;
-
-  *argreg = priv->dummy_call_sequence_reg;
-  return priv->dummy_call_sequence_addr;
-}
-
-static CORE_ADDR
-hppa_hpux_find_import_stub_for_addr (CORE_ADDR funcaddr)
-{
-  struct objfile *objfile;
-  struct bound_minimal_symbol funsym;
-  struct bound_minimal_symbol stubsym;
-  CORE_ADDR stubaddr;
-
-  funsym = lookup_minimal_symbol_by_pc (funcaddr);
-  stubaddr = 0;
-
-  ALL_OBJFILES (objfile)
-    {
-      stubsym = lookup_minimal_symbol_solib_trampoline
-	(MSYMBOL_LINKAGE_NAME (funsym.minsym), objfile);
-
-      if (stubsym.minsym)
-	{
-	  struct unwind_table_entry *u;
-
-	  u = find_unwind_entry (MSYMBOL_VALUE (stubsym.minsym));
-	  if (u == NULL 
-	      || (u->stub_unwind.stub_type != IMPORT
-		  && u->stub_unwind.stub_type != IMPORT_SHLIB))
-	    continue;
-
-          stubaddr = MSYMBOL_VALUE (stubsym.minsym);
-
-	  /* If we found an IMPORT stub, then we can stop searching;
-	     if we found an IMPORT_SHLIB, we want to continue the search
-	     in the hopes that we will find an IMPORT stub.  */
-	  if (u->stub_unwind.stub_type == IMPORT)
-	    break;
-	}
-    }
-
-  return stubaddr;
-}
-
-static int
-hppa_hpux_sr_for_addr (struct gdbarch *gdbarch, CORE_ADDR addr)
-{
-  int sr;
-  /* The space register to use is encoded in the top 2 bits of the address.  */
-  sr = addr >> (gdbarch_tdep (gdbarch)->bytes_per_address * 8 - 2);
-  return sr + 4;
-}
-
-static CORE_ADDR
-hppa_hpux_find_dummy_bpaddr (CORE_ADDR addr)
-{
-  /* In order for us to restore the space register to its starting state, 
-     we need the dummy trampoline to return to an instruction address in 
-     the same space as where we started the call.  We used to place the 
-     breakpoint near the current pc, however, this breaks nested dummy calls 
-     as the nested call will hit the breakpoint address and terminate 
-     prematurely.  Instead, we try to look for an address in the same space to 
-     put the breakpoint.  
-     
-     This is similar in spirit to putting the breakpoint at the "entry point"
-     of an executable.  */
-
-  struct obj_section *sec;
-  struct unwind_table_entry *u;
-  struct minimal_symbol *msym;
-  CORE_ADDR func;
-
-  sec = find_pc_section (addr);
-  if (sec)
-    {
-      /* First try the lowest address in the section; we can use it as long
-         as it is "regular" code (i.e. not a stub).  */
-      u = find_unwind_entry (obj_section_addr (sec));
-      if (!u || u->stub_unwind.stub_type == 0)
-        return obj_section_addr (sec);
-
-      /* Otherwise, we need to find a symbol for a regular function.  We
-         do this by walking the list of msymbols in the objfile.  The symbol
-	 we find should not be the same as the function that was passed in.  */
-
-      /* FIXME: this is broken, because we can find a function that will be
-         called by the dummy call target function, which will still not 
-	 work.  */
-
-      find_pc_partial_function (addr, NULL, &func, NULL);
-      ALL_OBJFILE_MSYMBOLS (sec->objfile, msym)
-	{
-	  u = find_unwind_entry (MSYMBOL_VALUE_ADDRESS (sec->objfile, msym));
-	  if (func != MSYMBOL_VALUE_ADDRESS (sec->objfile, msym) 
-	      && (!u || u->stub_unwind.stub_type == 0))
-	    return MSYMBOL_VALUE_ADDRESS (sec->objfile, msym);
-	}
-    }
-
-  warning (_("Cannot find suitable address to place dummy breakpoint; nested "
-	     "calls may fail."));
-  return addr - 4;
-}
-
-static CORE_ADDR
-hppa_hpux_push_dummy_code (struct gdbarch *gdbarch, CORE_ADDR sp,
-			   CORE_ADDR funcaddr,
-			   struct value **args, int nargs,
-			   struct type *value_type,
-			   CORE_ADDR *real_pc, CORE_ADDR *bp_addr,
-			   struct regcache *regcache)
-{
-  CORE_ADDR pc, stubaddr;
-  int argreg = 0;
-
-  pc = regcache_read_pc (regcache);
-
-  /* Note: we don't want to pass a function descriptor here; push_dummy_call
-     fills in the PIC register for us.  */
-  funcaddr = gdbarch_convert_from_func_ptr_addr (gdbarch, funcaddr, NULL);
-
-  /* The simple case is where we call a function in the same space that we are
-     currently in; in that case we don't really need to do anything.  */
-  if (hppa_hpux_sr_for_addr (gdbarch, pc)
-      == hppa_hpux_sr_for_addr (gdbarch, funcaddr))
-    {
-      /* Intraspace call.  */
-      *bp_addr = hppa_hpux_find_dummy_bpaddr (pc);
-      *real_pc = funcaddr;
-      regcache_cooked_write_unsigned (regcache, HPPA_RP_REGNUM, *bp_addr);
-
-      return sp;
-    }
-
-  /* In order to make an interspace call, we need to go through a stub.
-     gcc supplies an appropriate stub called "__gcc_plt_call", however, if
-     an application is compiled with HP compilers then this stub is not
-     available.  We used to fallback to "__d_plt_call", however that stub
-     is not entirely useful for us because it doesn't do an interspace
-     return back to the caller.  Also, on hppa64-hpux, there is no 
-     __gcc_plt_call available.  In order to keep the code uniform, we
-     instead don't use either of these stubs, but instead write our own
-     onto the stack.
-
-     A problem arises since the stack is located in a different space than
-     code, so in order to branch to a stack stub, we will need to do an
-     interspace branch.  Previous versions of gdb did this by modifying code
-     at the current pc and doing single-stepping to set the pcsq.  Since this
-     is highly undesirable, we use a different scheme:
-
-     All we really need to do the branch to the stub is a short instruction
-     sequence like this:
-      
-     PA1.1:
-      		ldsid (rX),r1
-		mtsp r1,sr0
-		be,n (sr0,rX)
-
-     PA2.0:
-      		bve,n (sr0,rX)
-
-     Instead of writing these sequences ourselves, we can find it in
-     the instruction stream that belongs to the current space.  While this
-     seems difficult at first, we are actually guaranteed to find the sequences
-     in several places:
-
-     For 32-bit code:
-     - in export stubs for shared libraries
-     - in the "noshlibs" routine in the main module
-
-     For 64-bit code:
-     - at the end of each "regular" function
-
-     We cache the address of these sequences in the objfile's private data
-     since these operations can potentially be quite expensive.
-
-     So, what we do is:
-     - write a stack trampoline
-     - look for a suitable instruction sequence in the current space
-     - point the sequence at the trampoline
-     - set the return address of the trampoline to the current space 
-       (see hppa_hpux_find_dummy_call_bpaddr)
-     - set the continuing address of the "dummy code" as the sequence.  */
-
-  if (IS_32BIT_TARGET (gdbarch))
-    {
-#define INSN(I1, I2, I3, I4) 0x ## I1, 0x ## I2, 0x ## I3, 0x ## I4
-     static const gdb_byte hppa32_tramp[] = {
-	INSN(0f,df,12,91), /* stw r31,-8(,sp) */
-	INSN(02,c0,10,a1), /* ldsid (,r22),r1 */
-	INSN(00,01,18,20), /* mtsp r1,sr0 */
-	INSN(e6,c0,00,00), /* be,l 0(sr0,r22),%sr0,%r31 */
-	INSN(08,1f,02,42), /* copy r31,rp */
-	INSN(0f,d1,10,82), /* ldw -8(,sp),rp */
-	INSN(00,40,10,a1), /* ldsid (,rp),r1 */
-	INSN(00,01,18,20), /* mtsp r1,sr0 */
-	INSN(e0,40,00,00), /* be 0(sr0,rp) */
-	INSN(08,00,02,40)  /* nop */
-      };
-
-      /* for hppa32, we must call the function through a stub so that on
-         return it can return to the space of our trampoline.  */
-      stubaddr = hppa_hpux_find_import_stub_for_addr (funcaddr);
-      if (stubaddr == 0)
-        error (_("Cannot call external function not referenced by application "
-	       "(no import stub).\n"));
-      regcache_cooked_write_unsigned (regcache, 22, stubaddr);
-
-      write_memory (sp, hppa32_tramp, sizeof (hppa32_tramp));
-
-      *bp_addr = hppa_hpux_find_dummy_bpaddr (pc);
-      regcache_cooked_write_unsigned (regcache, 31, *bp_addr);
-
-      *real_pc = hppa32_hpux_search_dummy_call_sequence (gdbarch, pc, &argreg);
-      if (*real_pc == 0)
-        error (_("Cannot make interspace call from here."));
-
-      regcache_cooked_write_unsigned (regcache, argreg, sp);
-
-      sp += sizeof (hppa32_tramp);
-    }
-  else
-    {
-      static const gdb_byte hppa64_tramp[] = {
-	INSN(ea,c0,f0,00), /* bve,l (r22),%r2 */
-	INSN(0f,df,12,d1), /* std r31,-8(,sp) */
-	INSN(0f,d1,10,c2), /* ldd -8(,sp),rp */
-	INSN(e8,40,d0,02), /* bve,n (rp) */
-	INSN(08,00,02,40)  /* nop */
-      };
-#undef INSN
-
-      /* for hppa64, we don't need to call through a stub; all functions
-         return via a bve.  */
-      regcache_cooked_write_unsigned (regcache, 22, funcaddr);
-      write_memory (sp, hppa64_tramp, sizeof (hppa64_tramp));
-
-      *bp_addr = pc - 4;
-      regcache_cooked_write_unsigned (regcache, 31, *bp_addr);
-
-      *real_pc = hppa64_hpux_search_dummy_call_sequence (gdbarch, pc, &argreg);
-      if (*real_pc == 0)
-        error (_("Cannot make interspace call from here."));
-
-      regcache_cooked_write_unsigned (regcache, argreg, sp);
-
-      sp += sizeof (hppa64_tramp);
-    }
-
-  sp = gdbarch_frame_align (gdbarch, sp);
-
-  return sp;
-}
-
-
-
-static void
-hppa_hpux_supply_ss_narrow (struct regcache *regcache,
-			    int regnum, const gdb_byte *save_state)
-{
-  const gdb_byte *ss_narrow = save_state + HPPA_HPUX_SS_NARROW_OFFSET;
-  int i, offset = 0;
-
-  for (i = HPPA_R1_REGNUM; i < HPPA_FP0_REGNUM; i++)
-    {
-      if (regnum == i || regnum == -1)
-	regcache_raw_supply (regcache, i, ss_narrow + offset);
-
-      offset += 4;
-    }
-}
-
-static void
-hppa_hpux_supply_ss_fpblock (struct regcache *regcache,
-			     int regnum, const gdb_byte *save_state)
-{
-  const gdb_byte *ss_fpblock = save_state + HPPA_HPUX_SS_FPBLOCK_OFFSET;
-  int i, offset = 0;
-
-  /* FIXME: We view the floating-point state as 64 single-precision
-     registers for 32-bit code, and 32 double-precision register for
-     64-bit code.  This distinction is artificial and should be
-     eliminated.  If that ever happens, we should remove the if-clause
-     below.  */
-
-  if (register_size (get_regcache_arch (regcache), HPPA_FP0_REGNUM) == 4)
-    {
-      for (i = HPPA_FP0_REGNUM; i < HPPA_FP0_REGNUM + 64; i++)
-	{
-	  if (regnum == i || regnum == -1)
-	    regcache_raw_supply (regcache, i, ss_fpblock + offset);
-
-	  offset += 4;
-	}
-    }
-  else
-    {
-      for (i = HPPA_FP0_REGNUM; i < HPPA_FP0_REGNUM + 32; i++)
-	{
-	  if (regnum == i || regnum == -1)
-	    regcache_raw_supply (regcache, i, ss_fpblock + offset);
-
-	  offset += 8;
-	}
-    }
-}
-
-static void
-hppa_hpux_supply_ss_wide (struct regcache *regcache,
-			  int regnum, const gdb_byte *save_state)
-{
-  const gdb_byte *ss_wide = save_state + HPPA_HPUX_SS_WIDE_OFFSET;
-  int i, offset = 8;
-
-  if (register_size (get_regcache_arch (regcache), HPPA_R1_REGNUM) == 4)
-    offset += 4;
-
-  for (i = HPPA_R1_REGNUM; i < HPPA_FP0_REGNUM; i++)
-    {
-      if (regnum == i || regnum == -1)
-	regcache_raw_supply (regcache, i, ss_wide + offset);
-
-      offset += 8;
-    }
-}
-
-static void
-hppa_hpux_supply_save_state (const struct regset *regset,
-			     struct regcache *regcache,
-			     int regnum, const void *regs, size_t len)
-{
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  const gdb_byte *proc_info = regs;
-  const gdb_byte *save_state = proc_info + 8;
-  ULONGEST flags;
-
-  flags = extract_unsigned_integer (save_state + HPPA_HPUX_SS_FLAGS_OFFSET,
-				    4, byte_order);
-  if (regnum == -1 || regnum == HPPA_FLAGS_REGNUM)
-    {
-      size_t size = register_size (gdbarch, HPPA_FLAGS_REGNUM);
-      gdb_byte buf[8];
-
-      store_unsigned_integer (buf, size, byte_order, flags);
-      regcache_raw_supply (regcache, HPPA_FLAGS_REGNUM, buf);
-    }
-
-  /* If the SS_WIDEREGS flag is set, we really do need the full
-     `struct save_state'.  */
-  if (flags & HPPA_HPUX_SS_WIDEREGS && len < HPPA_HPUX_SAVE_STATE_SIZE)
-    error (_("Register set contents too small"));
-
-  if (flags & HPPA_HPUX_SS_WIDEREGS)
-    hppa_hpux_supply_ss_wide (regcache, regnum, save_state);
-  else
-    hppa_hpux_supply_ss_narrow (regcache, regnum, save_state);
-
-  hppa_hpux_supply_ss_fpblock (regcache, regnum, save_state);
-}
-
-/* HP-UX register set.  */
-
-static const struct regset hppa_hpux_regset =
-{
-  NULL,
-  hppa_hpux_supply_save_state,
-  NULL,
-  REGSET_VARIABLE_SIZE
-};
-
-static void
-hppa_hpux_iterate_over_regset_sections (struct gdbarch *gdbarch,
-					iterate_over_regset_sections_cb *cb,
-					void *cb_data,
-					const struct regcache *regcache)
-{
-  cb (".reg", HPPA_HPUX_PA89_SAVE_STATE_SIZE + 8, &hppa_hpux_regset,
-      NULL, cb_data);
-}
-
-
-/* Bit in the `ss_flag' member of `struct save_state' that indicates
-   the state was saved from a system call.  From
-   <machine/save_state.h>.  */
-#define HPPA_HPUX_SS_INSYSCALL	0x02
-
-static CORE_ADDR
-hppa_hpux_read_pc (struct regcache *regcache)
-{
-  ULONGEST flags;
-
-  /* If we're currently in a system call return the contents of %r31.  */
-  regcache_cooked_read_unsigned (regcache, HPPA_FLAGS_REGNUM, &flags);
-  if (flags & HPPA_HPUX_SS_INSYSCALL)
-    {
-      ULONGEST pc;
-      regcache_cooked_read_unsigned (regcache, HPPA_R31_REGNUM, &pc);
-      return pc & ~0x3;
-    }
-
-  return hppa_read_pc (regcache);
-}
-
-static void
-hppa_hpux_write_pc (struct regcache *regcache, CORE_ADDR pc)
-{
-  ULONGEST flags;
-
-  /* If we're currently in a system call also write PC into %r31.  */
-  regcache_cooked_read_unsigned (regcache, HPPA_FLAGS_REGNUM, &flags);
-  if (flags & HPPA_HPUX_SS_INSYSCALL)
-    regcache_cooked_write_unsigned (regcache, HPPA_R31_REGNUM, pc | 0x3);
-
-  hppa_write_pc (regcache, pc);
-}
-
-static CORE_ADDR
-hppa_hpux_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame)
-{
-  ULONGEST flags;
-
-  /* If we're currently in a system call return the contents of %r31.  */
-  flags = frame_unwind_register_unsigned (next_frame, HPPA_FLAGS_REGNUM);
-  if (flags & HPPA_HPUX_SS_INSYSCALL)
-    return frame_unwind_register_unsigned (next_frame, HPPA_R31_REGNUM) & ~0x3;
-
-  return hppa_unwind_pc (gdbarch, next_frame);
-}
-
-
-/* Given the current value of the pc, check to see if it is inside a stub, and
-   if so, change the value of the pc to point to the caller of the stub.
-   THIS_FRAME is the current frame in the current list of frames.
-   BASE contains to stack frame base of the current frame.
-   SAVE_REGS is the register file stored in the frame cache.  */
-static void
-hppa_hpux_unwind_adjust_stub (struct frame_info *this_frame, CORE_ADDR base,
-			      struct trad_frame_saved_reg *saved_regs)
-{
-  struct gdbarch *gdbarch = get_frame_arch (this_frame);
-  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
-  int word_size = gdbarch_ptr_bit (gdbarch) / 8;
-  struct value *pcoq_head_val;
-  ULONGEST pcoq_head;
-  CORE_ADDR stubpc;
-  struct unwind_table_entry *u;
-
-  pcoq_head_val = trad_frame_get_prev_register (this_frame, saved_regs, 
-				                HPPA_PCOQ_HEAD_REGNUM);
-  pcoq_head =
-    extract_unsigned_integer (value_contents_all (pcoq_head_val),
-			      register_size (gdbarch, HPPA_PCOQ_HEAD_REGNUM),
-			      byte_order);
-
-  u = find_unwind_entry (pcoq_head);
-  if (u && u->stub_unwind.stub_type == EXPORT)
-    {
-      stubpc = read_memory_integer (base - 24, word_size, byte_order);
-      trad_frame_set_value (saved_regs, HPPA_PCOQ_HEAD_REGNUM, stubpc);
-    }
-  else if (hppa_symbol_address ("__gcc_plt_call") 
-           == get_pc_function_start (pcoq_head))
-    {
-      stubpc = read_memory_integer (base - 8, word_size, byte_order);
-      trad_frame_set_value (saved_regs, HPPA_PCOQ_HEAD_REGNUM, stubpc);
-    }
-}
-
-static void
-hppa_hpux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
-{
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-
-  if (IS_32BIT_TARGET (gdbarch))
-    tdep->in_solib_call_trampoline = hppa32_hpux_in_solib_call_trampoline;
-  else
-    tdep->in_solib_call_trampoline = hppa64_hpux_in_solib_call_trampoline;
-
-  tdep->unwind_adjust_stub = hppa_hpux_unwind_adjust_stub;
-
-  set_gdbarch_in_solib_return_trampoline
-    (gdbarch, hppa_hpux_in_solib_return_trampoline);
-  set_gdbarch_skip_trampoline_code (gdbarch, hppa_hpux_skip_trampoline_code);
-
-  set_gdbarch_push_dummy_code (gdbarch, hppa_hpux_push_dummy_code);
-  set_gdbarch_call_dummy_location (gdbarch, ON_STACK);
-
-  set_gdbarch_read_pc (gdbarch, hppa_hpux_read_pc);
-  set_gdbarch_write_pc (gdbarch, hppa_hpux_write_pc);
-  set_gdbarch_unwind_pc (gdbarch, hppa_hpux_unwind_pc);
-  set_gdbarch_skip_permanent_breakpoint
-    (gdbarch, hppa_skip_permanent_breakpoint);
-
-  set_gdbarch_iterate_over_regset_sections
-    (gdbarch, hppa_hpux_iterate_over_regset_sections);
-
-  frame_unwind_append_unwinder (gdbarch, &hppa_hpux_sigtramp_frame_unwind);
-}
-
-static void
-hppa_hpux_som_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
-{
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-
-  tdep->is_elf = 0;
-
-  tdep->find_global_pointer = hppa32_hpux_find_global_pointer;
-
-  hppa_hpux_init_abi (info, gdbarch);
-  som_solib_select (gdbarch);
-}
-
-static void
-hppa_hpux_elf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
-{
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-
-  tdep->is_elf = 1;
-  tdep->find_global_pointer = hppa64_hpux_find_global_pointer;
-
-  hppa_hpux_init_abi (info, gdbarch);
-  pa64_solib_select (gdbarch);
-}
-
-static enum gdb_osabi
-hppa_hpux_core_osabi_sniffer (bfd *abfd)
-{
-  if (strcmp (bfd_get_target (abfd), "hpux-core") == 0)
-    return GDB_OSABI_HPUX_SOM;
-  else if (strcmp (bfd_get_target (abfd), "elf64-hppa") == 0)
-    {
-      asection *section;
-      
-      section = bfd_get_section_by_name (abfd, ".kernel");
-      if (section)
-        {
-	  bfd_size_type size;
-	  char *contents;
-
-	  size = bfd_section_size (abfd, section);
-	  contents = alloca (size);
- 	  if (bfd_get_section_contents (abfd, section, contents, 
-	  				(file_ptr) 0, size)
-	      && strcmp (contents, "HP-UX") == 0)
-	    return GDB_OSABI_HPUX_ELF;
-	}
-    }
-
-  return GDB_OSABI_UNKNOWN;
-}
-
-void
-_initialize_hppa_hpux_tdep (void)
-{
-  /* BFD doesn't set a flavour for HP-UX style core files.  It doesn't
-     set the architecture either.  */
-  gdbarch_register_osabi_sniffer (bfd_arch_unknown,
-				  bfd_target_unknown_flavour,
-				  hppa_hpux_core_osabi_sniffer);
-  gdbarch_register_osabi_sniffer (bfd_arch_hppa,
-                                  bfd_target_elf_flavour,
-				  hppa_hpux_core_osabi_sniffer);
-
-  gdbarch_register_osabi (bfd_arch_hppa, 0, GDB_OSABI_HPUX_SOM,
-                          hppa_hpux_som_init_abi);
-  gdbarch_register_osabi (bfd_arch_hppa, bfd_mach_hppa20w, GDB_OSABI_HPUX_ELF,
-                          hppa_hpux_elf_init_abi);
-}
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index f9c1bf2..8964ec0 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -46,13 +46,44 @@ static int hppa_debug = 0;
 static const int hppa32_num_regs = 128;
 static const int hppa64_num_regs = 96;
 
+/* We use the objfile->obj_private pointer for two things:
+ * 1.  An unwind table;
+ *
+ * 2.  A pointer to any associated shared library object.
+ *
+ * #defines are used to help refer to these objects.
+ */
+
+/* Info about the unwind table associated with an object file.
+ * This is hung off of the "objfile->obj_private" pointer, and
+ * is allocated in the objfile's psymbol obstack.  This allows
+ * us to have unique unwind info for each executable and shared
+ * library that we are debugging.
+ */
+struct hppa_unwind_info
+  {
+    struct unwind_table_entry *table;	/* Pointer to unwind info */
+    struct unwind_table_entry *cache;	/* Pointer to last entry we found */
+    int last;				/* Index of last entry */
+  };
+
+struct hppa_objfile_private
+  {
+    struct hppa_unwind_info *unwind_info;	/* a pointer */
+    struct so_list *so_info;			/* a pointer  */
+    CORE_ADDR dp;
+
+    int dummy_call_sequence_reg;
+    CORE_ADDR dummy_call_sequence_addr;
+  };
+
 /* hppa-specific object data -- unwind and solib info.
    TODO/maybe: think about splitting this into two parts; the unwind data is 
    common to all hppa targets, but is only used in this file; we can register 
    that separately and make this static. The solib data is probably hpux-
    specific, so we can create a separate extern objfile_data that is registered
    by hppa-hpux-tdep.c and shared with pa64solib.c and somsolib.c.  */
-const struct objfile_data *hppa_objfile_priv_data = NULL;
+static const struct objfile_data *hppa_objfile_priv_data = NULL;
 
 /* Get at various relevent fields of an instruction word.  */
 #define MASK_5 0x1f
@@ -170,7 +201,7 @@ hppa_symbol_address(const char *sym)
     return (CORE_ADDR)-1;
 }
 
-struct hppa_objfile_private *
+static struct hppa_objfile_private *
 hppa_init_objfile_priv_data (struct objfile *objfile)
 {
   struct hppa_objfile_private *priv;
@@ -2778,14 +2809,6 @@ hppa_frame_prev_register_helper (struct frame_info *this_frame,
       return frame_unwind_got_constant (this_frame, regnum, pc + 4);
     }
 
-  /* Make sure the "flags" register is zero in all unwound frames.
-     The "flags" registers is a HP-UX specific wart, and only the code
-     in hppa-hpux-tdep.c depends on it.  However, it is easier to deal
-     with it here.  This shouldn't affect other systems since those
-     should provide zero for the "flags" register anyway.  */
-  if (regnum == HPPA_FLAGS_REGNUM)
-    return frame_unwind_got_constant (this_frame, regnum, 0);
-
   return trad_frame_get_prev_register (this_frame, saved_regs, regnum);
 }
 
diff --git a/gdb/hppa-tdep.h b/gdb/hppa-tdep.h
index edf076d..f73c7ca 100644
--- a/gdb/hppa-tdep.h
+++ b/gdb/hppa-tdep.h
@@ -188,39 +188,6 @@ enum unwind_stub_types
 
 struct unwind_table_entry *find_unwind_entry (CORE_ADDR);
 
-/* We use the objfile->obj_private pointer for two things:
- * 1.  An unwind table;
- *
- * 2.  A pointer to any associated shared library object.
- *
- * #defines are used to help refer to these objects.
- */
-
-/* Info about the unwind table associated with an object file.
- * This is hung off of the "objfile->obj_private" pointer, and
- * is allocated in the objfile's psymbol obstack.  This allows
- * us to have unique unwind info for each executable and shared
- * library that we are debugging.
- */
-struct hppa_unwind_info
-  {
-    struct unwind_table_entry *table;	/* Pointer to unwind info */
-    struct unwind_table_entry *cache;	/* Pointer to last entry we found */
-    int last;				/* Index of last entry */
-  };
-
-struct hppa_objfile_private
-  {
-    struct hppa_unwind_info *unwind_info;	/* a pointer */
-    struct so_list *so_info;			/* a pointer  */
-    CORE_ADDR dp;
-
-    int dummy_call_sequence_reg;
-    CORE_ADDR dummy_call_sequence_addr;
-  };
-
-extern const struct objfile_data *hppa_objfile_priv_data;
-
 int hppa_get_field (unsigned word, int from, int to);
 int hppa_extract_5_load (unsigned int);
 unsigned hppa_extract_5R_store (unsigned int);
@@ -244,8 +211,6 @@ extern struct bound_minimal_symbol
   hppa_lookup_stub_minimal_symbol (const char *name,
                                    enum unwind_stub_types stub_type);
 
-extern struct hppa_objfile_private *hppa_init_objfile_priv_data (struct objfile *objfile);
-
 extern int hppa_in_solib_call_trampoline (struct gdbarch *gdbarch,
 					  CORE_ADDR pc);
 extern CORE_ADDR hppa_skip_trampoline_code (struct frame_info *, CORE_ADDR pc);
diff --git a/gdb/ia64-hpux-nat.c b/gdb/ia64-hpux-nat.c
deleted file mode 100644
index 67b5854..0000000
--- a/gdb/ia64-hpux-nat.c
+++ /dev/null
@@ -1,756 +0,0 @@
-/* Copyright (C) 2010-2015 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/>.  */
-
-#include "defs.h"
-#include "ia64-tdep.h"
-#include "inferior.h"
-#include "inf-ttrace.h"
-#include "regcache.h"
-#include "solib-ia64-hpux.h"
-
-#include <ia64/sys/uregs.h>
-#include <sys/ttrace.h>
-
-/* The offsets used with ttrace to read the value of the raw registers.  */
-
-static int u_offsets[] =
-{ /* Static General Registers.  */
-  -1,     __r1,   __r2,   __r3,   __r4,   __r5,   __r6,   __r7,
-  __r8,   __r9,   __r10,  __r11,  __r12,  __r13,  __r14,  __r15,
-  __r16,  __r17,  __r18,  __r19,  __r20,  __r21,  __r22,  __r23,
-  __r24,  __r25,  __r26,  __r27,  __r28,  __r29,  __r30,  __r31,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-
-  /* Static Floating-Point Registers.  */
-    -1,     -1,   __f2,   __f3,   __f4,   __f5,   __f6,   __f7,
-  __f8,   __f9,   __f10,  __f11,  __f12,  __f13,  __f14,  __f15,
-  __f16,  __f17,  __f18,  __f19,  __f20,  __f21,  __f22,  __f23,
-  __f24,  __f25,  __f26,  __f27,  __f28,  __f29,  __f30,  __f31,
-  __f32,  __f33,  __f34,  __f35,  __f36,  __f37,  __f38,  __f39,
-  __f40,  __f41,  __f42,  __f43,  __f44,  __f45,  __f46,  __f47,
-  __f48,  __f49,  __f50,  __f51,  __f52,  __f53,  __f54,  __f55,
-  __f56,  __f57,  __f58,  __f59,  __f60,  __f61,  __f62,  __f63,
-  __f64,  __f65,  __f66,  __f67,  __f68,  __f69,  __f70,  __f71,
-  __f72,  __f73,  __f74,  __f75,  __f76,  __f77,  __f78,  __f79,
-  __f80,  __f81,  __f82,  __f83,  __f84,  __f85,  __f86,  __f87,
-  __f88,  __f89,  __f90,  __f91,  __f92,  __f93,  __f94,  __f95,
-  __f96,  __f97,  __f98,  __f99,  __f100, __f101, __f102, __f103,
-  __f104, __f105, __f106, __f107, __f108, __f109, __f110, __f111,
-  __f112, __f113, __f114, __f115, __f116, __f117, __f118, __f119,
-  __f120, __f121, __f122, __f123, __f124, __f125, __f126, __f127,
-
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-  -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,
-
-  /* Branch Registers.  */
-  __b0,   __b1,   __b2,   __b3,   __b4,   __b5,   __b6,   __b7,
-
-  /* Virtual frame pointer and virtual return address pointer.  */
-  -1, -1,
-
-  /* Other registers.  */
-  __pr, __ip, __cr_ipsr, __cfm,
-
-  /* Kernel registers.  */
-  -1,   -1,   -1,   -1,
-  -1,   -1,   -1,   -1,
-
-  -1, -1, -1, -1, -1, -1, -1, -1,
-
-  /* Some application registers.  */
-  __ar_rsc, __ar_bsp, __ar_bspstore, __ar_rnat,
-
-  -1,
-  -1,  /* Not available: FCR, IA32 floating control register.  */
-  -1, -1,
-
-  -1,         /* Not available: EFLAG.  */
-  -1,         /* Not available: CSD.  */
-  -1,         /* Not available: SSD.  */
-  -1,         /* Not available: CFLG.  */
-  -1,         /* Not available: FSR.  */
-  -1,         /* Not available: FIR.  */
-  -1,         /* Not available: FDR.  */
-  -1,
-  __ar_ccv, -1, -1, -1, __ar_unat, -1, -1, -1,
-  __ar_fpsr, -1, -1, -1,
-  -1,         /* Not available: ITC.  */
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  __ar_pfs, __ar_lc, __ar_ec,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1
-  /* All following registers, starting with nat0, are handled as
-     pseudo registers, and hence are handled separately.  */
-};
-
-/* Some register have a fixed value and can not be modified.
-   Store their value in static constant buffers that can be used
-   later to fill the register cache.  */
-static const char r0_value[8] = {0x00, 0x00, 0x00, 0x00,
-                                 0x00, 0x00, 0x00, 0x00};
-static const char f0_value[16] = {0x00, 0x00, 0x00, 0x00,
-                                  0x00, 0x00, 0x00, 0x00,
-                                  0x00, 0x00, 0x00, 0x00,
-                                  0x00, 0x00, 0x00, 0x00};
-static const char f1_value[16] = {0x00, 0x00, 0x00, 0x00,
-                                  0x00, 0x00, 0xff, 0xff,
-                                  0x80, 0x00, 0x00, 0x00,
-                                  0x00, 0x00, 0x00, 0x00};
-
-/* The "to_wait" routine from the "inf-ttrace" layer.  */
-
-static ptid_t (*super_to_wait) (struct target_ops *, ptid_t,
-				struct target_waitstatus *, int);
-
-/* The "to_wait" target_ops routine routine for ia64-hpux.  */
-
-static ptid_t
-ia64_hpux_wait (struct target_ops *ops, ptid_t ptid,
-		struct target_waitstatus *ourstatus, int options)
-{
-  ptid_t new_ptid;
-
-  new_ptid = super_to_wait (ops, ptid, ourstatus, options);
-
-  /* If this is a DLD event (hard-coded breakpoint instruction
-     that was activated by the solib-ia64-hpux module), we need to
-     process it, and then resume the execution as if the event did
-     not happen.  */
-  if (ourstatus->kind == TARGET_WAITKIND_STOPPED
-      && ourstatus->value.sig == GDB_SIGNAL_TRAP
-      && ia64_hpux_at_dld_breakpoint_p (new_ptid))
-    {
-      ia64_hpux_handle_dld_breakpoint (new_ptid);
-
-      target_resume (new_ptid, 0, GDB_SIGNAL_0);
-      ourstatus->kind = TARGET_WAITKIND_IGNORE;
-    }
-
-  return new_ptid;
-}
-
-/* Fetch the RNAT register and supply it to the REGCACHE.  */
-
-static void
-ia64_hpux_fetch_rnat_register (struct regcache *regcache)
-{
-  CORE_ADDR addr;
-  gdb_byte buf[8];
-  int status;
-
-  /* The value of RNAT is stored at bsp|0x1f8, and must be read using
-     TT_LWP_RDRSEBS.  */
-
-  regcache_raw_read_unsigned (regcache, IA64_BSP_REGNUM, &addr);
-  addr |= 0x1f8;
-
-  status = ttrace (TT_LWP_RDRSEBS, ptid_get_pid (inferior_ptid),
-		   ptid_get_lwp (inferior_ptid), addr, sizeof (buf),
-		   (uintptr_t) buf);
-  if (status < 0)
-    error (_("failed to read RNAT register at %s"),
-	   paddress (get_regcache_arch(regcache), addr));
-
-  regcache_raw_supply (regcache, IA64_RNAT_REGNUM, buf);
-}
-
-/* Read the value of the register saved at OFFSET in the save_state_t
-   structure, and store its value in BUF.  LEN is the size of the register
-   to be read.  */
-
-static int
-ia64_hpux_read_register_from_save_state_t (int offset, gdb_byte *buf, int len)
-{
-  int status;
-
- status = ttrace (TT_LWP_RUREGS, ptid_get_pid (inferior_ptid),
-		  ptid_get_lwp (inferior_ptid), offset, len, (uintptr_t) buf);
-
-  return status;
-}
-
-/* Fetch register REGNUM from the inferior.  */
-
-static void
-ia64_hpux_fetch_register (struct regcache *regcache, int regnum)
-{
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  int offset, len, status;
-  gdb_byte *buf;
-
-  if (regnum == IA64_GR0_REGNUM)
-    {
-      /* r0 is always 0.  */
-      regcache_raw_supply (regcache, regnum, r0_value);
-      return;
-    }
-
-  if (regnum == IA64_FR0_REGNUM)
-    {
-      /* f0 is always 0.0.  */
-      regcache_raw_supply (regcache, regnum, f0_value);
-      return;
-    }
-
-  if (regnum == IA64_FR1_REGNUM)
-    {
-      /* f1 is always 1.0.  */
-      regcache_raw_supply (regcache, regnum, f1_value);
-      return;
-    }
-
-  if (regnum == IA64_RNAT_REGNUM)
-    {
-      ia64_hpux_fetch_rnat_register (regcache);
-      return;
-    }
-
-  /* Get the register location. If the register can not be fetched,
-     then return now.  */
-  offset = u_offsets[regnum];
-  if (offset == -1)
-    return;
-
-  len = register_size (gdbarch, regnum);
-  buf = alloca (len * sizeof (gdb_byte));
-  status = ia64_hpux_read_register_from_save_state_t (offset, buf, len);
-  if (status < 0)
-    warning (_("Failed to read register value for %s."),
-             gdbarch_register_name (gdbarch, regnum));
-
-  regcache_raw_supply (regcache, regnum, buf);
-}
-
-/* The "to_fetch_registers" target_ops routine for ia64-hpux.  */
-
-static void
-ia64_hpux_fetch_registers (struct target_ops *ops,
-			   struct regcache *regcache, int regnum)
-{
-  if (regnum == -1)
-    for (regnum = 0;
-	 regnum < gdbarch_num_regs (get_regcache_arch (regcache));
-	 regnum++)
-      ia64_hpux_fetch_register (regcache, regnum);
-  else
-    ia64_hpux_fetch_register (regcache, regnum);
-}
-
-/* Save register REGNUM (stored in BUF) in the save_state_t structure.
-   LEN is the size of the register in bytes.
-
-   Return the value from the corresponding ttrace call (a negative value
-   means that the operation failed).  */
-
-static int
-ia64_hpux_write_register_to_saved_state_t (int offset, gdb_byte *buf, int len)
-{
-  return ttrace (TT_LWP_WUREGS, ptid_get_pid (inferior_ptid),
-		 ptid_get_lwp (inferior_ptid), offset, len, (uintptr_t) buf);
-}
-
-/* Store register REGNUM into the inferior.  */
-
-static void
-ia64_hpux_store_register (const struct regcache *regcache, int regnum)
-{
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  int offset = u_offsets[regnum];
-  gdb_byte *buf;
-  int len, status;
-
-  /* If the register can not be stored, then return now.  */
-  if (offset == -1)
-    return;
-
-  /* I don't know how to store that register for now.  So just ignore any
-     request to store it, to avoid an internal error.  */
-  if (regnum == IA64_PSR_REGNUM)
-    return;
-
-  len = register_size (gdbarch, regnum);
-  buf = alloca (len * sizeof (gdb_byte));
-  regcache_raw_collect (regcache, regnum, buf);
-
-  status = ia64_hpux_write_register_to_saved_state_t (offset, buf, len);
-
-  if (status < 0)
-    error (_("failed to write register value for %s."),
-           gdbarch_register_name (gdbarch, regnum));
-}
-
-/* The "to_store_registers" target_ops routine for ia64-hpux.  */
-
-static void
-ia64_hpux_store_registers (struct target_ops *ops,
-			   struct regcache *regcache, int regnum)
-{
-  if (regnum == -1)
-    for (regnum = 0;
-	 regnum < gdbarch_num_regs (get_regcache_arch (regcache));
-	 regnum++)
-      ia64_hpux_store_register (regcache, regnum);
-  else
-    ia64_hpux_store_register (regcache, regnum);
-}
-
-/* The "xfer_partial" routine from the "inf-ttrace" target layer.
-   Ideally, we would like to use this routine for all transfer
-   requests, but this platforms has a lot of special cases that
-   need to be handled manually.  So we override this routine and
-   delegate back if we detect that we are not in a special case.  */
-
-static target_xfer_partial_ftype *super_xfer_partial;
-
-/* The "xfer_partial" routine for a memory region that is completely
-   outside of the backing-store region.  */
-
-static enum target_xfer_status
-ia64_hpux_xfer_memory_no_bs (struct target_ops *ops, const char *annex,
-			     gdb_byte *readbuf, const gdb_byte *writebuf,
-			     CORE_ADDR addr, LONGEST len,
-			     ULONGEST *xfered_len)
-{
-  /* Memory writes need to be aligned on 16byte boundaries, at least
-     when writing in the text section.  On the other hand, the size
-     of the buffer does not need to be a multiple of 16bytes.
-
-     No such restriction when performing memory reads.  */
-
-  if (writebuf && addr & 0x0f)
-    {
-      const CORE_ADDR aligned_addr = addr & ~0x0f;
-      const int aligned_len = len + (addr - aligned_addr);
-      gdb_byte *aligned_buf = alloca (aligned_len * sizeof (gdb_byte));
-      LONGEST status;
-
-      /* Read the portion of memory between ALIGNED_ADDR and ADDR, so
-         that we can write it back during our aligned memory write.  */
-      status = super_xfer_partial (ops, TARGET_OBJECT_MEMORY, annex,
-				   aligned_buf /* read */,
-				   NULL /* write */,
-				   aligned_addr, addr - aligned_addr);
-      if (status <= 0)
-	return TARGET_XFER_EOF;
-      memcpy (aligned_buf + (addr - aligned_addr), writebuf, len);
-
-      return super_xfer_partial (ops, TARGET_OBJECT_MEMORY, annex,
-				 NULL /* read */, aligned_buf /* write */,
-				 aligned_addr, aligned_len, xfered_len);
-    }
-  else
-    /* Memory read or properly aligned memory write.  */
-    return super_xfer_partial (ops, TARGET_OBJECT_MEMORY, annex, readbuf,
-			       writebuf, addr, len, xfered_len);
-}
-
-/* Read LEN bytes at ADDR from memory, and store it in BUF.  This memory
-   region is assumed to be inside the backing store.
-
-   Return zero if the operation failed.  */
-
-static int
-ia64_hpux_read_memory_bs (gdb_byte *buf, CORE_ADDR addr, int len)
-{
-  gdb_byte tmp_buf[8];
-  CORE_ADDR tmp_addr = addr & ~0x7;
-
-  while (tmp_addr < addr + len)
-    {
-      int status;
-      int skip_lo = 0;
-      int skip_hi = 0;
-
-      status = ttrace (TT_LWP_RDRSEBS, ptid_get_pid (inferior_ptid),
-		       ptid_get_lwp (inferior_ptid), tmp_addr,
-		       sizeof (tmp_buf), (uintptr_t) tmp_buf);
-      if (status < 0)
-        return 0;
-
-      if (tmp_addr < addr)
-        skip_lo = addr - tmp_addr;
-
-      if (tmp_addr + sizeof (tmp_buf) > addr + len)
-        skip_hi = (tmp_addr + sizeof (tmp_buf)) - (addr + len);
-
-      memcpy (buf + (tmp_addr + skip_lo - addr),
-              tmp_buf + skip_lo,
-              sizeof (tmp_buf) - skip_lo - skip_hi);
-
-      tmp_addr += sizeof (tmp_buf);
-    }
-
-  return 1;
-}
-
-/* Write LEN bytes from BUF in memory at ADDR.  This memory region is assumed
-   to be inside the backing store.
-
-   Return zero if the operation failed.  */
-
-static int
-ia64_hpux_write_memory_bs (const gdb_byte *buf, CORE_ADDR addr, int len)
-{
-  gdb_byte tmp_buf[8];
-  CORE_ADDR tmp_addr = addr & ~0x7;
-
-  while (tmp_addr < addr + len)
-    {
-      int status;
-      int lo = 0;
-      int hi = 7;
-
-      if (tmp_addr < addr || tmp_addr + sizeof (tmp_buf) > addr + len)
-	/* Part of the 8byte region pointed by tmp_addr needs to be preserved.
-	   So read it in before we copy the data that needs to be changed.  */
-	if (!ia64_hpux_read_memory_bs (tmp_buf, tmp_addr, sizeof (tmp_buf)))
-	  return 0;
-
-      if (tmp_addr < addr)
-        lo = addr - tmp_addr;
-
-      if (tmp_addr + sizeof (tmp_buf) > addr + len)
-        hi = addr - tmp_addr + len - 1;
-
-      memcpy (tmp_buf + lo, buf + tmp_addr - addr  + lo, hi - lo + 1);
-
-      status = ttrace (TT_LWP_WRRSEBS, ptid_get_pid (inferior_ptid),
-		       ptid_get_lwp (inferior_ptid), tmp_addr,
-		       sizeof (tmp_buf), (uintptr_t) tmp_buf);
-      if (status < 0)
-        return 0;
-
-      tmp_addr += sizeof (tmp_buf);
-    }
-
-  return 1;
-}
-
-/* The "xfer_partial" routine for a memory region that is completely
-   inside of the backing-store region.  */
-
-static LONGEST
-ia64_hpux_xfer_memory_bs (struct target_ops *ops, const char *annex,
-			  gdb_byte *readbuf, const gdb_byte *writebuf,
-			  CORE_ADDR addr, LONGEST len)
-{
-  int success;
-
-  if (readbuf)
-    success = ia64_hpux_read_memory_bs (readbuf, addr, len);
-  else
-    success = ia64_hpux_write_memory_bs (writebuf, addr, len);
-
-  if (success)
-    return len;
-  else
-    return 0;
-}
-
-/* Get a register value as a unsigned value directly from the system,
-   instead of going through the regcache.
-
-   This function is meant to be used when inferior_ptid is not
-   a thread/process known to GDB.  */
-
-static ULONGEST
-ia64_hpux_get_register_from_save_state_t (int regnum, int reg_size)
-{
-  gdb_byte *buf = alloca (reg_size);
-  int offset = u_offsets[regnum];
-  int status;
-
-  /* The register is assumed to be available for fetching.  */
-  gdb_assert (offset != -1);
-
-  status = ia64_hpux_read_register_from_save_state_t (offset, buf, reg_size);
-  if (status < 0)
-    {
-      /* This really should not happen.  If it does, emit a warning
-	 and pretend the register value is zero.  Not exactly the best
-	 error recovery mechanism, but better than nothing.  We will
-	 try to do better if we can demonstrate that this can happen
-	 under normal circumstances.  */
-      warning (_("Failed to read value of register number %d."), regnum);
-      return 0;
-    }
-
-  return extract_unsigned_integer (buf, reg_size, BFD_ENDIAN_BIG);
-}
-
-/* The "xfer_partial" target_ops routine for ia64-hpux, in the case
-   where the requested object is TARGET_OBJECT_MEMORY.  */
-
-static enum target_xfer_status
-ia64_hpux_xfer_memory (struct target_ops *ops, const char *annex,
-		       gdb_byte *readbuf, const gdb_byte *writebuf,
-		       CORE_ADDR addr, ULONGEST len, ULONGEST *xfered_len)
-{
-  CORE_ADDR bsp, bspstore;
-  CORE_ADDR start_addr, short_len;
-  int status = 0;
-
-  /* The back-store region cannot be read/written by the standard memory
-     read/write operations.  So we handle the memory region piecemeal:
-       (1) and (2) The regions before and after the backing-store region,
-           which can be treated as normal memory;
-       (3) The region inside the backing-store, which needs to be
-           read/written specially.  */
-
-  if (in_inferior_list (ptid_get_pid (inferior_ptid)))
-    {
-      struct regcache *regcache = get_current_regcache ();
-
-      regcache_raw_read_unsigned (regcache, IA64_BSP_REGNUM, &bsp);
-      regcache_raw_read_unsigned (regcache, IA64_BSPSTORE_REGNUM, &bspstore);
-    }
-  else
-    {
-      /* This is probably a child of our inferior created by a fork.
-	 Because this process has not been added to our inferior list
-	 (we are probably in the process of handling that child
-	 process), we do not have a regcache to read the registers
-	 from.  So get those values directly from the kernel.  */
-      bsp = ia64_hpux_get_register_from_save_state_t (IA64_BSP_REGNUM, 8);
-      bspstore =
-	ia64_hpux_get_register_from_save_state_t (IA64_BSPSTORE_REGN[...]

[diff truncated at 100000 bytes]


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]