--- gas/Makefile	2018/04/24 16:39:13	1.1.1.4
+++ gas/Makefile	2018/04/24 16:39:44	1.1.1.5
@@ -18,13 +18,14 @@
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 # This makefile may be used to make the VAX, 68020, 80386, 
-# SPARC, or ns32k assembler(s).
+# SPARC, ns32k, or i860 assembler(s).
 
 BINDIR = /usr/local/bin
+#CC=gcc
 
 # If you are on a BSD system, un-comment the next two lines, and comment out
 # the lines for SystemV and HPUX below
-G0 = -g -I.
+G0 = -g  -I. #-O -Wall
 LDFLAGS = $(CFLAGS)
 #
 # To compile gas on a System Five machine, comment out the two lines above
@@ -37,6 +38,11 @@ LDFLAGS = $(CFLAGS)
 # To compile gas for HPUX, link m-hpux.h to m68k.h , and un-comment the
 # next two lines.  (If you are using GCC, comment out the alloca.o part)
 # (Get alloca from the emacs distribution, or use GCC.)
+# HPUX 7.0 may have a bug in setvbuf.  gas gives an error message like
+# 1:"Unknown operator" -- Statement 'NO_APP' ignored
+# if setvbuf is broken.  Re-compile input-file.c (and only input-file.c
+# with -DVMS and the problem should go away.
+#
 # G0 = -g -I. -DUSG
 # LOADLIBES = alloca.o
 #
@@ -61,6 +67,9 @@ LDFLAGS = $(CFLAGS)
 # m-sun3.h , m-hpux.h or m-generic.h
 # depending on which machine you want to compile the 68020 assembler for.
 #
+# If you want the 68k assembler to be completely compatable with the the
+# SUN one, un-comment the -DSUN_ASM_SYNTAX line below.
+#
 # If you machine does not have vfprintf, but does have _doprnt(),
 # remove the # from the -DNO_VARARGS line below.
 #
@@ -70,6 +79,13 @@ LDFLAGS = $(CFLAGS)
 # To include the mc68851 mmu coprocessor instructions in the 68020 assembler,
 # remove the # from the -Dm68851 line below.
 #
+# If you want the 68020 assembler use a register prefix character, un-comment
+# the REGISTER_PREFIX line, and (maybe) change the '%' to the appropriate
+# character.
+#
+# If you want the assembler to treat .L* or ..* symbols as local, instead of
+# the usual L* symbols, un-comment the DOT_LABEL_PREFIX line.
+#
 # If you want the 80386 assembler to correctly handle fsub/fsubr and fdiv/fdivr
 # opcodes (unlike most 80386 assemblers), remove the # from
 # the -DNON_BROKEN_WORDS line below.
@@ -79,18 +95,38 @@ LDFLAGS = $(CFLAGS)
 #
 # To compile gas for the HP 9000/300 un-comment the -DUSE_HP_HDR line below.
 #
+# For the ns32k, the options are 32532 or 32032 CPU and 32381 or 32081 FPU.
+# To select the NS32532, remove the # from the -DNS32532 line below.
+# To compile in tne NS32381 opcodes in addition to the NS32081 opcodes
+# (the 32381 is a superset of the 32081), remove the # from the -DNS32381
+# line below.
+#
+# For the ns32k on a Sequent, uncomment the SEQUENT_COMPATABILITY line below.
+#
+# If you want the .align N directive to align to the next N byte boundry,
+# instead of the next 1<<N boundry, un-comment the OTHER_ALIGN line below.
+# (This option is automatically enabled when building the sparc assembler.
+#
 
 O1 =  -DNO_VARARGS
 O2 = # -DNON_BROKEN_WORDS
 O3 = # -Dm68851
 O4 = # -DEXEC_VERSION=1
 O5 = # -DSIGTY=void
