2007-05-31 Markus Deuling <deuling@de.ibm.com>

	* gdbarch.sh (CALL_DUMMY_LOCATION): Replace by
	gdbarch_call_dummy_location.
	* infcall.c (call_function_by_hand): Likewise.
	* inferior.h: Change comment.
	* arch-utils.c: Change comment.
	* gdbarch.c, gdbarch.h: Regenerate.

6 files changed, 14 insertions, 16 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 60bbf19..2cae69d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-31  Markus Deuling  <deuling@de.ibm.com>
+
+	* gdbarch.sh (CALL_DUMMY_LOCATION): Replace by
+	gdbarch_call_dummy_location.
+	* infcall.c (call_function_by_hand): Likewise.
+	* inferior.h: Change comment.
+	* arch-utils.c: Change comment.
+	* gdbarch.c, gdbarch.h: Regenerate.
+
 2007-05-28  Joel Brobecker  <brobecker@adacore.com>
 
 	* solib-aix5.c: Delete.
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 154aa4a..73d87e1 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -39,7 +39,7 @@
 #include "arch-utils.h"
 
 #include "gdbcmd.h"
-#include "inferior.h" /* enum CALL_DUMMY_LOCATION et.al. */
+#include "inferior.h" 
 #include "symcat.h"
 
 #include "floatformat.h"
@@ -759,11 +759,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
   fprintf_unfiltered (file,
                       "gdbarch_dump: byte_order = %s\n",
                       paddr_d (current_gdbarch->byte_order));
-#ifdef CALL_DUMMY_LOCATION
-  fprintf_unfiltered (file,
-                      "gdbarch_dump: CALL_DUMMY_LOCATION # %s\n",
-                      XSTRING (CALL_DUMMY_LOCATION));
-#endif
   fprintf_unfiltered (file,
                       "gdbarch_dump: call_dummy_location = %s\n",
                       paddr_d (current_gdbarch->call_dummy_location));
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 02557bb..64715de 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -496,12 +496,6 @@ extern void set_gdbarch_deprecated_register_size (struct gdbarch *gdbarch, int d
 
 extern int gdbarch_call_dummy_location (struct gdbarch *gdbarch);
 extern void set_gdbarch_call_dummy_location (struct gdbarch *gdbarch, int call_dummy_location);
-#if !defined (GDB_TM_FILE) && defined (CALL_DUMMY_LOCATION)
-#error "Non multi-arch definition of CALL_DUMMY_LOCATION"
-#endif
-#if !defined (CALL_DUMMY_LOCATION)
-#define CALL_DUMMY_LOCATION (gdbarch_call_dummy_location (current_gdbarch))
-#endif
 
 extern int gdbarch_push_dummy_code_p (struct gdbarch *gdbarch);
 
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index b865c57..b454e9c 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -470,7 +470,7 @@ v:=:int:deprecated_fp_regnum:::-1:-1::0
 M::CORE_ADDR:push_dummy_call:struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr:function, regcache, bp_addr, nargs, args, sp, struct_return, struct_addr
 # DEPRECATED_REGISTER_SIZE can be deleted.
 v:=:int:deprecated_register_size
-v:=:int:call_dummy_location::::AT_ENTRY_POINT::0
+v::int:call_dummy_location::::AT_ENTRY_POINT::0
 M::CORE_ADDR:push_dummy_code:CORE_ADDR sp, CORE_ADDR funaddr, int using_gcc, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr:sp, funaddr, using_gcc, args, nargs, value_type, real_pc, bp_addr
 
 m::void:print_registers_info:struct ui_file *file, struct frame_info *frame, int regnum, int all:file, frame, regnum, all::default_print_registers_info::0
@@ -1179,7 +1179,7 @@ cat <<EOF
 #include "arch-utils.h"
 
 #include "gdbcmd.h"
-#include "inferior.h" /* enum CALL_DUMMY_LOCATION et.al. */
+#include "inferior.h" 
 #include "symcat.h"
 
 #include "floatformat.h"
diff --git a/gdb/infcall.c b/gdb/infcall.c
index 5eb9ca3..25e25ad 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -454,7 +454,7 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
   /* The actual breakpoint (at BP_ADDR) is inserted separatly so there
      is no need to write that out.  */
 
-  switch (CALL_DUMMY_LOCATION)
+  switch (gdbarch_call_dummy_location (current_gdbarch))
     {
     case ON_STACK:
       /* "dummy_addr" is here just to keep old targets happy.  New
diff --git a/gdb/inferior.h b/gdb/inferior.h
index 6e1c42c..723122e 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -402,7 +402,7 @@ extern struct regcache *stop_registers;
 
 extern int attach_flag;
 
-/* Possible values for CALL_DUMMY_LOCATION.  */
+/* Possible values for gdbarch_call_dummy_location.  */
 #define ON_STACK 1
 #define AT_ENTRY_POINT 4
 #define AT_SYMBOL 5