From c244f7a6ffdc6e369f271b3a2284a6e364a1cb0b Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Sun, 16 Dec 2007 21:27:26 +0000 Subject: [PATCH] * f-typeprint.c (print_equivalent_f77_float_type): Remove function. (f_type_print_base): Output the type names directly for real and complex types. --- gdb/ChangeLog | 6 ++++++ gdb/f-typeprint.c | 27 +-------------------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d1fef99fe04..5337c5ea72f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2007-12-16 Francois-Xavier Coudert + + * 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 * breakpoint.c (bpstat_have_active_hw_watchpoints): diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c index c2decc9ebd8..b543743dc86 100644 --- 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. */ -- 2.30.2