update copyrights

4 files changed, 40 insertions, 25 deletions

diff --git a/gas/Makefile.in b/gas/Makefile.in
index e53fd4a..e2815de 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -1,5 +1,6 @@
 # Makefile for GNU Assembler
-#   Copyright (C) 1987-1992, 1993 Free Software Foundation, Inc.
+#   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 1996
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU GAS.
 
@@ -59,7 +60,7 @@ SHELL = /bin/sh
 INSTALL = $${srcroot}/install.sh -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
-INSTALL_XFORM = $(INSTALL) -t='-e $(program_transform_name)'
+INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
 INSTALL_XFORM1= $(INSTALL_XFORM) -b=.1
 
 DISTSTUFF= make-gas.com m68k-parse.c
@@ -73,6 +74,8 @@ TEXI2DVI = texi2dvi
 RANLIB = ranlib
 CC = @CC@
 CFLAGS = -g
+LDFLAGS =
+HLDFLAGS = @HLDFLAGS@
 
 MAKEOVERRIDES=
 
@@ -98,8 +101,8 @@ FLAGS_TO_PASS = \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)"
 
-RUNTEST = `if [ -f ${srcdir}/../dejagnu/runtest ] ; then \
-		echo ${srcdir}/../dejagnu/runtest ; else echo runtest; \
+RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
+		echo $${srcdir}/../dejagnu/runtest ; else echo runtest; \
 	   fi`
 RUNTESTFLAGS=
 
@@ -228,6 +231,7 @@ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(CROSS) $(CFLAGS) $(HDEFINES) $(TDEFINES)
 # How to link with both our special library facilities
 # and the system's installed libraries.
 
+LIBDEPS = @OPCODES_DEP@ @BFDDEP@ $(LOCAL_LOADLIBES) ../libiberty/libiberty.a
 LIBS = @OPCODES_LIB@ @BFDLIB@ $(LOCAL_LOADLIBES) ../libiberty/libiberty.a
 
 # Specify the directories to be searched for header files.
@@ -249,8 +253,8 @@ STAGESTUFF = *.o as.new gasp.new
 
 $(OBJS): @ALL_OBJ_DEPS@
 
-as.new: $(OBJS) $(LIBS)
-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o as.new $(OBJS) $(LIBS) $(LOADLIBES)
+as.new: $(OBJS) $(LIBDEPS)
+	$(CC) $(HLDFLAGS) $(ALL_CFLAGS) $(LDFLAGS) -o as.new $(OBJS) $(LIBS) $(LOADLIBES)
 
 $(OBJS): config.h as.h targ-env.h obj-format.h targ-cpu.h flonum.h expr.h \
 	struc-symbol.h write.h frags.h hash.h read.h symbols.h tc.h obj.h \
@@ -298,6 +302,8 @@ check:  site.exp
 	cp site.exp testsuite/site.exp
 	rootme=`pwd`; export rootme; \
 	srcdir=`cd ${srcdir}; pwd` ; export srcdir ; \
+	LD_LIBRARY_PATH=$$rootme/../bfd:$$rootme/../opcodes:$$LD_LIBRARY_PATH; \
+	export LD_LIBRARY_PATH; \
 	cd testsuite; \
 	EXPECT=${EXPECT} ; export EXPECT ; \
 	if [ -f $${rootme}/../expect/expect ] ; then  \
@@ -426,16 +432,21 @@ clean mostlyclean: clean-here
 	@cd doc ; $(MAKE) $(FLAGS_TO_PASS) $@
 
 # Like clean but also delete the links made to configure gas.
+
+DISTCLEAN_HERE = config.status Makefile targ-env.h targ-cpu.h \
+	targ-cpu.c obj-format.h obj-format.c atof-targ.c TAGS \
+	config-stamp config.h conf config.log config.cache .gdbinit \
+	testsuite/Makefile testsuite/config.status
+
 distclean: clean-here
 	@cd doc ; $(MAKE) $(FLAGS_TO_PASS) $@
-	-rm -f config.status Makefile targ-env.h targ-cpu.h \
-		targ-cpu.c obj-format.h obj-format.c atof-targ.c TAGS \
-		config-stamp config.h conf config.log config.cache .gdbinit \
-		testsuite/Makefile testsuite/config.status
-maintainer-clean realclean: clean distclean clean-info
+	-rm -f $(DISTCLEAN_HERE)
+
+maintainer-clean realclean: clean-here
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -rf $(DISTSTUFF)
+	@cd doc ; $(MAKE) $(FLAGS_TO_PASS) $@
+	-rm -rf $(DISTCLEAN_HERE) $(DISTSTUFF)
 
 # Entry points `install', `includes' and `uninstall'.
 
