* f-lang.c: Remove duplicate declaration of

builtin_type_f_integer, and only include it in the f_builtin_types
	once.

	* somread.c (som_symfile_read): Just assign to objfile->obj_private,
	not OBJ_UNWIND_INFO.  Assigning to a cast is a GCC-ism which
	the HP compiler doesn't like.

gdb/ChangeLog

@@ -1,3 +1,13 @@
+Mon Dec 12 13:06:59 1994  Jim Kingdon  <kingdon@deneb.cygnus.com>
+
+	* f-lang.c: Remove duplicate declaration of
+	builtin_type_f_integer, and only include it in the f_builtin_types
+	once.
+
+	* somread.c (som_symfile_read): Just assign to objfile->obj_private,
+	not OBJ_UNWIND_INFO.  Assigning to a cast is a GCC-ism which
+	the HP compiler doesn't like.
+
 Mon Dec 12 12:22:21 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* gdbtk.c:  New tcl commands:  gdb_fetch_registers,

gdb/f-lang.c

@@ -373,10 +373,10 @@ static const struct op_print f_op_print_tab[] = {
   { NULL,    0, 0, 0 }
 };
 
-/* The built-in types of F77.  */
+/* The built-in types of F77.  FIXME: integer*4 is missing, plain
+   logical is missing (builtin_type_logical is logical*4).  */
 
 struct type *builtin_type_f_character;
-struct type *builtin_type_f_integer;
 struct type *builtin_type_f_logical;
 struct type *builtin_type_f_logical_s1;
 struct type *builtin_type_f_logical_s2;
@@ -393,7 +393,6 @@ struct type *builtin_type_f_void;
 struct type ** const (f_builtin_types[]) = 
 {
   &builtin_type_f_character,
-  &builtin_type_f_integer,
   &builtin_type_f_logical,
   &builtin_type_f_logical_s1,
   &builtin_type_f_logical_s2,

gdb/somread.c

@@ -349,7 +349,7 @@ som_symfile_read (objfile, section_offsets, mainline)
   install_minimal_symbols (objfile);
 
   /* Force hppa-tdep.c to re-read the unwind descriptors.  */
-  OBJ_UNWIND_INFO (objfile) = NULL;
+  objfile->obj_private = NULL;
   do_cleanups (back_to);
 }