* Makefile.am (OBJS): Depend on ansidecl.h and fopen-same.h.

	* Makefile.in: Regenerate.
	* dep-in.sed: Reorder to match OBJS in Makefile.am.
	* configure.in (ALL_OBJ_DEPS): Add symcat.h when need_bfd.
	* configure: Regenerate.
	* as.h: Use #include "" instead of <> for local header files.
	* flonum-konst.c: Likewise.
	* flonum-mult.c: Likewise.
	* gasp.c: Likewise.
	* listing.c: Likewise.
	* config/tc-ia64.h: Likewise.
	* config/tc-v850.h: Likewise.

13 files changed, 112 insertions, 20 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9def50238d..35614a796e 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,18 @@
+2002-05-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (OBJS): Depend on ansidecl.h and fopen-same.h.
+	* Makefile.in: Regenerate.
+	* dep-in.sed: Reorder to match OBJS in Makefile.am.
+	* configure.in (ALL_OBJ_DEPS): Add symcat.h when need_bfd.
+	* configure: Regenerate.
+	* as.h: Use #include "" instead of <> for local header files.
+	* flonum-konst.c: Likewise.
+	* flonum-mult.c: Likewise.
+	* gasp.c: Likewise.
+	* listing.c: Likewise.
+	* config/tc-ia64.h: Likewise.
+	* config/tc-v850.h: Likewise.
+
 2002-05-24  TAMURA Kent <kent@netbsd.org>
 
 	* configure.in: Add a target for i386-netbsdpe.
@@ -121,6 +136,80 @@
 
 2002-05-17  Alan Modra  <amodra@bigpond.net.au>
 
+	* doc/internals.texi (md_apply_fix3): Expand.
+	(TC_FORCE_RELOCATION, TC_FORCE_RELOCATION_ABS,
+	TC_FORCE_RELOCATION_LOCAL, TC_FORCE_RELOCATION_SUB_SAME,
+	TC_FORCE_RELOCATION_SUB_ABS, TC_FORCE_RELOCATION_SUB_LOCAL,
+	TC_FIX_ADJUSTABLE): Document.
+	* symbols.c (S_FORCE_RELOC): New function.
+	* symbols.h (S_FORCE_RELOC): Declare.  s/CONST/const/.
+	* config/obj-aout.h (S_FORCE_RELOC): Define.
+	* config/obj-bout.h (S_FORCE_RELOC): Define.
+	* config/obj-coff.h (S_FORCE_RELOC): Define.  Formatting fixes.
+	* config/obj-ieee.h (S_FORCE_RELOC): Define.  Formatting fixes.
+	* config/obj-vms.h (S_FORCE_RELOC): Define.
+	* expr.c (clean_up_expression <O_subtract>): Use S_FORCE_RELOC
+	instead of SEG_NORMAL.  Allow diff != 0.
+	(expr <O_subtract>): Use S_FORCE_RELOC instead of SEG_NORMAL.
+	* read.c (pseudo_set): Likewise.
+	* write.c (TC_FORCE_RELOCATION_ABS): Define.
+	(TC_FORCE_RELOCATION_LOCAL): Define, replaces..
+	(TC_RELOC_RTSYM_LOC_FIXUP): ..this. Remove.
+	(TC_FORCE_RELOCATION_SUB_SAME): Define, replaces..
+	(TC_FORCE_RELOCATION_SECTION): ..this.  Remove.
+	(TC_FORCE_RELOCATION_SUB_ABS): Define.
+	(TC_FORCE_RELOCATION_SUB_LOCAL): Define.
+	(RELOC_ENUM): Define.
+	(fix_new_internal): Use RELOC_ENUM.
+	(fix_new): Likewise.
+	(fix_new_exp): Likewise.
+	(adjust_reloc_syms): Split out code setting used_in_reloc to..
+	(mark_reloc_syms): ..here.  New function.  Use S_FORCE_RELOC.
+	(write_object_file): Call mark_reloc_syms.
+	(write_relocs): Formatting.  Avoid symbol loops in
+	RELOC_EXPANSION_POSSIBLE case too.  Report bfd_reloc_outofrange
+	errors, and error number in other cases.
+	(fixup_segment): Rewrite.
+	* config/tc-alpha.h (TC_FORCE_RELOCATION_LOCAL): Define, replaces..
+	(TC_RELOC_RTSYM_LOC_FIXUP): Delete.
+	* config/tc-arm.h: Likewise.
+	* config/tc-cris.h: Likewise.
+	* config/tc-i386.h: Likewise.
+	* config/tc-i960.h: Likewise.
+	* config/tc-ia64.h: Likewise.
+	* config/tc-m68k.h: Likewise.
+	* config/tc-ppc.h: Likewise.
+	* config/tc-s390.h: Likewise.
+	* config/tc-sh.h: Likewise.
+	* config/tc-sh64.h: Likewise.
+	* config/tc-sparc.h: Likewise.
+	* config/tc-hppa.h (TC_FORCE_RELOCATION_SUB_SAME): Define, replaces..
+	(TC_FORCE_RELOCATION_SECTION):  Delete.
+	* config/tc-i386.c (tc_i386_force_relocation): Remove.
+	(BFD_RELOC_8, BFD_RELOC_16): Define for non BFD_ASSEMBLER.
+	(md_apply_fix3): Formatting.  Hack for bfd_install_relocation when
+	fx_pcrel, not when fx_addsy.
+	* config/tc-i386.h (TC_FORCE_RELOCATION): Define using code moved
+	from tc_i386_force_relocation.
+	(TC_FIX_ADJUSTABLE): Remove redundant tc_fix_adjustable condition.
+	* config/tc-s390.h (TC_FIX_ADJUSTABLE): Likewise.
+	* config/tc-sh.h (TC_FIX_ADJUSTABLE): Likewise.
+	* config/tc-i960.c (reloc_callj): Remove declaration.  Return false.
+	* config/tc-i960.h (TC_FORCE_RELOCATION_SUB): Define.
+	(TC_FORCE_RELOCATION_ABS): Define.
+	* config/tc-ppc.c (md_apply_fix3): Rename arg to match comments.
+	Don't undo adjustments done by write.c:fixup_segment.
+	* config/tc-ppc.h (TC_FIX_ADJUSTABLE): Instead arrange for them
+	to not occur in the first place.
+	(TC_FORCE_RELOCATION_SECTION): Delete.
+	* config/tc-s390.c (md_apply_fix3): Use TC_FORCE_RELOCATION_LOCAL
+	instead of TC_RELOC_RTSYM_LOC_FIXUP.
+	* config/tc-sh.c (sh_fix_adjustable): Likewise.
+	* config/tc-sh.h (obj_fix_adjustable): Delete, instead..
+	(tc_fix_adjustable): Define.
+
+2002-05-17  Alan Modra  <amodra@bigpond.net.au>
+
 	* config/obj-generic.c: Delete file.
 	* config/obj-generic.h: Likewise.
 
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 5c539c3dbc..fabcafc585 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -494,7 +494,8 @@ as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
 
 # Stuff that every object file depends upon.  If anything is removed
 # from this list, remove it from dep-in.sed as well.
