Add support for macros.

	* as.c: Include sb.h and macro.h.
	(max_macro_next): New global variable.
	(main): Call macro_init.
	(macro_expr): New static function.
	* as.h (max_macro_nest): Declare.
	* read.c (line_label): Rename from mri_line_label.  Change all
	uses.
	(potable): Add exitm, irp, irpc, macro, mexit, rept.
	(read_a_source_file): Always clear line_label at the start of a
	line, not just when flag_mri or LABELS_WITHOUT_COLONS.  Fixup
	MRI/LABELS_WITHOUT_COLONS handling.  In MRI mode, permit label:
	equ val.  Set line_label when calling colon.  In MRI mode, a
	leading '.' does not imply a pseudo-op.  Check for macro expansion
	before calling md_assemble.
	(s_irp): New function.
	(get_line_sb): New static function.
	(s_macro): New function.
	(s_mexit): New function.
	(s_rept): New function.
	* read.h (line_label): Rename from mri_line_label.
	(s_irp, s_rept): Declare.
	(s_macro, s_mexit): Declare.
	* input-scrub.c: Include sb.h.
	(sb_index, from_sb): New static variables.
	(macro_nest): New static variable.
	(struct input_save): Add sb_index and from_sb fields.  Change
	next_saved_file field to be struct input_save *.
	(next_saved_file): Changed to be struct input_save *.
	(input_scrub_push): Change to return type struct input_save *.
	Save sb_index and from_sb.
	(input_scrub_pop): Change parameter type to struct input_save *.
	Restore sb_index and from_sb.
	(input_scrub_include_sb): New function.
	(input_scrub_next_buffer): Handle reading from from_sb.
	(bump_line_counters): Only increment lines if not using from_sb.
	* config/tc-m68k.c (opt_table): Add nest.
	(opt_nest): New static function.
	* gasp.c: Include sb.h and macro.h.  Move all sb related functions
	and definitions to sb.h and sb.c.  Move all macro related
	functions and definitions to macro.h and macro.c.
	* sb.h, sb.c: New files, extracted from gasp.c.
	* macro.h, macro.c: Likewise.
	* Makefile.in (OBJS): Add sb.o and macro.o
	(GASPOBJS): Define.
	(gasp.new): Depend upon $(GASPOBJS).  Use $(GASPOBJS) to link.
	(TARG_CPU_DEP_m68k): Depend upon subsegs.h.
	(gasp.o): Depend upon sb.h and macro.h.
	(sb.o): New target.
	(macro.o): New target.
	(as.o): Depend upon sb.h and macro.h.
	(input-scrub.o): Depend upon sb.h.
	(read.o): Depend upon sb.h and macro.h.

1 files changed, 15 insertions, 3 deletions

diff --git a/gas/NEWS b/gas/NEWS
index c35108e..ee4d9a1 100644
--- a/gas/NEWS
+++ b/gas/NEWS
@@ -1,5 +1,15 @@
 -*- text -*-
 
+Changes since 2.5:
+
+Gas now directly supports macros, without requiring GASP.
+
+Gas now has an MRI assembler compatibility mode.
+
+Added -mips4 support to MIPS assembler.
+
+Added PIC support to Solaris and SPARC SunOS 4 assembler.
+
 Changes since 2.3:
 
 Converted this directory to use an autoconf-generated configure script.
@@ -18,17 +28,19 @@ used, it should become obvious pretty quickly what the problem is.
 
 Usage message is available with "--help".
 
+The GNU Assembler Preprocessor (gasp) is included.  (Actually, it was in 2.3
+also, but didn't get into the NEWS file.)
+
 Weak symbol support for a.out.
 
 A bug in the listing code which could cause an infinite loop has been fixed.
 Bugs in listings when generating a COFF object file have also been fixed.
 
 Initial i386-svr4 PIC implementation from Eric Youngdale, based on code by Paul
-Kranenburg.  This code was oriented towards gas version 1.xx; in updating some
-aspects of it for version 2, I broke it.
+Kranenburg.
 
 Improved Alpha support.  Immediate constants can have a much larger range now.
-Support for the 21164 has been added.
+Support for the 21164 has been contributed by Digital.
 
 Updated ns32k (pc532-mach, netbsd532) support from Ian Dall.