2007-06-18 Markus Deuling <deuling@de.ibm.com>

* gdbarch.sh (DEPRECATED_USE_STRUCT_CONVENTION): Replace by
	gdbarch_deprecated_use_struct_convention.
	* arch-utils.c (legacy_return_value): Likewise.
	* gdbarch.c, gdbarch.h: Regenerate.

gdb/ChangeLog

@@ -1,3 +1,10 @@
+2007-06-18  Markus Deuling  <deuling@de.ibm.com>
+
+	* gdbarch.sh (DEPRECATED_USE_STRUCT_CONVENTION): Replace by
+	gdbarch_deprecated_use_struct_convention.
+	* arch-utils.c (legacy_return_value): Likewise.
+	* gdbarch.c, gdbarch.h: Regenerate.
+
 2007-06-18  Markus Deuling  <deuling@de.ibm.com>
 
 	* gdbarch.sh (DEPRECATED_FUNCTION_START_OFFSET): Replace by

gdb/arch-utils.c

@@ -54,7 +54,8 @@ legacy_return_value (struct gdbarch *gdbarch, struct type *valtype,
   int struct_return = ((TYPE_CODE (valtype) == TYPE_CODE_STRUCT
 			|| TYPE_CODE (valtype) == TYPE_CODE_UNION
 			|| TYPE_CODE (valtype) == TYPE_CODE_ARRAY)
-		       && DEPRECATED_USE_STRUCT_CONVENTION (0, valtype));
+		       && gdbarch_deprecated_use_struct_convention
+			    (current_gdbarch, 0, valtype));
 
   if (writebuf != NULL)
     {

gdb/gdbarch.c

@@ -747,12 +747,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
   fprintf_unfiltered (file,
                       "gdbarch_dump: deprecated_register_size = %s\n",
                       paddr_d (current_gdbarch->deprecated_register_size));
-#ifdef DEPRECATED_USE_STRUCT_CONVENTION
-  fprintf_unfiltered (file,
-                      "gdbarch_dump: %s # %s\n",
-                      "DEPRECATED_USE_STRUCT_CONVENTION(gcc_p, value_type)",
-                      XSTRING (DEPRECATED_USE_STRUCT_CONVENTION (gcc_p, value_type)));
-#endif
   fprintf_unfiltered (file,
                       "gdbarch_dump: deprecated_use_struct_convention = <0x%lx>\n",
                       (long) current_gdbarch->deprecated_use_struct_convention);

gdb/gdbarch.h

@@ -394,7 +394,7 @@ extern void set_gdbarch_return_value (struct gdbarch *gdbarch, gdbarch_return_va
 
 /* The deprecated methods EXTRACT_RETURN_VALUE, STORE_RETURN_VALUE,
    DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS and
-   DEPRECATED_USE_STRUCT_CONVENTION have all been folded into
+   deprecated_use_struct_convention have all been folded into
    RETURN_VALUE. */
 
 typedef void (gdbarch_extract_return_value_ftype) (struct type *type, struct regcache *regcache, gdb_byte *valbuf);
@@ -420,12 +420,6 @@ extern void set_gdbarch_store_return_value (struct gdbarch *gdbarch, gdbarch_sto
 typedef int (gdbarch_deprecated_use_struct_convention_ftype) (int gcc_p, struct type *value_type);
 extern int gdbarch_deprecated_use_struct_convention (struct gdbarch *gdbarch, int gcc_p, struct type *value_type);
 extern void set_gdbarch_deprecated_use_struct_convention (struct gdbarch *gdbarch, gdbarch_deprecated_use_struct_convention_ftype *deprecated_use_struct_convention);
-#if !defined (GDB_TM_FILE) && defined (DEPRECATED_USE_STRUCT_CONVENTION)
-#error "Non multi-arch definition of DEPRECATED_USE_STRUCT_CONVENTION"
-#endif
-#if !defined (DEPRECATED_USE_STRUCT_CONVENTION)
-#define DEPRECATED_USE_STRUCT_CONVENTION(gcc_p, value_type) (gdbarch_deprecated_use_struct_convention (current_gdbarch, gcc_p, value_type))
-#endif
 
 typedef CORE_ADDR (gdbarch_skip_prologue_ftype) (CORE_ADDR ip);
 extern CORE_ADDR gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip);

gdb/gdbarch.sh

@@ -510,12 +510,12 @@ M::enum return_value_convention:return_value:struct type *valtype, struct regcac
 
 # The deprecated methods EXTRACT_RETURN_VALUE, STORE_RETURN_VALUE,
 # DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS and
-# DEPRECATED_USE_STRUCT_CONVENTION have all been folded into
+# deprecated_use_struct_convention have all been folded into
 # RETURN_VALUE.
 
 f:=:void:extract_return_value:struct type *type, struct regcache *regcache, gdb_byte *valbuf:type, regcache, valbuf:0
 f:=:void:store_return_value:struct type *type, struct regcache *regcache, const gdb_byte *valbuf:type, regcache, valbuf:0
-f:=:int:deprecated_use_struct_convention:int gcc_p, struct type *value_type:gcc_p, value_type::generic_use_struct_convention::0
+f::int:deprecated_use_struct_convention:int gcc_p, struct type *value_type:gcc_p, value_type::generic_use_struct_convention::0
 
 f::CORE_ADDR:skip_prologue:CORE_ADDR ip:ip:0:0
 f::int:inner_than:CORE_ADDR lhs, CORE_ADDR rhs:lhs, rhs:0:0