-$(OBJS): $(INCDIR)/bin-bugs.h $(INCDIR)/libiberty.h $(INCDIR)/progress.h \
+$(OBJS): $(INCDIR)/bin-bugs.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+	$(INCDIR)/progress.h $(INCDIR)/fopen-same.h \
 	$(OBJ_FORMAT_H) $(TARG_CPU_H) $(TARG_ENV_H) \
 	as.h asintl.h bignum.h bit_fix.h config.h emul.h expr.h flonum.h \
 	frags.h hash.h listing.h obj.h read.h symbols.h tc.h write.h
diff --git a/gas/Makefile.in b/gas/Makefile.in
index b7b9b64b5b..defe689671 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -2307,7 +2307,7 @@ configure configure.in gdbinit.in itbl-lex.c itbl-parse.c
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(gasp_new_SOURCES) $(itbl_test_SOURCES) $(as_new_SOURCES) $(EXTRA_as_new_SOURCES)
 OBJECTS = $(gasp_new_OBJECTS) $(itbl_test_OBJECTS) $(as_new_OBJECTS)
@@ -2712,7 +2712,8 @@ $(OBJS): @ALL_OBJ_DEPS@
 
 # Stuff that every object file depends upon.  If anything is removed
 # from this list, remove it from dep-in.sed as well.
-$(OBJS): $(INCDIR)/bin-bugs.h $(INCDIR)/libiberty.h $(INCDIR)/progress.h \
+$(OBJS): $(INCDIR)/bin-bugs.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+	$(INCDIR)/progress.h $(INCDIR)/fopen-same.h \
 	$(OBJ_FORMAT_H) $(TARG_CPU_H) $(TARG_ENV_H) \
 	as.h asintl.h bignum.h bit_fix.h config.h emul.h expr.h flonum.h \
 	frags.h hash.h listing.h obj.h read.h symbols.h tc.h write.h
diff --git a/gas/as.h b/gas/as.h
index 539806a46a..ff434cbed0 100644
--- a/gas/as.h
+++ b/gas/as.h
@@ -1,6 +1,6 @@
 /* as.h - global header file
    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.
@@ -91,7 +91,7 @@ extern void *alloca ();
 #include <sys/types.h>
 #endif
 
-#include <getopt.h>
+#include "getopt.h"
 /* The first getopt value for machine-independent long options.
    150 isn't special; it's just an arbitrary non-ASCII char value.  */
 #define OPTION_STD_BASE 150
diff --git a/gas/config/tc-ia64.h b/gas/config/tc-ia64.h
index f320e7eb3c..2da3285243 100644
--- a/gas/config/tc-ia64.h
+++ b/gas/config/tc-ia64.h
@@ -19,8 +19,8 @@
    the Free Software Foundation, 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <opcode/ia64.h>
-#include <elf/ia64.h>
+#include "opcode/ia64.h"
+#include "elf/ia64.h"
 
 #define TC_IA64
 
