From 2001-07-09 D.J. Barrow <djbarrow@de.ibm.com>:

* gdbarch.sh: Fixed CALL_DUMMY_BREAKPOINT_OFFSET to check
CALL_DUMMY_BREAKPOINT_OFFSET_P.
* gdbarch.c: Regenerate.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5426ccaa5495c5b5eab7f317ccba74053f1fba4f..2acf23d31e7083b63dbdf05e2fe1e92db95d0551 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-13  Andrew Cagney  <ac131313@redhat.com>
+
+       From 2001-07-09 D.J. Barrow <djbarrow@de.ibm.com>:
+        * gdbarch.sh: Fixed CALL_DUMMY_BREAKPOINT_OFFSET to check
+       CALL_DUMMY_BREAKPOINT_OFFSET_P.
+       * gdbarch.c: Regenerate.
+       
 2001-10-13  Mark Kettenis  <kettenis@gnu.org>
 
        * thread-db.c: Fix a few formatting mistakes.

diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 0d073dd7fe036bb42d90e8d6c4d6818856f87de2..2517ebaf7b7be13d643c7ee57144f712a564b2de 100644 (file)
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -632,7 +632,7 @@ verify_gdbarch (struct gdbarch *gdbarch)
     internal_error (__FILE__, __LINE__,
                     "gdbarch: verify_gdbarch: call_dummy_start_offset invalid");
   if ((GDB_MULTI_ARCH >= 2)
-      && (gdbarch->call_dummy_breakpoint_offset == -1))
+      && (gdbarch->call_dummy_breakpoint_offset_p && gdbarch->call_dummy_breakpoint_offset == -1))
     internal_error (__FILE__, __LINE__,
                     "gdbarch: verify_gdbarch: call_dummy_breakpoint_offset invalid");
   if ((GDB_MULTI_ARCH >= 1)
@@ -2992,7 +2992,7 @@ set_gdbarch_call_dummy_start_offset (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_call_dummy_breakpoint_offset (struct gdbarch *gdbarch)
 {
-  if (gdbarch->call_dummy_breakpoint_offset == -1)
+  if (gdbarch->call_dummy_breakpoint_offset_p && gdbarch->call_dummy_breakpoint_offset == -1)
     internal_error (__FILE__, __LINE__,
                     "gdbarch: gdbarch_call_dummy_breakpoint_offset invalid");
   if (gdbarch_debug >= 2)

diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index d18a5f292ead83609bf46d76104f175ab119c23e..a1d5962b5b9a0377fed2d30a4b00c98f3706f205 100755 (executable)
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -440,7 +440,7 @@ v:1:USE_GENERIC_DUMMY_FRAMES:int:use_generic_dummy_frames::::0:-1
 v:2:CALL_DUMMY_LOCATION:int:call_dummy_location::::0:0
 f:2:CALL_DUMMY_ADDRESS:CORE_ADDR:call_dummy_address:void:::0:0::gdbarch->call_dummy_location == AT_ENTRY_POINT && gdbarch->call_dummy_address == 0
 v:2:CALL_DUMMY_START_OFFSET:CORE_ADDR:call_dummy_start_offset::::0:-1:::0x%08lx
-v:2:CALL_DUMMY_BREAKPOINT_OFFSET:CORE_ADDR:call_dummy_breakpoint_offset::::0:-1:::0x%08lx::CALL_DUMMY_BREAKPOINT_OFFSET_P
+v:2:CALL_DUMMY_BREAKPOINT_OFFSET:CORE_ADDR:call_dummy_breakpoint_offset::::0:-1::gdbarch->call_dummy_breakpoint_offset_p && gdbarch->call_dummy_breakpoint_offset == -1:0x%08lx::CALL_DUMMY_BREAKPOINT_OFFSET_P
 v:1:CALL_DUMMY_BREAKPOINT_OFFSET_P:int:call_dummy_breakpoint_offset_p::::0:-1
 v:2:CALL_DUMMY_LENGTH:int:call_dummy_length::::0:-1:::::CALL_DUMMY_LOCATION == BEFORE_TEXT_END || CALL_DUMMY_LOCATION == AFTER_TEXT_END
 f:2:PC_IN_CALL_DUMMY:int:pc_in_call_dummy:CORE_ADDR pc, CORE_ADDR sp, CORE_ADDR frame_address:pc, sp, frame_address::0:0