* rs6000-tdep.c (rs6000_gdbarch_init): Only set

convert_from_func_ptr-addr when AIX / PowerOpen.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e91880f..924425d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-26  Andrew Cagney  <ac131313@redhat.com>
+
+       * rs6000-tdep.c (rs6000_gdbarch_init): Only set
+       convert_from_func_ptr-addr when AIX / PowerOpen.
+
 2002-04-25  Andrew Cagney  <ac131313@redhat.com>
 
        * valops.c (hand_function_call): Call

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 23130b8..97b936d 100644 (file)
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -2746,8 +2746,11 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
       set_gdbarch_frame_init_saved_regs (gdbarch, rs6000_frame_init_saved_regs);
       set_gdbarch_init_extra_frame_info (gdbarch, rs6000_init_extra_frame_info);
-
-      /* Handle RS/6000 function pointers.  */
+    }
+  if (!sysv_abi)
+    {
+      /* Handle RS/6000 function pointers (which are really function
+         descriptors).  */
       set_gdbarch_convert_from_func_ptr_addr (gdbarch,
        rs6000_convert_from_func_ptr_addr);
     }