diff --git a/gas/config/tc-v850.h b/gas/config/tc-v850.h
index 3de777c3fc..8257428eab 100644
--- a/gas/config/tc-v850.h
+++ b/gas/config/tc-v850.h
@@ -1,5 +1,6 @@
 /* tc-v850.h -- Header file for tc-v850.c.
-   Copyright 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 2000, 2001, 2002
+   Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -20,7 +21,7 @@
 
 #define TC_V850
 
-#include <elf/v850.h>
+#include "elf/v850.h"
 
 #define TARGET_BYTES_BIG_ENDIAN 0
 
diff --git a/gas/configure b/gas/configure
index a3b7e549c2..103c1f7d18 100755
--- a/gas/configure
+++ b/gas/configure
@@ -3110,7 +3110,7 @@ esac
 case "${need_bfd}" in
 yes)
   BFDLIB=../bfd/libbfd.la
-  ALL_OBJ_DEPS="$ALL_OBJ_DEPS ../bfd/bfd.h"
+  ALL_OBJ_DEPS="$ALL_OBJ_DEPS"' ../bfd/bfd.h $(INCDIR)/symcat.h'
   ;;
 esac
 
diff --git a/gas/configure.in b/gas/configure.in
index 72447cb3cd..8b03dec7de 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -860,7 +860,7 @@ esac
 case "${need_bfd}" in
 yes)
   BFDLIB=../bfd/libbfd.la
-  ALL_OBJ_DEPS="$ALL_OBJ_DEPS ../bfd/bfd.h"
+  ALL_OBJ_DEPS="$ALL_OBJ_DEPS"' ../bfd/bfd.h $(INCDIR)/symcat.h'
   ;;
 esac
 
diff --git a/gas/dep-in.sed b/gas/dep-in.sed
index 7137574fb8..4894cea84e 100644
--- a/gas/dep-in.sed
+++ b/gas/dep-in.sed
@@ -11,16 +11,16 @@ s!@SRCDIR@/config!$(srcdir)/config!g
 s!@SRCDIR@/\.\./opcodes!$(srcdir)/../opcodes!g
 s!@TOPDIR@/opcodes!$(srcdir)/../opcodes!g
 s!@SRCDIR@/!!g
-s! \$(INCDIR)/ansidecl\.h!!g
-s! \$(INCDIR)/fopen-same\.h!!g
 s! \$(srcdir)/config/te-generic\.h!!g
 s! \.\./bfd/bfd\.h!!g
 s! itbl-cpu\.h!!g
 s! itbl-parse\.h!!g
 
 s! \$(INCDIR)/bin-bugs\.h!!g
+s! \$(INCDIR)/ansidecl\.h!!g
 s! \$(INCDIR)/libiberty\.h!!g
 s! \$(INCDIR)/progress\.h!!g
+s! \$(INCDIR)/fopen-same\.h!!g
 s! obj-format\.h!!g
 s! targ-cpu\.h!!g
 s! targ-env\.h!!g
diff --git a/gas/flonum-konst.c b/gas/flonum-konst.c
index 04fa1f4cad..3e606fbfd7 100644
--- a/gas/flonum-konst.c
+++ b/gas/flonum-konst.c
@@ -1,5 +1,5 @@
 /* flonum_const.c - Useful Flonum constants
-   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2000
+   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2000, 2002
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -19,7 +19,7 @@
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-#include <ansidecl.h>
+#include "ansidecl.h"
 #include "flonum.h"
 /* JF:  I added the last entry to this table, and I'm not
    sure if its right or not.  Could go either way.  I wish
diff --git a/gas/flonum-mult.c b/gas/flonum-mult.c
index e2bcffa76b..e23579ace8 100644
--- a/gas/flonum-mult.c
+++ b/gas/flonum-mult.c
@@ -1,5 +1,5 @@
 /* flonum_mult.c - multiply two flonums
-   Copyright 1987, 1990, 1991, 1992, 1995, 2000
+   Copyright 1987, 1990, 1991, 1992, 1995, 2000, 2002
    Free Software Foundation, Inc.
 
    This file is part of Gas, the GNU Assembler.
@@ -19,7 +19,7 @@
    in a file named COPYING.  Among other things, the copyright
    notice and this notice must be preserved on all copies.  */
 
-#include <ansidecl.h>
+#include "ansidecl.h"
 #include "flonum.h"
 
 /*	plan for a . b => p(roduct)
diff --git a/gas/gasp.c b/gas/gasp.c
index 0ec7054661..d1e4185048 100644
--- a/gas/gasp.c
+++ b/gas/gasp.c
@@ -51,7 +51,7 @@ suitable for gas to consume.
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <getopt.h>
+#include "getopt.h"
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
diff --git a/gas/listing.c b/gas/listing.c
index 91b5253f9a..95f4129958 100644
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -1,6 +1,6 @@
 /* listing.c - mainting assembly listings
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001
+   2001, 2002
    Free Software Foundation, Inc.
 
 This file is part of GAS, the GNU Assembler.
@@ -92,7 +92,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 */
 
 #include "as.h"
-#include <obstack.h>
+#include "obstack.h"
 #include "safe-ctype.h"
 #include "input-file.h"
 #include "subsegs.h"