2003-03-07 Andrew Cagney <cagney@redhat.com>

	* gdbarch.sh: Don't generate two macro definitions when an
	undefined macro taking no arguments.
	* gdbarch.h: Regenerate.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0456098c98491adbd8ac6051cace1fe5fd385c36..a89411fe883c70c96c8f197ef4bc03cf19beee89 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-07  Andrew Cagney  <cagney@redhat.com>
+
+       * gdbarch.sh: Don't generate two macro definitions when an
+       undefined macro taking no arguments.
+       * gdbarch.h: Regenerate.
+       
 2002-03-07  Michal Ludvig  <mludvig@suse.cz>
 
        * x86-64-tdep.c (x86_64_save_dummy_frame_tos)

diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index b1cb72bd18583c1adf510a4bd14b26433452faa9..26424ef5a9949d8b2764c79614dc982166988a4c 100644 (file)
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -1655,7 +1655,6 @@ extern int gdbarch_deprecated_push_dummy_frame_p (struct gdbarch *gdbarch);
 /* Default (function) for non- multi-arch platforms. */
 #if (!GDB_MULTI_ARCH) && !defined (DEPRECATED_PUSH_DUMMY_FRAME)
 #define DEPRECATED_PUSH_DUMMY_FRAME (internal_error (__FILE__, __LINE__, "DEPRECATED_PUSH_DUMMY_FRAME"), 0)
-#define DEPRECATED_PUSH_DUMMY_FRAME (gdbarch_deprecated_push_dummy_frame (current_gdbarch))
 #endif
 
 typedef void (gdbarch_deprecated_push_dummy_frame_ftype) (void);
@@ -1730,7 +1729,6 @@ extern int gdbarch_pop_frame_p (struct gdbarch *gdbarch);
 /* Default (function) for non- multi-arch platforms. */
 #if (!GDB_MULTI_ARCH) && !defined (POP_FRAME)
 #define POP_FRAME (internal_error (__FILE__, __LINE__, "POP_FRAME"), 0)
-#define POP_FRAME (gdbarch_pop_frame (current_gdbarch))
 #endif
 
 typedef void (gdbarch_pop_frame_ftype) (void);

diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index b367fda7b7fdb83fc4405da867c76581bf54add1..ed8a9e74420e08e4f4522d313b01622d7cc35567 100755 (executable)
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -939,7 +939,6 @@ do
                if [ "x${actual}" = "x-" ]
                then
                    printf "#define ${macro} (internal_error (__FILE__, __LINE__, \"${macro}\"), 0)\n"
-                   printf "#define ${macro} (gdbarch_${function} (current_gdbarch))\n"
                else
                    printf "#define ${macro}(${actual}) (internal_error (__FILE__, __LINE__, \"${macro}\"), 0)\n"
                fi