X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Finfcall.c;h=537596984c159216dcf526e6b02f57d441265780;hb=064f515651b1e730c60652eaf07f94c22841d475;hp=525cf2fd8e81a1f86dd6c470c44e882638181e2d;hpb=594f77850bb22a2cec4e8fc44c7ea735a6270eb2;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/infcall.c b/gdb/infcall.c
index 525cf2fd8e..537596984c 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -232,7 +232,7 @@ find_function_addr (struct value *function, struct type **retval_type)
 
   if (retval_type != NULL)
     *retval_type = value_type;
-  return funaddr + DEPRECATED_FUNCTION_START_OFFSET;
+  return funaddr + gdbarch_deprecated_function_start_offset (current_gdbarch);
 }
 
 /* Call breakpoint_auto_delete on the current contents of the bpstat
@@ -586,7 +586,7 @@ You must use a pointer to function type variable. Command ignored."), arg_name);
       }
   }
 
-  if (DEPRECATED_REG_STRUCT_HAS_ADDR_P ())
+  if (gdbarch_deprecated_reg_struct_has_addr_p (current_gdbarch))
     {
       int i;
       /* This is a machine like the sparc, where we may need to pass a
@@ -603,7 +603,8 @@ You must use a pointer to function type variable. Command ignored."), arg_name);
 	       || (TYPE_CODE (arg_type) == TYPE_CODE_FLT
 		   && TYPE_LENGTH (arg_type) > 8)
 	       )
-	      && DEPRECATED_REG_STRUCT_HAS_ADDR (using_gcc, arg_type))
+	      && gdbarch_deprecated_reg_struct_has_addr
+		   (current_gdbarch, using_gcc, arg_type))
 	    {
 	      CORE_ADDR addr;
 	      int len;		/*  = TYPE_LENGTH (arg_type); */