* config/obj-som.c (adjust_stab_sections): Add prototype.

	(obj_som_compiler, obj_som_version, obj_som_copyright,
	adjust_stab_sections): Add ATTRIBUTE_UNUSED to unused arguments.
	* config/tc-hppa.c (update_subspace):  Likewise.
	(is_defined_subspace): Amplify comment.
	* config/obj-som.h (som_frob_file): Add prototype.

4 files changed, 27 insertions, 11 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6725723568..450c086669 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2004-07-19  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* config/obj-som.c (adjust_stab_sections): Add prototype.
+	(obj_som_compiler, obj_som_version, obj_som_copyright,
+	adjust_stab_sections): Add ATTRIBUTE_UNUSED to unused arguments.
+	* config/tc-hppa.c (update_subspace):  Likewise.
+	(is_defined_subspace): Amplify comment.
+	* config/obj-som.h (som_frob_file): Add prototype.
+
 2004-07-19  Christopher Faylor  <cgf@timesys.com>
 	    H.J. Lu  <hongjiu.lu@intel.com>
 
diff --git a/gas/config/obj-som.c b/gas/config/obj-som.c
index a736c9658e..396b500951 100644
--- a/gas/config/obj-som.c
+++ b/gas/config/obj-som.c
@@ -27,6 +27,7 @@
 #include "obstack.h"
 
 static void obj_som_weak PARAMS ((int));
+static void adjust_stab_sections PARAMS ((bfd *, asection *, PTR));
 
 const pseudo_typeS obj_pseudo_table[] =
 {
@@ -52,7 +53,7 @@ obj_read_begin_hook ()
 
 void
 obj_som_compiler (unused)
-     int unused;
+     int unused ATTRIBUTE_UNUSED;
 {
   char *buf;
   char c;
@@ -129,7 +130,7 @@ obj_som_compiler (unused)
 
 void
 obj_som_version (unused)
-     int unused;
+     int unused ATTRIBUTE_UNUSED;
 {
   char *version, c;
 
@@ -175,7 +176,7 @@ obj_som_version (unused)
 
 void
 obj_som_copyright (unused)
-     int unused;
+     int unused ATTRIBUTE_UNUSED;
 {
   char *copyright, c;
 
@@ -283,7 +284,7 @@ static void
 adjust_stab_sections (abfd, sec, xxx)
      bfd *abfd;
      asection *sec;
-     PTR xxx;
+     PTR xxx ATTRIBUTE_UNUSED;
 {
   asection *strsec;
   char *p;
diff --git a/gas/config/obj-som.h b/gas/config/obj-som.h
index 23d79eb2b1..498fcce775 100644
--- a/gas/config/obj-som.h
+++ b/gas/config/obj-som.h
@@ -39,6 +39,7 @@
 #define som_symbol(asymbol) ((som_symbol_type *) (&(asymbol)->the_bfd))
 
 extern void som_file_symbol PARAMS ((char *));
+extern void som_frob_file PARAMS ((void));
 extern void obj_som_version PARAMS ((int));
 extern void obj_som_init_stab_section PARAMS ((segT));
 extern void obj_som_copyright PARAMS ((int));
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index c060b32b77..777aba6401 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -7982,16 +7982,16 @@ update_subspace (space, name, loadable, code_only, comdat, common, dup_common,
 		 sort, zero, access, space_index, alignment, quadrant, section)
      sd_chain_struct *space;
      char *name;
-     int loadable;
-     int code_only;
+     int loadable ATTRIBUTE_UNUSED;
+     int code_only ATTRIBUTE_UNUSED;
      int comdat;
      int common;
      int dup_common;
-     int zero;
+     int zero ATTRIBUTE_UNUSED;
      int sort;
      int access;
-     int space_index;
-     int alignment;
+     int space_index ATTRIBUTE_UNUSED;
+     int alignment ATTRIBUTE_UNUSED;
      int quadrant;
      asection *section;
 {
@@ -8053,9 +8053,14 @@ pa_segment_to_space (seg)
   return NULL;
 }
 
-/* Return the space chain entry for the subspace with the name NAME or
-   NULL if no such subspace exists.
+/* Return the first space chain entry for the subspace with the name
+   NAME or NULL if no such subspace exists.
 
+   When there are multiple subspaces with the same name, switching to
+   the first (i.e., default) subspace is preferable in most situations.
+   For example, it wouldn't be desirable to merge COMDAT data with non
+   COMDAT data.
+    
    Uses a linear search through all the spaces and subspaces, this may
    not be appropriate if we ever being placing each function in its
    own subspace.  */