* f-typeprint.c (print_equivalent_f77_float_type): Remove function.

	(f_type_print_base): Output the type names directly for real and
	complex types.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d1fef99..5337c5e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-16  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+       * f-typeprint.c (print_equivalent_f77_float_type): Remove function.
+       (f_type_print_base): Output the type names directly for real and
+       complex types.
+
 2007-12-16  Vladimir Prus  <vladimir@codesourcery.com>
 
        * breakpoint.c (bpstat_have_active_hw_watchpoints):

diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index c2decc9..b543743 100644 (file)
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -39,9 +39,6 @@
 static void f_type_print_args (struct type *, struct ui_file *);
 #endif
 
-static void print_equivalent_f77_float_type (int level, struct type *,
-                                            struct ui_file *);
-
 static void f_type_print_varspec_suffix (struct type *, struct ui_file *,
                                         int, int, int);
 
@@ -254,17 +251,6 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
     }
 }
 
-static void
-print_equivalent_f77_float_type (int level, struct type *type,
-                                struct ui_file *stream)
-{
-  /* Override type name "float" and make it the
-     appropriate real. XLC stupidly outputs -12 as a type
-     for real when it really should be outputting -18 */
-
-  fprintfi_filtered (level, stream, "real*%d", TYPE_LENGTH (type));
-}
-
 /* Print the name of the type (or the ultimate pointer target,
    function value or array element), or the description of a
    structure or union.
@@ -301,10 +287,7 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
 
   if ((show <= 0) && (TYPE_NAME (type) != NULL))
     {
-      if (TYPE_CODE (type) == TYPE_CODE_FLT)
-       print_equivalent_f77_float_type (level, type, stream);
-      else
-       fputs_filtered (TYPE_NAME (type), stream);
+      fputs_filtered (TYPE_NAME (type), stream);
       return;
     }
 
@@ -365,14 +348,6 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
        goto default_case;
       break;
 
-    case TYPE_CODE_COMPLEX:
-      fprintfi_filtered (level, stream, "complex*%d", TYPE_LENGTH (type));
-      break;
-
-    case TYPE_CODE_FLT:
-      print_equivalent_f77_float_type (level, type, stream);
-      break;
-
     case TYPE_CODE_STRING:
       /* Strings may have dynamic upperbounds (lengths) like arrays. */