-G4 = # -DUSE_SYSTEM_HDR
-G5 = # -DUSE_HP_HDR
+O6 = # -DNS32532
+O6 = # -DNS32381
+O7 = # -DDOT_LABEL_PREFIX
+O8 = # -DSEQUENT_COMPATABILITY
+O9 = # -DREGISTER_PREFIX=\'%\'
+O10= # -DOTHER_ALIGN
+
+G1 = # -DUSE_SYSTEM_HDR
+G2 = # -DUSE_HP_HDR
+G3 = # -DSUN_ASM_SYNTAX
 
-OPTIONS = $(O1) $(O2) $(O3) $(O4) $(O5)
+OPTIONS = $(O1) $(O2) $(O3) $(O4) $(O5) $(O6) $(O7) $(O8) $(O9) $(O10)
 
-CFLAGS = $(G0) $(G4) $(G5)
+CFLAGS = $(G0) $(G1) $(G2) $(G3) $(G4)
 
 #
 # To make the 68020 assembler compile as the default, un-comment the next
@@ -112,6 +148,10 @@ DEFAULT_GAS=a68
 # To make the sparc assembler compile as the default, un-comment the next
 # line and commment out all the other lines that start with DEFAULT_GAS
 #DEFAULT_GAS=asparc
+#
+# To make the i860 assembler compile as the default, un-comment the next
+# line and comment out all the other lines that start with DEFAULT_GAS
+#DEFAULT_GAS=a860
 
 # Global Sources -------------------------------------------------------------
 
@@ -121,19 +161,41 @@ atof-generic.o	append.o	messages.o	expr.
 frags.o		input-file.o	input-scrub.o	output-file.o	              \
 subsegs.o	symbols.o					version.o     \
 flonum-const.o	flonum-copy.o	flonum-mult.o	strstr.o	bignum-copy.o \
-gdb.o		gdb-file.o	gdb-symbols.o	gdb-blocks.o	obstack.o     \
-gdb-lines.o
+obstack.o
+#gdb.o		gdb-file.o	gdb-symbols.o	gdb-blocks.o	gdb-lines.o
 
 a:	$(DEFAULT_GAS)
 	@rm -f a
 	@ln $(DEFAULT_GAS) a
 
+# I860 GAS ------------------------------------------------------------------
+u = i860.o  atof-ieee.o  write-i860.o  read-i860.o
+
+U = i860.c  i860.h i860-opcode.h
+
+i860.o:	i860.c i860.h i860-opcode.h as.h frags.h struc-symbol.h
+i860.o:	flonum.h expr.h hash.h md.h write.h read.h symbols.h
+	$(CC) -c $(CFLAGS) -DI860 i860.c
+
+atof-ieee.o:	flonum.h
+
+write-i860.o:	write.c i860.h
+	$(CC) -c -DI860 $(CFLAGS) write.c
+	mv write.o write-i860.o
+
+read-i860.o: read.c i860.h
+	$(CC) -c -DI860 $(CFLAGS) read.c
+	mv read.o read-i860.o
+
+a860: $a $u
+	$(CC) -o a860 $(LDFLAGS) $a $u $(LOADLIBES)
+
 # SPARC GAS ------------------------------------------------------------------
-v = sparc.o  atof-m68k.o  write-sparc.o  read-sparc.o
+v = sparc.o  atof-ieee.o  write-sparc.o  read-sparc.o
 
 V = sparc.c  sparc.h  sparc-opcode.h
 
-atof-m68k.o:	flonum.h
+atof-ieee.o:	flonum.h
 sparc.o:	sparc.c sparc.h sparc-opcode.h as.h frags.h struc-symbol.h
 sparc.o:	flonum.h expr.h hash.h md.h write.h read.h symbols.h
 	$(CC) -c $(CFLAGS) -DSPARC sparc.c
@@ -150,13 +212,14 @@ asparc: $a $v
 	$(CC) -o asparc $(LDFLAGS) $a $v $(LOADLIBES)
 
 # NS32K GAS ------------------------------------------------------------------
-w = ns32k.o  atof-ns32k.o  write-ns32k.o  read-ns32k.o
+w = ns32k.o  atof-ieee.o  write-ns32k.o  read-ns32k.o
 
