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

[deliverable/binutils-gdb.git] / gdb / rs6000-tdep.c

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 87ed4dcf9bff960b60221cb24682782f896196ae..bc08fbd3651d36a683ed857a7f5e822934371d69 100644 (file)
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -2750,15 +2750,9 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_sp_regnum (gdbarch, 1);
   set_gdbarch_deprecated_fp_regnum (gdbarch, 1);
   if (sysv_abi && wordsize == 8)
-    {
-      set_gdbarch_extract_return_value (gdbarch, ppc64_sysv_abi_extract_return_value);
-      set_gdbarch_store_return_value (gdbarch, ppc64_sysv_abi_store_return_value);
-    }
+    set_gdbarch_return_value (gdbarch, ppc64_sysv_abi_return_value);
   else if (sysv_abi && wordsize == 4)
-    {
-      set_gdbarch_extract_return_value (gdbarch, ppc_sysv_abi_extract_return_value);
-      set_gdbarch_store_return_value (gdbarch, ppc_sysv_abi_store_return_value);
-    }
+    set_gdbarch_return_value (gdbarch, ppc_sysv_abi_return_value);
   else
     {
       set_gdbarch_deprecated_extract_return_value (gdbarch, rs6000_extract_return_value);
@@ -2907,12 +2901,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   /* Not sure on this. FIXMEmgo */
   set_gdbarch_frame_args_skip (gdbarch, 8);
 
-  if (sysv_abi && wordsize == 4)
-    set_gdbarch_use_struct_convention (gdbarch,
-                                      ppc_sysv_abi_use_struct_convention);
-  else if (sysv_abi && wordsize == 8)
-    set_gdbarch_use_struct_convention (gdbarch, ppc64_sysv_abi_use_struct_convention);
-  else
+  if (!sysv_abi)
     set_gdbarch_use_struct_convention (gdbarch,
                                       rs6000_use_struct_convention);