* config/pa/tm-hppao.h (NO_PC_SPACE_QUEUE_RESTORE): Define.

* hppa-tdep.c (hppa_pop_frame): Do not restore the PC space
        queue if NO_PC_SPACE_QUEUE_RESTORE is defined.

gdb/ChangeLog

@@ -1,5 +1,10 @@
 Tue Mar 22 20:12:53 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
+	* config/pa/tm-hppao.h (NO_PC_SPACE_QUEUE_RESTORE): Define.
+
+	* hppa-tdep.c (hppa_pop_frame): Do not restore the PC space
+	queue if NO_PC_SPACE_QUEUE_RESTORE is defined.
+
 	* stabsread.c (REG_STRUCT_HAS_ADDR): Accept additional argument
 	for the structure's type.  All callers changed.
 

gdb/config/pa/tm-hppao.h

@@ -47,5 +47,8 @@
 /* OSF1 needs an extra trap.  I assume for the emulator startup (?!?) */
 #define START_INFERIOR_TRAPS_EXPECTED 3
 
+/* OSF1 does not need the pc space queue restored.  */
+#define NO_PC_SPACE_QUEUE_RESTORE
+
 /* It's mostly just the common stuff.  */
 #include "pa/tm-hppa.h"

gdb/hppa-tdep.c

@@ -891,8 +891,10 @@ hppa_pop_frame ()
   fp = fi->frame;
   get_frame_saved_regs (fi, &fsr);
 
+#ifndef NO_PC_SPACE_QUEUE_RESTORE
   if (fsr.regs[IPSW_REGNUM])    /* Restoring a call dummy frame */
     restore_pc_queue (&fsr);
+#endif
 
   for (regnum = 31; regnum > 0; regnum--)
     if (fsr.regs[regnum])