diff --git a/gas/as.h b/gas/as.h
index 76d75d6..dc1ff28 100644
--- a/gas/as.h
+++ b/gas/as.h
@@ -1,5 +1,6 @@
 /* as.h - global header file
-   Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 1996
+   Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -144,9 +145,11 @@ extern char *strdup (/* const char * */);
 #include <progress.h>
 
 /* This doesn't get taken care of anywhere.  */
+#ifndef __MWERKS__  /* Metrowerks C chokes on the "defined (inline)" */
 #if !defined (__GNUC__) && !defined (inline)
 #define inline
 #endif
+#endif /* !__MWERKS__ */
 
 /* Other stuff from config.h.  */
 #ifdef NEED_DECLARATION_MALLOC
@@ -202,10 +205,6 @@ extern PTR bfd_alloc_by_size_t PARAMS ((bfd *abfd, size_t sz));
 #endif
 #endif /* ! __STDC__ */
 
-#if !defined (__GNUC__) && !defined (inline)
-#define inline
-#endif
-
 #ifndef FOPEN_WB
 #ifdef GO32
 #include "fopen-bin.h"
@@ -488,9 +487,12 @@ COMMON unsigned char flag_warn_displacement; /* -K */
 /* True if local symbols should be retained.  */
 COMMON int flag_keep_locals; /* -L */
 
-/* True if we are assembling using MRI syntax.  */
+/* True if we are assembling in MRI mode.  */
 COMMON int flag_mri;
 
+/* True if we are assembling in m68k MRI mode.  */
+COMMON int flag_m68k_mri;
+
 /* Should the data section be made read-only and appended to the text
    section?  */
 COMMON unsigned char flag_readonly_data_in_text; /* -R */
@@ -522,6 +524,10 @@ extern int listing;
 /* Maximum level of macro nesting.  */
 extern int max_macro_nest;
 
+/* Obstack chunk size.  Keep large for efficient space use, make small to
+   increase malloc calls for monitoring memory allocation.  */
+extern int chunksize;
+
 struct _pseudo_type
   {
     /* assembler mnemonic, lower case, no '.' */
@@ -589,13 +595,11 @@ char *input_scrub_new_file PARAMS ((char *filename));
 char *input_scrub_next_buffer PARAMS ((char **bufp));
 PTR xmalloc PARAMS ((unsigned long size));
 PTR xrealloc PARAMS ((PTR ptr, unsigned long n));
-int do_scrub_next_char PARAMS ((int (*get) (void), void (*unget) (int)));
+int do_scrub_chars PARAMS ((int (*get) (char **), char *to, int tolen));
 int gen_to_words PARAMS ((LITTLENUM_TYPE * words, int precision,
 			  long exponent_bits));
 int had_err PARAMS ((void));
 int ignore_input PARAMS ((void));
-int scrub_from_file PARAMS ((void));
-int scrub_from_string PARAMS ((void));
 int seen_at_least_1_file PARAMS ((void));
 void app_pop PARAMS ((char *arg));
 void as_howmuch PARAMS ((FILE * stream));
@@ -607,8 +611,6 @@ void input_scrub_begin PARAMS ((void));
 void input_scrub_close PARAMS ((void));
 void input_scrub_end PARAMS ((void));
 void new_logical_line PARAMS ((char *fname, int line_number));
-void scrub_to_file PARAMS ((int ch));
-void scrub_to_string PARAMS ((int ch));
 void subsegs_begin PARAMS ((void));
 void subseg_change PARAMS ((segT seg, int subseg));
 segT subseg_new PARAMS ((const char *name, subsegT subseg));
diff --git a/gas/config/obj-bout.c b/gas/config/obj-bout.c
index 0136c17..0406f34 100644
--- a/gas/config/obj-bout.c
+++ b/gas/config/obj-bout.c
@@ -1,5 +1,6 @@
 /* b.out object file format
-   Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1989, 90, 91, 92, 93, 94, 95, 1996
+   Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
diff --git a/gas/config/obj-bout.h b/gas/config/obj-bout.h
index 947a140..dddb19f 100644
--- a/gas/config/obj-bout.h
+++ b/gas/config/obj-bout.h
@@ -1,5 +1,6 @@
 /* b.out object file format
-   Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1989, 90, 91, 92, 93, 94, 95, 1996
+   Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.