* som.c (som_bfd_free_cached_info): Add missing PARAMS decl.

        Don't free anything if we don't have a bfd_object.
        (som_close_and_cleanup): Call som_bfd_free_cached_info.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 434db981b1942e999f1c1a56fef3867fd5a09847..f20ad481f2a3e59d5c38b0c2e210c69dabc1fa0f 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+Tue Apr  5 15:50:01 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+       * som.c (som_bfd_free_cached_info): Add missing PARAMS decl.
+       Don't free anything if we don't have a bfd_object.
+       (som_close_and_cleanup): Call som_bfd_free_cached_info.
+
 Tue Apr  5 11:22:38 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
        * elf32-mips.c (mips_elf_final_link): Don't remove empty sections.

diff --git a/bfd/som.c b/bfd/som.c
index 7c913b1cfa13eb23a252f1cf59e628773d807835..7d9795b8717ec4fac7c3adcb7723881c5b5b226d 100644 (file)
--- a/bfd/som.c
+++ b/bfd/som.c
@@ -234,6 +234,7 @@ static CONST char *normalize PARAMS ((CONST char *file));
 static boolean som_is_space PARAMS ((asection *));
 static boolean som_is_subspace PARAMS ((asection *));
 static boolean som_is_container PARAMS ((asection *, asection *));
+static boolean som_bfd_free_cached_info PARAMS ((bfd *));
        
 /* Map SOM section names to POSIX/BSD single-character symbol types.
 
@@ -5457,6 +5458,9 @@ som_bfd_free_cached_info (abfd)
 {
   asection *o;
 
+  if (bfd_get_format (abfd) != bfd_object)
+    return true;
+
 #define FREE(x) if (x != NULL) { free (x); x = NULL; }
   /* Free the native string and symbol tables.  */
   FREE (obj_som_symtab (abfd));
@@ -5486,7 +5490,7 @@ som_bfd_free_cached_info (abfd)
 #define som_slurp_extended_name_table  _bfd_slurp_extended_name_table
 
 #define som_get_lineno                   (struct lineno_cache_entry *(*)())bfd_nullvoidptr
-#define        som_close_and_cleanup              bfd_generic_close_and_cleanup
+#define        som_close_and_cleanup           som_bfd_free_cached_info
 
 #define som_bfd_get_relocated_section_contents \
  bfd_generic_get_relocated_section_contents