2004-07-17 Andrew Cagney <cagney@gnu.org>

[deliverable/binutils-gdb.git] / gdb / infcall.c

diff --git a/gdb/infcall.c b/gdb/infcall.c
index 8123806e9f609033dfb35064dc7ee2c36df30d8d..9e3e479f74b6d27a21b27cbfa8ca63775edc0159 100644 (file)
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -207,7 +207,7 @@ find_function_addr (struct value *function, struct type **retval_type)
 
   if (retval_type != NULL)
     *retval_type = value_type;
-  return funaddr + FUNCTION_START_OFFSET;
+  return funaddr + DEPRECATED_FUNCTION_START_OFFSET;
 }
 
 /* Call breakpoint_auto_delete on the current contents of the bpstat
@@ -939,7 +939,7 @@ the function call).", name);
         "struct return convention", check that PUSH_DUMMY_CALL isn't
         playing tricks.  */
       retval = value_at (value_type, struct_addr, NULL);
-    else if (gdbarch_return_value_p (current_gdbarch))
+    else
       {
        /* This code only handles "register convention".  */
        retval = allocate_value (value_type);
@@ -950,15 +950,6 @@ the function call).", name);
                              VALUE_CONTENTS_RAW (retval) /*read*/,
                              NULL /*write*/);
       }
-    else
-      {
-       /* NOTE: cagney/2003-10-20: Unlike "gdbarch_return_value", the
-          EXTRACT_RETURN_VALUE and USE_STRUCT_CONVENTION methods do
-          not handle the edge case of a function returning a small
-          structure / union in registers.  */
-       retval = allocate_value (value_type);
-       EXTRACT_RETURN_VALUE (value_type, retbuf, VALUE_CONTENTS_RAW (retval));
-      }
     do_cleanups (retbuf_cleanup);
     return retval;
   }