Fix wrong source file name of cross-arm-binutils.

[platform/upstream/binutils.git] / gdb / jv-typeprint.c

diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index f0d3448..24f62ef 100644 (file)
--- a/gdb/jv-typeprint.c
+++ b/gdb/jv-typeprint.c
@@ -1,5 +1,5 @@
 /* Support for printing Java types for GDB, the GNU debugger.
-   Copyright (C) 1997-2000, 2007-2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -24,11 +24,10 @@
 #include "demangle.h"
 #include "gdb-demangle.h"
 #include "jv-lang.h"
-#include "gdb_string.h"
 #include "typeprint.h"
 #include "c-lang.h"
 #include "cp-abi.h"
-#include "gdb_assert.h"
+#include "cp-support.h"
 
 /* Local functions */
 
@@ -239,7 +238,8 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
                  physname[p - real_physname] = '\0';
 
                  is_full_physname_constructor
-                    = (is_constructor_name (physname)
+                    = (TYPE_FN_FIELD_CONSTRUCTOR (f, j)
+                      || is_constructor_name (physname)
                        || is_destructor_name (physname));
 
                  QUIT;
@@ -285,8 +285,8 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
                    mangled_name = physname;
 
                  demangled_name =
-                   cplus_demangle (mangled_name,
-                                   DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA);
+                   gdb_demangle (mangled_name,
+                                 DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA);
 
                  if (demangled_name == NULL)
                    demangled_name = xstrdup (mangled_name);