gas OBJ_PROCESS_STAB

gas OBJ_PROCESS_STAB

[Alan Modra]

This macro and the supporting functions have an unused "seg" first
argument.  Tidy that.

	* config/obj-aout.c (obj_aout_process_stab): Delete first param.
	* config/obj-ecoff.h (OBJ_PROCESS_STAB): Likewise.
	* config/obj-elf.c (elf_process_stab): Likewise.
	* config/obj-elf.h (OBJ_PROCESS_STAB): Likewise.
	* config/obj-macho.h (OBJ_PROCESS_STAB): Likewise.
	* config/obj-multi.h (OBJ_PROCESS_STAB): Likewise.
	* ecoff.c (ecoff_stab): Likewise.
	* ecoff.h (ecoff_stab): Likewise.
	* obj.h (struct format_ops <process_stab>): Likewise.
	* stabs.c (OBJ_PROCESS_STAB): Likewise.

diff --git a/gas/config/obj-aout.c b/gas/config/obj-aout.c
index b602db2a0fa..033a0982d03 100644
--- a/gas/config/obj-aout.c
+++ b/gas/config/obj-aout.c
@@ -248,8 +248,7 @@ obj_aout_sec_sym_ok_for_reloc (asection *sec ATTRIBUTE_UNUSED)
 }
 
 static void
