* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d334a79c36caa28d277c6f739e3625e8a66223bb..d0266fad6aea298106feb2a72ebef7304bc5f681 100644 (file)
--- a/gdb/ChangeLog
+++ b/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.
 

diff --git a/gdb/config/pa/tm-hppao.h b/gdb/config/pa/tm-hppao.h
index fd0d25c721b6b9d94163f3a73c286b53ebb2b910..e34201f7d7c47268732b161395dc1c2f4306f6f8 100644 (file)
--- a/gdb/config/pa/tm-hppao.h
+++ b/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"

diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 348324f3bef1480d45ef1a5d0cc005b3db118903..ff046f32a0753e8429fbab1b960d181c58bfc399 100644 (file)
--- a/gdb/hppa-tdep.c
+++ b/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])