* Makefile.in (hpread_h): Delete.
(HFILES_NO_SRCDIR): Remove hpread.h.
(ALLDEPFILES): Remove hp-psymtab-read.c and hp-symtab-read.c.
(hpread.o): Update dependencies.
(hp-psymtab-read.o, hp-symtab-read.o): Remove.
* hp-psymtab-read.c: Remove file.
* hp-symtab-read.c: Remove file.
* hpread.h: Remove file.
* hpread.c: Merge all contents of hp-psymtab-read.c,
hp-symtab-read.c and hpread.h into this file, as it was prior to
January 1999.
* config/pa/hpux11w.mh, config/pa/hpux11.mh,
config/pa/hpux1020.mh, config/pa/hppaosf.mh,
config/pa/hppahpux.mh, config/pa/hppabsd.mh (NATDEPFILES):
Remove hp-psymtab-read.o and hp-symtab-read.o, add hpread.o.
# Host: Hewlett-Packard PA-RISC machine, running BSD
XM_FILE= xm-hppab.h
NAT_FILE= nm-hppab.h
-NATDEPFILES= hppab-nat.o corelow.o core-aout.o inftarg.o fork-child.o somread.o infptrace.o hp-psymtab-read.o hp-symtab-read.o somsolib.o
+NATDEPFILES= hppab-nat.o corelow.o core-aout.o inftarg.o fork-child.o somread.o infptrace.o hpread.o somsolib.o
GDBSERVER_DEPFILES= low-hppabsd.o
XM_FILE= xm-hppah.h
NAT_FILE= nm-hppah.h
-NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o somread.o infptrace.o hp-psymtab-read.o hp-symtab-read.o somsolib.o
+NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o somread.o infptrace.o hpread.o somsolib.o
HOST_IPC=-DBSD_IPC -DPOSIX_WAIT
# Host: Hewlett-Packard PA-RISC machine, running BSD
XM_FILE= xm-hppab.h
NAT_FILE= nm-hppao.h
-NATDEPFILES= fork-child.o m3-nat.o hppam3-nat.o somread.o hp-psymtab-read.o hp-symtab-read.o somsolib.o
+NATDEPFILES= fork-child.o m3-nat.o hppam3-nat.o somread.o hpread.o somsolib.o
NAT_CLIBS= -lmachid -lnetname -lmach
GDBSERVER_DEPFILES= low-hppabsd.o
XM_FILE= xm-hppah.h
NAT_FILE= nm-hppah.h
-NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o infptrace.o somread.o hp-psymtab-read.o hp-symtab-read.o somsolib.o
+NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o infptrace.o somread.o hpread.o somsolib.o
HOST_IPC=-DBSD_IPC -DPOSIX_WAIT
XM_FILE= xm-hppah.h
NAT_FILE= nm-hppah11.h
-NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o infttrace.o somread.o hp-psymtab-read.o hp-symtab-read.o somsolib.o
+NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o infttrace.o somread.o hpread.o somsolib.o
HOST_IPC=-DBSD_IPC -DPOSIX_WAIT
XM_FILE= xm-hppah.h
NAT_FILE= nm-hppah11.h
-NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o infttrace.o hp-psymtab-read.o hp-symtab-read.o pa64solib.o
+NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o infttrace.o hpread.o pa64solib.o
HOST_IPC=-DBSD_IPC -DPOSIX_WAIT