3 files changed, 2 insertions, 12 deletions
diff --git a/gdb/config/pa/hppabsd.mh b/gdb/config/pa/hppabsd.mh
index 161292d..b4aa2c5 100644
--- a/gdb/config/pa/hppabsd.mh
+++ b/gdb/config/pa/hppabsd.mh
@@ -1,9 +1,5 @@
 # Host: Hewlett-Packard PA-RISC machine, running BSD
-HPREAD=
-# start-sanitize-hpread
-HPREAD=hpread.o
-# end-sanitize-hpread
 XDEPFILES= 
 XM_FILE= xm-hppab.h
 NAT_FILE= nm-hppab.h
-NATDEPFILES= hppab-nat.o coredep.o corelow.o inftarg.o fork-child.o somread.o infptrace.o $(HPREAD) somsolib.o
+NATDEPFILES= hppab-nat.o coredep.o corelow.o inftarg.o fork-child.o somread.o infptrace.o hpread.o somsolib.o
diff --git a/gdb/config/pa/hppahpux.mh b/gdb/config/pa/hppahpux.mh
index dff59ab..683c1d7 100644
--- a/gdb/config/pa/hppahpux.mh
+++ b/gdb/config/pa/hppahpux.mh
@@ -1,15 +1,11 @@
 # Host: Hewlett-Packard PA-RISC machine, running HPUX
 
-HPREAD=
-# start-sanitize-hpread
-HPREAD=hpread.o
-# end-sanitize-hpread
 TERMCAP = -lcurses
 
 XM_FILE= xm-hppah.h
 XDEPFILES= ser-tcp.o
 
 NAT_FILE= nm-hppah.h
-NATDEPFILES= hppah-nat.o coredep.o corelow.o inftarg.o fork-child.o somread.o infptrace.o $(HPREAD) somsolib.o
+NATDEPFILES= hppah-nat.o coredep.o corelow.o inftarg.o fork-child.o somread.o infptrace.o hpread.o somsolib.o
 
 HOST_IPC=-DBSD_IPC -DPOSIX_WAIT
diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h
index f88462b..3dc838d 100644
--- a/gdb/config/pa/tm-hppa.h
+++ b/gdb/config/pa/tm-hppa.h
@@ -522,10 +522,8 @@ extern void target_write_pc PARAMS ((CORE_ADDR, int));
 #define TARGET_READ_PC(pid) target_read_pc (pid)
 #define TARGET_WRITE_PC(v,pid) target_write_pc (v,pid)
 
-/* start-sanitize-hpread */
 /* For a number of horrible reasons we may have to adjust the location
    of variables on the stack.  Ugh.  */
 #define HPREAD_ADJUST_STACK_ADDRESS(ADDR) hpread_adjust_stack_address(ADDR)
-/* end-sanitize-hpread */
 
 extern int hpread_adjust_stack_address PARAMS ((CORE_ADDR));