-W = ns32k.c atof-ns32k.c ns32k-opcode.h
+W = ns32k.c ns32k-opcode.h
 
-atof-ns32k.o:	flonum.h
+atof-ieee.o:	flonum.h
 ns32k.o:	as.h frags.h struc-symbol.h flonum.h expr.h md.h hash.h
-ns32k.o:	write.h symbols.h ns32k-opcode.h
+ns32k.o:	write.h symbols.h ns32k-opcode.h ns32k.c
+	$(CC) $(CFLAGS) $(OPTIONS) -c ns32k.c
 
 write-ns32k.o:	write.c
 	$(CC) -c -DNS32K $(CFLAGS) write.c
@@ -170,26 +233,27 @@ a32k: $a $w
 	$(CC) -o a32k $(LDFLAGS) $a $w $(LOADLIBES)
 
 # 80386 GAS ------------------------------------------------------------------
-x = i386.o  atof-i386.o  write.o  read.o
+x = i386.o  atof-ieee.o  write.o  read.o
 
-X = i386.c  atof-i386.c  i386.h  i386-opcode.h
+X = i386.c  i386.h  i386-opcode.h
 
 i386.o:		i386.c as.h read.h flonum.h frags.h struc-symbol.h expr.h
 i386.o:		symbols.h hash.h md.h i386.h i386-opcode.h
 	$(CC) $(CFLAGS) $(OPTIONS) -c i386.c
 
-atof-i386.o:	flonum.h
+atof-ieee.o:	flonum.h
 
 a386: $a $x
 	$(CC) -o a386 $(LDFLAGS) $a $x $(LOADLIBES)
 
 # 68020 GAS ------------------------------------------------------------------
-y = m68k.o  atof-m68k.o  write.o  read.o
+y = m68k.o  atof-ieee.o write.o read.o
+
+Y = m68k.c atof-ieee.c m68k-opcode.h m-hpux.h m-sun3.h m-generic.h
 
-Y = m68k.c atof-m68k.c m68k-opcode.h m-hpux.h m-sun3.h m-generic.h
+atof-ieee.o:	flonum.h
 
-atof-m68k.o:	flonum.h
-m68k.o:		m68k.c a.out.h as.h expr.h flonum.h frags.h hash.h
+m68k.o:		m68k.c a.out.gnu.h as.h expr.h flonum.h frags.h hash.h
 m68k.o:		m68k-opcode.h m68k.h md.h obstack.h struc-symbol.h
 	$(CC) $(CFLAGS) $(OPTIONS) -c m68k.c
 
@@ -199,9 +263,10 @@ a68: $a $y
 # VAX GAS --------------------------------------------------------------------
 z = vax.o  atof-vax.o  write.o  read.o
 
-Z = vax.c atof-vax.c vax-opcode.h vax-inst.h    make-gas.com objrecdef.h vms.c
+Z = vax.c atof-vax.c vax-opcode.h vax-inst.h \
+    make-gas.com objrecdef.h vms.c vms-dbg.c README-vms-dbg
 
-vax.o:		vax.c a.out.h as.h expr.h flonum.h frags.h md.h obstack.h
+vax.o:		vax.c a.out.gnu.h as.h expr.h flonum.h frags.h md.h obstack.h
 vax.o:		read.h struc-symbol.h symbols.h vax-inst.h vax-opcode.h
 atof-vax.o:	as.h flonum.h read.h
 
@@ -231,22 +296,24 @@ atof-generic.c	append.c	messages.c	expr.
 frags.c		input-file.c	input-scrub.c	output-file.c	read.c \
 subsegs.c	symbols.c	write.c				strstr.c \
 flonum-const.c	flonum-copy.c	flonum-mult.c	app.c		version.c \
-gdb.c		gdb-file.c	gdb-symbols.c	gdb-blocks.c	obstack.c \
-gdb-lines.c
+obstack.c \
+#gdb.c		gdb-file.c	gdb-symbols.c	gdb-blocks.c \
+#gdb-lines.c
 
 H = \
