X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=gdb%2Fjv-lang.c;h=0d635c7896b420648cf8d4829fd9dce4cefc9d65;hb=32d0add0a654c1204ab71dc8a55d9374538c4b33;hp=acc191a1fee2e8d3b8d4715a3ee645c66878fbfe;hpb=43f3e411c415ac74130808a76473e05ff41a1d94;p=thirdparty%2Fbinutils-gdb.git

diff --git a/gdb/jv-lang.c b/gdb/jv-lang.c
index acc191a1fee..0d635c7896b 100644
--- a/gdb/jv-lang.c
+++ b/gdb/jv-lang.c
@@ -1,6 +1,6 @@
 /* Java language support routines for GDB, the GNU debugger.
 
-   Copyright (C) 1997-2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -174,8 +174,7 @@ get_java_class_symtab (struct gdbarch *gdbarch)
 static void
 add_class_symtab_symbol (struct symbol *sym)
 {
-  struct compunit_symtab *cust
-    = get_java_class_symtab (get_objfile_arch (SYMBOL_OBJFILE (sym)));
+  struct compunit_symtab *cust = get_java_class_symtab (symbol_arch (sym));
   const struct blockvector *bv = COMPUNIT_BLOCKVECTOR (cust);
 
   dict_add_symbol (BLOCK_DICT (BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK)), sym);
@@ -1198,6 +1197,8 @@ const struct language_defn java_language_defn =
   NULL,				/* la_get_symbol_name_cmp */
   iterate_over_symbols,
   &java_varobj_ops,
+  NULL,
+  NULL,
   LANG_MAGIC
 };