-obj_aout_process_stab (segT seg ATTRIBUTE_UNUSED,
-		       int w,
+obj_aout_process_stab (int w,
 		       const char *s,
 		       int t,
 		       int o,
diff --git a/gas/config/obj-ecoff.h b/gas/config/obj-ecoff.h
index 71b6c765c90..c46329d9098 100644
--- a/gas/config/obj-ecoff.h
+++ b/gas/config/obj-ecoff.h
@@ -64,8 +64,8 @@ struct ecoff_sy_obj
 #define obj_app_file(name) ecoff_new_file (name)
 
 /* At the moment we don't want to do any stabs processing in read.c.  */
-#define OBJ_PROCESS_STAB(seg, what, string, type, other, desc) \
-  ecoff_stab ((seg), (what), (string), (type), (other), (desc))
+#define OBJ_PROCESS_STAB(what, string, type, other, desc) \
+  ecoff_stab ((what), (string), (type), (other), (desc))
 
 #define EMIT_SECTION_SYMBOLS		0
 #define obj_sec_sym_ok_for_reloc(SEC)	1
diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c
index a9258ce334c..1c1b60b0b48 100644
--- a/gas/config/obj-elf.c
+++ b/gas/config/obj-elf.c
@@ -3114,8 +3114,7 @@ elf_generate_asm_lineno (void)
 }
 
 static void
-elf_process_stab (segT sec ATTRIBUTE_UNUSED,
-		  int what ATTRIBUTE_UNUSED,
+elf_process_stab (int what ATTRIBUTE_UNUSED,
 		  const char *string ATTRIBUTE_UNUSED,
 		  int type ATTRIBUTE_UNUSED,
 		  int other ATTRIBUTE_UNUSED,
@@ -3123,7 +3122,7 @@ elf_process_stab (segT sec ATTRIBUTE_UNUSED,
 {
 #ifdef NEED_ECOFF_DEBUG
   if (ECOFF_DEBUGGING)
-    ecoff_stab (sec, what, string, type, other, desc);
+    ecoff_stab (what, string, type, other, desc);
 #endif
 }
 
diff --git a/gas/config/obj-elf.h b/gas/config/obj-elf.h
index e8fc3126bed..5c8404ec49d 100644
--- a/gas/config/obj-elf.h
+++ b/gas/config/obj-elf.h
@@ -265,9 +265,9 @@ extern void obj_elf_init_stab_section (segT);
   ((void) (ECOFF_DEBUGGING ? 0 : (obj_elf_init_stab_section (seg), 0)))
 
 #undef OBJ_PROCESS_STAB
-#define OBJ_PROCESS_STAB(seg, what, string, type, other, desc)		\
+#define OBJ_PROCESS_STAB(what, string, type, other, desc)		\
   if (ECOFF_DEBUGGING)							\
-    ecoff_stab ((seg), (what), (string), (type), (other), (desc))
+    ecoff_stab ((what), (string), (type), (other), (desc))
 #endif /* ECOFF_DEBUGGING */
 
 #endif /* SEPARATE_STAB_SECTIONS not defined.  */
diff --git a/gas/config/obj-macho.h b/gas/config/obj-macho.h
index 1a9390d6610..cfce9d9ef48 100644
--- a/gas/config/obj-macho.h
+++ b/gas/config/obj-macho.h
@@ -76,7 +76,7 @@ extern void obj_mach_o_frob_label (symbolS *);
 #define obj_frob_symbol(s, punt) punt = obj_mach_o_frob_symbol(s)
 extern int obj_mach_o_frob_symbol (struct symbol *);
 
-#define OBJ_PROCESS_STAB(SEG,W,S,T,O,D)	obj_mach_o_process_stab(W,S,T,O,D)
+#define OBJ_PROCESS_STAB(W,S,T,O,D)	obj_mach_o_process_stab(W,S,T,O,D)
 extern void obj_mach_o_process_stab (int, const char *,int, int, int);
 
 struct obj_mach_o_frag_data
diff --git a/gas/config/obj-multi.h b/gas/config/obj-multi.h
index d4c94799edf..894b9245845 100644
--- a/gas/config/obj-multi.h
+++ b/gas/config/obj-multi.h
@@ -145,9 +145,9 @@
 	 ? (*this_format->copy_symbol_attributes) (d, s) \
 	 : (void) 0)
 
-#define OBJ_PROCESS_STAB(SEG,W,S,T,O,D)			\
+#define OBJ_PROCESS_STAB(W,S,T,O,D)			\
 	(this_format->process_stab			\
-	 ? (*this_format->process_stab) (SEG,W,S,T,O,D)	\
+	 ? (*this_format->process_stab) (W,S,T,O,D)	\
 	 : (void) 0)
 
 #define SEPARATE_STAB_SECTIONS \
diff --git a/gas/ecoff.c b/gas/ecoff.c
index 1c01911f55c..5076bbc34a0 100644
--- a/gas/ecoff.c
+++ b/gas/ecoff.c
@@ -3402,8 +3402,7 @@ ecoff_directive_weakext (int ignore ATTRIBUTE_UNUSED)
 	value		a numeric value or an address.  */
 
 void
-ecoff_stab (segT sec ATTRIBUTE_UNUSED,
-	    int what,
+ecoff_stab (int what,
 	    const char *string,
 	    int type,
 	    int other,
diff --git a/gas/ecoff.h b/gas/ecoff.h
index b2bb8d54812..b649ab699b3 100644
--- a/gas/ecoff.h
+++ b/gas/ecoff.h
@@ -82,7 +82,7 @@ extern void ecoff_directive_type (int);
 extern void ecoff_directive_val (int);
 
 /* Handle stabs.  */
-extern void ecoff_stab (segT sec, int what, const char *string,
+extern void ecoff_stab (int what, const char *string,
 			int type, int other, int desc);
 
 /* Set the GP prologue size.  */
diff --git a/gas/obj.h b/gas/obj.h
index 6d92c368a56..3851e67563b 100644
--- a/gas/obj.h
+++ b/gas/obj.h
@@ -63,7 +63,7 @@ struct format_ops {
   void (*s_set_type) (symbolS *, int);
   void (*copy_symbol_attributes) (symbolS *, symbolS *);
   void (*generate_asm_lineno) (void);
-  void (*process_stab) (segT, int, const char *, int, int, int);
+  void (*process_stab) (int, const char *, int, int, int);
   int (*separate_stab_sections) (void);
   void (*init_stab_section) (segT);
   int (*sec_sym_ok_for_reloc) (asection *);
diff --git a/gas/stabs.c b/gas/stabs.c
index f650a48ae88..6a462c4eee7 100644
--- a/gas/stabs.c
+++ b/gas/stabs.c
@@ -145,7 +145,7 @@ get_stab_string_offset (const char *string, const char *stabstr_secname,
 
 #ifdef AOUT_STABS
 #ifndef OBJ_PROCESS_STAB
-#define OBJ_PROCESS_STAB(SEG,W,S,T,O,D)	aout_process_stab(W,S,T,O,D)
+#define OBJ_PROCESS_STAB(W,S,T,O,D)	aout_process_stab(W,S,T,O,D)
 #endif
 
 /* Here instead of obj-aout.c because other formats use it too.  */
@@ -401,7 +401,7 @@ s_stab_generic (int what,
 	}
 
 #ifdef OBJ_PROCESS_STAB
-      OBJ_PROCESS_STAB (seg, what, string, type, other, desc);
+      OBJ_PROCESS_STAB (what, string, type, other, desc);
 #endif
 
       subseg_set (saved_seg, saved_subseg);
@@ -415,7 +415,7 @@ s_stab_generic (int what,
 	    obstack_free (&notes, stab_secname);
 	}
 #ifdef OBJ_PROCESS_STAB
-      OBJ_PROCESS_STAB (0, what, string, type, other, desc);
+      OBJ_PROCESS_STAB (what, string, type, other, desc);
 #else
       abort ();
 #endif

-- 
Alan Modra
Australia Development Lab, IBM