aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog9
-rw-r--r--gas/Makefile.am6
-rw-r--r--gas/Makefile.in28
-rw-r--r--gas/NEWS3
-rw-r--r--gas/doc/Makefile.am6
-rw-r--r--gas/doc/Makefile.in23
-rw-r--r--gas/doc/gasp.texi11
7 files changed, 52 insertions, 34 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index ebb588f..4393234 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-21 Nick Clifton <nickc@cambridge.redhat.com>
+
+ * NEWS: Note that GASP is now deprecated.
+ * Makefile.am: Do not build gasp-new by default.
+ * Makefile.in: Regenerate.
+ * doc/Makefile.am: Do not install gasp.info.
+ * doc/Makefile.in: Regenerate.
+ * gas/gasp.texi: Note that gasp is now deprecated.
+
2002-02-20 Nick Clifton <nickc@cambridge.redhat.com>
* NEWS: Mark 2.12 branch.
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 3daa8bd..0d3eb9d 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -437,7 +437,9 @@ po/POTFILES.in: @MAINT@ Makefile
for file in $(POTFILES); do echo $$file; done | sort > tmp \
&& mv tmp $(srcdir)/po/POTFILES.in
-noinst_PROGRAMS = as-new gasp-new
+# Note: GASP is now deprecated and will be removed at some point in the future.
+# Anything that GASP could do can now be done by GAS.
+noinst_PROGRAMS = as-new
noinst_SCRIPTS = $(GDBINIT)
EXTRA_SCRIPTS = .gdbinit
@@ -633,7 +635,7 @@ itbl-parse.c itbl-parse.h: $(srcdir)/itbl-parse.y
# stand-alone itbl assembler & disassembler
-EXTRA_PROGRAMS = itbl-test
+EXTRA_PROGRAMS = gasp-new itbl-test
itbl_test_SOURCES = itbl-parse.y itbl-lex.l
itbl_test_LDADD = itbl-tops.o itbl-test.o $(GASLIBS) @LEXLIB@
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 98c2a31..e567115 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -560,7 +560,9 @@ POTFILES = $(MULTI_CFILES) $(TARGET_ENV_HFILES) $(OBJ_FORMAT_HFILES) \
$(HFILES) $(CFILES) $(GAS_CFILES)
-noinst_PROGRAMS = as-new gasp-new
+# Note: GASP is now deprecated and will be removed at some point in the future.
+# Anything that GASP could do can now be done by GAS.
+noinst_PROGRAMS = as-new
noinst_SCRIPTS = $(GDBINIT)
EXTRA_SCRIPTS = .gdbinit
@@ -628,7 +630,7 @@ EXTRA_as_new_SOURCES = config/m68k-parse.y
# stand-alone itbl assembler & disassembler
-EXTRA_PROGRAMS = itbl-test
+EXTRA_PROGRAMS = gasp-new itbl-test
itbl_test_SOURCES = itbl-parse.y itbl-lex.l
itbl_test_LDADD = itbl-tops.o itbl-test.o $(GASLIBS) @LEXLIB@
@@ -2254,7 +2256,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = ${GDBINIT}
-noinst_PROGRAMS = as-new$(EXEEXT) gasp-new$(EXEEXT)
+noinst_PROGRAMS = as-new$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
@@ -2262,6 +2264,9 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
+gasp_new_OBJECTS = gasp.$(OBJEXT) macro.$(OBJEXT) sb.$(OBJEXT) \
+hash.$(OBJEXT)
+gasp_new_LDFLAGS =
itbl_test_OBJECTS = itbl-parse.$(OBJEXT) itbl-lex.$(OBJEXT)
itbl_test_DEPENDENCIES = itbl-tops.o itbl-test.o \
../libiberty/libiberty.a
@@ -2276,9 +2281,6 @@ macro.$(OBJEXT) messages.$(OBJEXT) output-file.$(OBJEXT) read.$(OBJEXT) \
sb.$(OBJEXT) stabs.$(OBJEXT) subsegs.$(OBJEXT) symbols.$(OBJEXT) \
write.$(OBJEXT)
as_new_LDFLAGS =
-gasp_new_OBJECTS = gasp.$(OBJEXT) macro.$(OBJEXT) sb.$(OBJEXT) \
-hash.$(OBJEXT)
-gasp_new_LDFLAGS =
SCRIPTS = $(noinst_SCRIPTS)
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -2296,10 +2298,10 @@ configure configure.in gdbinit.in itbl-lex.c itbl-parse.c
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = tar
+TAR = gtar
GZIP_ENV = --best
-SOURCES = $(itbl_test_SOURCES) $(as_new_SOURCES) $(EXTRA_as_new_SOURCES) $(gasp_new_SOURCES)
-OBJECTS = $(itbl_test_OBJECTS) $(as_new_OBJECTS) $(gasp_new_OBJECTS)
+SOURCES = $(gasp_new_SOURCES) $(itbl_test_SOURCES) $(as_new_SOURCES) $(EXTRA_as_new_SOURCES)
+OBJECTS = $(gasp_new_OBJECTS) $(itbl_test_OBJECTS) $(as_new_OBJECTS)
all: all-redirect
.SUFFIXES:
@@ -2402,6 +2404,10 @@ distclean-libtool:
maintainer-clean-libtool:
+gasp-new$(EXEEXT): $(gasp_new_OBJECTS) $(gasp_new_DEPENDENCIES)
+ @rm -f gasp-new$(EXEEXT)
+ $(LINK) $(gasp_new_LDFLAGS) $(gasp_new_OBJECTS) $(gasp_new_LDADD) $(LIBS)
+
itbl-test$(EXEEXT): $(itbl_test_OBJECTS) $(itbl_test_DEPENDENCIES)
@rm -f itbl-test$(EXEEXT)
$(LINK) $(itbl_test_LDFLAGS) $(itbl_test_OBJECTS) $(itbl_test_LDADD) $(LIBS)
@@ -2409,10 +2415,6 @@ itbl-test$(EXEEXT): $(itbl_test_OBJECTS) $(itbl_test_DEPENDENCIES)
as-new$(EXEEXT): $(as_new_OBJECTS) $(as_new_DEPENDENCIES)
@rm -f as-new$(EXEEXT)
$(LINK) $(as_new_LDFLAGS) $(as_new_OBJECTS) $(as_new_LDADD) $(LIBS)
-
-gasp-new$(EXEEXT): $(gasp_new_OBJECTS) $(gasp_new_DEPENDENCIES)
- @rm -f gasp-new$(EXEEXT)
- $(LINK) $(gasp_new_LDFLAGS) $(gasp_new_OBJECTS) $(gasp_new_LDADD) $(LIBS)
.l.c:
$(LEX) $(AM_LFLAGS) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@
.y.c:
diff --git a/gas/NEWS b/gas/NEWS
index e3dac60..ca8451a 100644
--- a/gas/NEWS
+++ b/gas/NEWS
@@ -1,4 +1,7 @@
-*- text -*-
+GASP has now been deprecated and will be removed in a future release. Use the
+macro facilities in GAS instead.
+
GASP now correctly parses floating point numbers. Unless the base is explicitly
specified, they are interpreted as decimal numbers regardless of the currently
specified base.
diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index a526dde..cfb8f89 100644
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -15,7 +15,9 @@ POD2MAN = pod2man --center="GNU Development Tools" \
man_MANS = as.1
-info_TEXINFOS = as.texinfo gasp.texi
+# The gasp.texi file is now deprecated, as GASP has been deprecated.
+# It will disappear in a future release.
+info_TEXINFOS = as.texinfo
asconfig.texi: $(CONFIG).texi
rm -f asconfig.texi
@@ -68,7 +70,7 @@ install: install-info
# This one isn't ready for prime time yet. Not even a little bit.
-noinst_TEXINFOS = internals.texi
+noinst_TEXINFOS = internals.texi gasp.texi
DISTCLEANFILES = asconfig.texi
diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index d87c923..25daeaf 100644
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -132,7 +132,9 @@ POD2MAN = pod2man --center="GNU Development Tools" \
man_MANS = as.1
-info_TEXINFOS = as.texinfo gasp.texi
+# The gasp.texi file is now deprecated, as GASP has been deprecated.
+# It will disappear in a future release.
+info_TEXINFOS = as.texinfo
CPU_DOCS = \
c-a29k.texi \
@@ -169,7 +171,7 @@ CPU_DOCS = \
# This one isn't ready for prime time yet. Not even a little bit.
-noinst_TEXINFOS = internals.texi
+noinst_TEXINFOS = internals.texi gasp.texi
DISTCLEANFILES = asconfig.texi
@@ -179,9 +181,9 @@ CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then echo $(top_srcdir)/../texinfo/util/texi2dvi; else echo texi2dvi; fi`
TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
-INFO_DEPS = as.info gasp.info
-DVIS = as.dvi gasp.dvi
-TEXINFOS = as.texinfo gasp.texi
+INFO_DEPS = as.info
+DVIS = as.dvi
+TEXINFOS = as.texinfo
man1dir = $(mandir)/man1
MANS = $(man_MANS)
@@ -191,7 +193,7 @@ DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = tar
+TAR = gtar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
@@ -208,10 +210,6 @@ as.info: as.texinfo
as.dvi: as.texinfo
-gasp.info: gasp.texi
-gasp.dvi: gasp.texi
-
-
DVIPS = dvips
.texi.info:
@@ -304,10 +302,7 @@ dist-info: $(INFO_DEPS)
mostlyclean-aminfo:
-rm -f as.aux as.cp as.cps as.dvi as.fn as.fns as.ky as.kys as.ps \
as.log as.pg as.toc as.tp as.tps as.vr as.vrs as.op as.tr \
- as.cv as.cn gasp.aux gasp.cp gasp.cps gasp.dvi gasp.fn \
- gasp.fns gasp.ky gasp.kys gasp.ps gasp.log gasp.pg gasp.toc \
- gasp.tp gasp.tps gasp.vr gasp.vrs gasp.op gasp.tr gasp.cv \
- gasp.cn
+ as.cv as.cn
clean-aminfo:
diff --git a/gas/doc/gasp.texi b/gas/doc/gasp.texi
index 9358059..76ca475 100644
--- a/gas/doc/gasp.texi
+++ b/gas/doc/gasp.texi
@@ -3,7 +3,7 @@
@c
@c This file documents the assembly preprocessor "GASP"
@c
-@c Copyright 1994, 1995, 2000 Free Software Foundation, Inc.
+@c Copyright 1994, 1995, 2000, 2002 Free Software Foundation, Inc.
@c
@c Permission is granted to copy, distribute and/or modify this document
@c under the terms of the GNU Free Documentation License, Version 1.1
@@ -41,7 +41,7 @@ END-INFO-DIR-ENTRY
@end tex
@vskip 0pt plus 1filll
-Copyright @copyright{} 1994, 1995, 2000 Free Software Foundation, Inc.
+Copyright @copyright{} 1994, 1995, 2000, 2002 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1
@@ -53,7 +53,7 @@ Copyright @copyright{} 1994, 1995, 2000 Free Software Foundation, Inc.
@end titlepage
@ifinfo
-Copyright @copyright{} 1994, 1995, 2000 Free Software Foundation, Inc.
+Copyright @copyright{} 1994, 1995, 2000, 2002 Free Software Foundation, Inc.
@ignore
Permission is granted to process this file through TeX and print the
@@ -108,6 +108,11 @@ flexibility: you can use it with hand-coded assembly, without paying a
penalty of added complexity in the assembler you use for compiler
output.
+@emph{Note} The use of @sc{gas} has now been deprecated. Anything
+that it could do can now be done by the macro facilities built into
+@sc{gas} itself. At some point in the future the @{gasp} sources will
+be removed entirely from the binutils distribution.
+
Here is a small example to give the flavor of @sc{gasp}. This input to
@sc{gasp}