Index: dwarf2out.c
===================================================================
--- dwarf2out.c	(revision 191203)
+++ dwarf2out.c	(working copy)
@@ -9484,7 +9484,8 @@ output_pubname (dw_offset die_offset, pubname_entr
         case DW_TAG_union_type:
         case DW_TAG_enumeration_type:
           GDB_INDEX_SYMBOL_KIND_SET_VALUE(flags, GDB_INDEX_SYMBOL_KIND_TYPE);
-          GDB_INDEX_SYMBOL_STATIC_SET_VALUE(flags, 1);
+          if (!is_cxx () && !is_java ())
+            GDB_INDEX_SYMBOL_STATIC_SET_VALUE(flags, 1);
           break;
         default:
 	  /* For unrecognized TAGs, don't set the flags.  */