* dwarf2dbg.c: Always include dwarf2dbg.h.

	(dwarf2_directive_file): Adjust dummy version args.
	* ecoff.c (ecoff_directive_weakext): Add ATTRIBUTE_UNUSED.
	* expr.c (clean_up_expression <O_subtract>): Allow subtraction
	when symbol values differ.
	* read.c (do_align): Add ATTRIBUTE_UNUSED to label.
	(pseudo_set <O_subtract>): Remove unnecessary segment test.
	* config/obj-bout.c (obj_pseudo_table): Warning fix.

6 files changed, 52 insertions, 43 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ee15e93..44a2af4 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,14 @@
+2002-08-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf2dbg.c: Always include dwarf2dbg.h.
+	(dwarf2_directive_file): Adjust dummy version args.
+	* ecoff.c (ecoff_directive_weakext): Add ATTRIBUTE_UNUSED.
+	* expr.c (clean_up_expression <O_subtract>): Allow subtraction
+	when symbol values differ.
+	* read.c (do_align): Add ATTRIBUTE_UNUSED to label.
+	(pseudo_set <O_subtract>): Remove unnecessary segment test.
+	* config/obj-bout.c (obj_pseudo_table): Warning fix.
+
 2002-08-26  Alan Modra  <amodra@bigpond.net.au>
 
 	* config/tc-w65.c (md_section_align): Fix typo.
@@ -25,15 +36,15 @@
 
 2002-08-21  Elena Zannoni  <ezannoni@redhat.com>
 
-        * config/tc-ppc.c (ppc_cleanup): Do something only if format
-        is ELF.
-        (ppc_apuinfo_section_add): Define only if format is ELF.
-        (md_assemble): Emit APUinfo section only if format is ELF.
-        Fix formatting.
+	* config/tc-ppc.c (ppc_cleanup): Do something only if format
+	is ELF.
+	(ppc_apuinfo_section_add): Define only if format is ELF.
+	(md_assemble): Emit APUinfo section only if format is ELF.
+	Fix formatting.
 
 2002-08-21  Alan Modra  <amodra@bigpond.net.au>
 
-	* config/tc-arc.c (md_pseudo_table <dwarf2_directive_file>): Cast. 
+	* config/tc-arc.c (md_pseudo_table <dwarf2_directive_file>): Cast.
 	* config/tc-frv.c: Likewise.
 	* config/tc-hppa.c: Likewise.
 	* config/tc-ia64.c: Likewise.
@@ -53,28 +64,28 @@
 
 2002-08-19  Elena Zannoni  <ezannoni@redhat.com>
 
-        From matthew green  <mrg@redhat.com>
+	From matthew green  <mrg@redhat.com>
 
-        * config/tc-ppc.c (PPC_OPCODE_CLASSIC): Enable this everywhere
-        PPC_OPCODE_PPC is, except for BookE architectures.
-        (md_parse_option): Add support for -mspe.
-        (md_show_usage): Add -mspe.
-        (md_parse_option): Add support for -me500 and
-        -me500x2 to generate code for Motorola e500 core complex.
-        (md_show_usage): Add -me500 and -me500x2.
+	* config/tc-ppc.c (PPC_OPCODE_CLASSIC): Enable this everywhere
+	PPC_OPCODE_PPC is, except for BookE architectures.
+	(md_parse_option): Add support for -mspe.
+	(md_show_usage): Add -mspe.
+	(md_parse_option): Add support for -me500 and
+	-me500x2 to generate code for Motorola e500 core complex.
+	(md_show_usage): Add -me500 and -me500x2.
 
-        (PPC_APUINFO_ISEL, PPC_APUINFO_PMR, PPC_APUINFO_RFMCI,
-        PPC_APUINFO_CACHELCK, PPC_APUINFO_SPE, PPC_APUINFO_EFS,
-        PPC_APUINFO_BRLOCK): New macros.
+	(PPC_APUINFO_ISEL, PPC_APUINFO_PMR, PPC_APUINFO_RFMCI,
+	PPC_APUINFO_CACHELCK, PPC_APUINFO_SPE, PPC_APUINFO_EFS,
+	PPC_APUINFO_BRLOCK): New macros.
 
-        (ppc_cleanup): New function.
-        (ppc_apuinfo_section_add): New function.
-        (APUID): New macro.
-        (md_assemble): Collect info and write the APUinfo section.
+	(ppc_cleanup): New function.
+	(ppc_apuinfo_section_add): New function.
+	(APUID): New macro.
+	(md_assemble): Collect info and write the APUinfo section.
 
-        * config/tc-ppc.h (md_cleanup): Define.
-        (ppc_cleanup): Export.
-        (ELF_TC_SPECIAL_SECTIONS): Add .PPC.EMB.apuinfo section.
+	* config/tc-ppc.h (md_cleanup): Define.
+	(ppc_cleanup): Export.
+	(ELF_TC_SPECIAL_SECTIONS): Add .PPC.EMB.apuinfo section.
 
 2002-08-17  Stan Cox  <scox@redhat.com>
 
@@ -112,12 +123,12 @@
 
 	* config/tc-m68hc11.c (md_pseudo_table): Add relax command.
 	(s_m68hc11_relax): New function for relax group.
-	(build_insn, build_jump_insn): Emit a M68HC11_RL_JUMP reloc at 
+	(build_insn, build_jump_insn): Emit a M68HC11_RL_JUMP reloc at
 	beginning of jump instruction.
 	(md_pcrel_from): Rename from md_pcrel_from_section and fix
 	address computation.
 	(tc-gen_reloc): Update.