-a.out.h		as.h		bignum.h	expr.h		flonum.h \
+a.out.gnu.h	as.h		bignum.h	expr.h		flonum.h \
 frags.h		hash.h		input-file.h	md.h	 \
 obstack.h	read.h		struc-symbol.h	subsegs.h	\
 symbols.h	write.h
 
-dist: COPYING README ChangeLog $A $H $Z $Y $X $W $V Makefile
-	echo gas-`sed -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q < version.c` > .fname
+dist: COPYING README ChangeLog $A $H $Z $Y $X $W $V $U Makefile
+	echo gas-`sed -n -e '/ version /s/[^0-9.]*\([0-9.]*\).*/\1/p' < version.c` > .fname
 	mkdir `cat .fname`
 
-	ln COPYING README ChangeLog $A $H $Z $Y $X $W $V Makefile `cat .fname`
+	ln COPYING README ChangeLog $A $H $Z $Y $X $W $V $U Makefile `cat .fname`
 	tar cvhZf `cat .fname`.tar.Z `cat .fname`
 	-rm -r `cat .fname`
+	-rm .fname
 
 clean:
 	rm -f a avax a68 a386 a32k asparc $a $v $w $x $y $z a core gmon.out bugs a.out
@@ -258,31 +325,31 @@ install:	a
 # General .o-->.h dependencies
 
 app.o:		as.h
-as.o:		a.out.h as.h read.h struc-symbol.h write.h
+as.o:		a.out.gnu.h as.h read.h struc-symbol.h write.h
 atof-generic.o:	flonum.h
 bignum-copy.o:	bignum.h
-expr.o:		a.out.h as.h expr.h flonum.h obstack.h read.h struc-symbol.h
+expr.o:		a.out.gnu.h as.h expr.h flonum.h obstack.h read.h struc-symbol.h
 expr.o:		 symbols.h
 flonum-const.o:	flonum.h
 flonum-copy.o:	flonum.h
 flonum-mult.o:	flonum.h
 flonum-normal.o:flonum.h
 flonum-print.o:	flonum.h
-frags.o:	a.out.h as.h frags.h obstack.h struc-symbol.h subsegs.h
-gdb.o:		as.h
-gdb-blocks.o:	as.h
-gdb-lines.o:	as.h frags.h obstack.h
-gdb-symbols.o:	a.out.h as.h struc-symbol.h
+frags.o:	a.out.gnu.h as.h frags.h obstack.h struc-symbol.h subsegs.h
+#gdb.o:		as.h
+#gdb-blocks.o:	as.h
+#gdb-lines.o:	as.h frags.h obstack.h
+#gdb-symbols.o:	a.out.gnu.h as.h struc-symbol.h
 hash.o:		hash.h
 input-file.o:	input-file.h
 input-scrub.o:	as.h input-file.h read.h
 messages.o:	as.h
 obstack.o:	obstack.h
-read.o:		a.out.h as.h expr.h flonum.h frags.h hash.h md.h obstack.h
+read.o:		a.out.gnu.h as.h expr.h flonum.h frags.h hash.h md.h obstack.h
 read.o:		read.h struc-symbol.h symbols.h
-subsegs.o:	a.out.h as.h frags.h obstack.h struc-symbol.h subsegs.h write.h
-symbols.o:	a.out.h as.h frags.h hash.h obstack.h struc-symbol.h symbols.h
-write.o:	a.out.h as.h md.h obstack.h struc-symbol.h subsegs.h
+subsegs.o:	a.out.gnu.h as.h frags.h obstack.h struc-symbol.h subsegs.h write.h
+symbols.o:	a.out.gnu.h as.h frags.h hash.h obstack.h struc-symbol.h symbols.h
+write.o:	a.out.gnu.h as.h md.h obstack.h struc-symbol.h subsegs.h
 write.o:	symbols.h write.h
 
 flonum.h:					bignum.h