-	(md_estimate_size_before_relax): Create the BFD_RELOC_16_PCREL as 
+	(md_estimate_size_before_relax): Create the BFD_RELOC_16_PCREL as
 	PC-relative fixup.
 	(tc_m68hc11_force_relocation): New function, handle new relocs.
 	(tc_m68hc11_fix_adjustable): New to make sure there are enough
@@ -170,7 +181,7 @@
 
 	* configure.in: Add support for ppc-*-nto* target.
 	* configure: Regenerate.
-	
+
 2002-08-09  Alan Modra  <amodra@bigpond.net.au>
 
 	* config/tc-i386.h: Reorganize.
@@ -255,7 +266,7 @@
 	(md_create_long_jump, md_create_short_jump,
 	md_undefined_symbol_name, md_section_align, tc_gen_reloc): Note
 	unused parameters.
-	
+
 2002-07-31  Nick Clifton  <nickc@redhat.com>
 
 	* NEWS: Retroactively add entry for Lars Brinkhoff's contribution
@@ -293,7 +304,7 @@
 
 	* configure.in: Add support for arm-*-nto target.
 	* configure: Regenerate.
-	
+
 2002-07-30  Nick Clifton  <nickc@redhat.com>
 
 	* config/tc-arm.c (struct literal_pool): Add fields to allow
diff --git a/gas/config/obj-bout.c b/gas/config/obj-bout.c
index f13ddaf..05c8e00 100644
--- a/gas/config/obj-bout.c
+++ b/gas/config/obj-bout.c
@@ -1,5 +1,5 @@
 /* b.out object file format
-   Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 2000, 2001
+   Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -78,7 +78,7 @@ const pseudo_typeS obj_pseudo_table[] =
   {"ABORT", s_ignore, 0},
   {"ident", s_ignore, 0},
 
-  {NULL}			/* End sentinel.  */
+  {NULL, NULL, 0}		/* End sentinel.  */
 };
 
 /* Relocation.  */
diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index 0f459a5..f8a388b 100644
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -1,5 +1,5 @@
 /* dwarf2dbg.c - DWARF2 debug support
-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
    This file is part of GAS, the GNU Assembler.
@@ -41,9 +41,10 @@
 #endif
 #endif
 
+#include "dwarf2dbg.h"
+
 #ifdef BFD_ASSEMBLER
 
-#include "dwarf2dbg.h"
 #include "subsegs.h"
 
 #include "elf/dwarf2.h"
@@ -1340,11 +1341,12 @@ dwarf2_emit_insn (size)
 {
 }
 
-void
+char *
 dwarf2_directive_file (dummy)
      int dummy ATTRIBUTE_UNUSED;
 {
   s_app_file (0);
+  return NULL;
 }
 
 void
diff --git a/gas/ecoff.c b/gas/ecoff.c
index 75e0479..40b129b 100644
--- a/gas/ecoff.c
+++ b/gas/ecoff.c
@@ -3376,7 +3376,7 @@ mark_stabs (ignore)
 /* For TC_MIPS use the version in tc-mips.c.  */
 void
 ecoff_directive_weakext (ignore)
-     int ignore;
+     int ignore ATTRIBUTE_UNUSED;
 {
   char *name;
   int c;
diff --git a/gas/expr.c b/gas/expr.c
index 13c167a..64c92ca 100644
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -1,6 +1,6 @@
 /* expr.c -operands, expressions-
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001
+   1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -1375,9 +1375,7 @@ clean_up_expression (expressionP)
       if (expressionP->X_op_symbol == expressionP->X_add_symbol
 	  || ((symbol_get_frag (expressionP->X_op_symbol)
 	       == symbol_get_frag (expressionP->X_add_symbol))
-	      && SEG_NORMAL (S_GET_SEGMENT (expressionP->X_add_symbol))
-	      && (S_GET_VALUE (expressionP->X_op_symbol)
-		  == S_GET_VALUE (expressionP->X_add_symbol))))
+	      && SEG_NORMAL (S_GET_SEGMENT (expressionP->X_add_symbol))))
 	{
 	  addressT diff = (S_GET_VALUE (expressionP->X_add_symbol)
 			   - S_GET_VALUE (expressionP->X_op_symbol));
diff --git a/gas/read.c b/gas/read.c
index 934d270..70662c9 100644
--- a/gas/read.c
+++ b/gas/read.c
@@ -1,6 +1,6 @@
 /* read.c - read a source file -
    Copyright 1986, 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-   1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GAS, the GNU Assembler.
 
@@ -1197,7 +1197,7 @@ do_align (n, fill, len, max)
     }
 
 #ifdef md_do_align
- just_record_alignment:
+ just_record_alignment: ATTRIBUTE_UNUSED
 #endif
 
   record_alignment (now_seg, n - OCTETS_PER_BYTE_POWER);
@@ -3232,8 +3232,6 @@ pseudo_set (symbolP)
 	as_bad (_("floating point number invalid"));
     }
   else if (exp.X_op == O_subtract
-	   && (S_GET_SEGMENT (exp.X_add_symbol)
-	       == S_GET_SEGMENT (exp.X_op_symbol))
 	   && SEG_NORMAL (S_GET_SEGMENT (exp.X_add_symbol))
 	   && (symbol_get_frag (exp.X_add_symbol)
 	       == symbol_get_frag (exp.X_op_symbol)))