This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: 'make check' failures building red hat 8.0 binutils?
- From: Nick Clifton <nickc at redhat dot com>
- To: Ben Elliston <bje at redhat dot com>
- Cc: binutils at sources dot redhat dot com
- Date: 02 Dec 2002 16:44:06 +0000
- Subject: Re: 'make check' failures building red hat 8.0 binutils?
- References: <m3el99it7h.fsf@north-pole.nickc.cambridge.redhat.com><m3bs4b31rl.fsf@scooby.brisbane.redhat.com>
Hi Ben,
> >> Though I think it would be good idea to just cvs remove the whole
> >> gas/testsuite/gasp subdirectory, there is no need to test gasp when
> >> it is no longer included.
>
> Nick> I agree. Does anyone have any objections to my removing these
> Nick> tests ? They will still be present in the Attic, in case we
> Nick> ever need to recover them.
>
> That would be fine, except that I still see gasp.c in the source tree.
> It is still included -- wasn't this to change at some point?
Indeed it was, and since it has been 10 months since it was first
deprecated, and we have had the 2.13 release in between, it seems
reasonable for it to go.
So I am going to check in the following patch to remove gasp, and its
tests, from the binutils project. I have rebuilt lots of different
binutils configurations, including an x86 linux native, and run the gas
testsuite, and no problems have been introduced by this change.
Cheers
Nick
gas/ChangeLog
2002-12-02 Nick Clifton <nickc@redhat.com>
* gasp.c: Delete. It has been deprecated.
* NEWS: Mention that gasp has been removed.
* Makefile.am: Remove references to gasp.
* makefile.vms: Likewise.
* mpw-make.sed: Likewise.
* Makeile.in: Regenerate.
* doc/gasp.texi: Delete.
* doc/Makefile.am: Remove references to gasp.texi.
* doc/Makefile.in: Regenerate.
* macro.c: Delete references to gasp.
Remove use of comment_char function parameter as it is no longer
needed.
* macro.h: Update prototypes to remove comment_char parameter.
Fix formatting.
* read.c (read_a_source_file, s_irp): Remove comment_char
parameter from invocation of functions in macro.c
gas/testsuite/ChangeLog
2002-12-02 Nick Clifton <nickc@redhat.com>
* gasp: Remove entire directory tree. (Gasp has been removed from
binutils).
* config/default.asp (GASP): Remove definition and initialization.
Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/Makefile.am,v
retrieving revision 1.68
diff -c -3 -p -w -r1.68 Makefile.am
*** Makefile.am 11 Nov 2002 14:58:49 -0000 1.68
--- Makefile.am 2 Dec 2002 14:39:16 -0000
*************** GAS_CFILES = \
*** 196,202 ****
symbols.c \
write.c
! CFILES = $(GAS_CFILES) gasp.c itbl-ops.c
HFILES = \
as.h \
--- 196,202 ----
symbols.c \
write.c
! CFILES = $(GAS_CFILES) itbl-ops.c
HFILES = \
as.h \
*************** po/POTFILES.in: @MAINT@ Makefile
*** 447,454 ****
for file in $(POTFILES); do echo $$file; done | sort > tmp \
&& mv tmp $(srcdir)/po/POTFILES.in
! # 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
--- 447,454 ----
for file in $(POTFILES); do echo $$file; done | sort > tmp \
&& mv tmp $(srcdir)/po/POTFILES.in
! # Note: GASP is now deprecated and has been removed. It is still
! # available in the CVS archive or older binutils releases if it is needed.
noinst_PROGRAMS = as-new
noinst_SCRIPTS = $(GDBINIT)
EXTRA_SCRIPTS = .gdbinit
*************** $(OBJS): $(INCDIR)/bin-bugs.h $(INCDIR)/
*** 512,521 ****
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
- gasp_new_SOURCES = gasp.c macro.c sb.c hash.c
- gasp_new_LDADD = ../libiberty/libiberty.a $(INTLLIBS)
- gasp_new_DEPENDENCIES = ../libiberty/libiberty.a $(INTLDEPS)
-
EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \
echo $${rootme}/../expect/expect ; \
else echo expect ; fi`
--- 512,517 ----
*************** itbl-parse.c itbl-parse.h: $(srcdir)/itb
*** 648,654 ****
# stand-alone itbl assembler & disassembler
! 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@
--- 644,650 ----
# stand-alone itbl assembler & disassembler
! EXTRA_PROGRAMS = itbl-test
itbl_test_SOURCES = itbl-parse.y itbl-lex.l
itbl_test_LDADD = itbl-tops.o itbl-test.o $(GASLIBS) @LEXLIB@
*************** symbols.o: symbols.c $(INCDIR)/symcat.h
*** 2369,2376 ****
$(INCDIR)/obstack.h subsegs.h struc-symbol.h
write.o: write.c $(INCDIR)/symcat.h subsegs.h $(INCDIR)/obstack.h \
output-file.h dwarf2dbg.h
- gasp.o: gasp.c $(INCDIR)/getopt.h $(INCDIR)/safe-ctype.h \
- sb.h macro.h $(INCDIR)/xregex.h $(INCDIR)/xregex2.h
itbl-ops.o: itbl-ops.c itbl-ops.h $(INCDIR)/symcat.h
e-crisaout.o: $(srcdir)/config/e-crisaout.c $(INCDIR)/symcat.h \
emul-target.h
--- 2365,2370 ----
Index: NEWS
===================================================================
RCS file: /cvs/src/src/gas/NEWS,v
retrieving revision 1.36
diff -c -3 -p -w -r1.36 NEWS
*** NEWS 11 Sep 2002 14:42:44 -0000 1.36
--- NEWS 2 Dec 2002 14:39:16 -0000
***************
*** 1,5 ****
--- 1,7 ----
-*- text -*-
+ * GASP has now been removed.
+
* Support for Texas Instruments TMS320C4x and TMS320C3x series of
DSP's contributed by Michael Hayes and Svein E. Seldal.
Index: macro.c
===================================================================
RCS file: /cvs/src/src/gas/macro.c,v
retrieving revision 1.18
diff -c -3 -p -w -r1.18 macro.c
*** macro.c 11 Nov 2002 08:42:52 -0000 1.18
--- macro.c 2 Dec 2002 14:39:17 -0000
***************
*** 1,4 ****
! /* macro.c - macro support for gas and gasp
Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
Free Software Foundation, Inc.
--- 1,4 ----
! /* macro.c - macro support for gas
Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
Free Software Foundation, Inc.
*************** extern void *alloca ();
*** 63,69 ****
#include "asintl.h"
/* The routines in this file handle macro definition and expansion.
! They are called by both gasp and gas. */
/* Internal functions. */
--- 63,69 ----
#include "asintl.h"
/* The routines in this file handle macro definition and expansion.
! They are called by gas. */
/* Internal functions. */
*************** static int get_apost_token PARAMS ((int,
*** 75,82 ****
static int sub_actual
PARAMS ((int, sb *, sb *, struct hash_control *, int, sb *, int));
static const char *macro_expand_body
! PARAMS ((sb *, sb *, formal_entry *, struct hash_control *, int, int));
! static const char *macro_expand PARAMS ((int, sb *, macro_entry *, sb *, int));
#define ISWHITE(x) ((x) == ' ' || (x) == '\t')
--- 75,82 ----
static int sub_actual
PARAMS ((int, sb *, sb *, struct hash_control *, int, sb *, int));
static const char *macro_expand_body
! PARAMS ((sb *, sb *, formal_entry *, struct hash_control *, int));
! static const char *macro_expand PARAMS ((int, sb *, macro_entry *, sb *));
#define ISWHITE(x) ((x) == ' ' || (x) == '\t')
*************** static struct hash_control *macro_hash;
*** 99,105 ****
int macro_defined;
! /* Whether we are in GASP alternate mode. */
static int macro_alternate;
--- 99,105 ----
int macro_defined;
! /* Whether we are in alternate syntax mode. */
static int macro_alternate;
*************** sub_actual (start, in, t, formal_hash, k
*** 653,664 ****
/* Expand the body of a macro. */
static const char *
! macro_expand_body (in, out, formals, formal_hash, comment_char, locals)
sb *in;
sb *out;
formal_entry *formals;
struct hash_control *formal_hash;
- int comment_char;
int locals;
{
sb t;
--- 653,663 ----
/* Expand the body of a macro. */
static const char *
! macro_expand_body (in, out, formals, formal_hash, locals)
sb *in;
sb *out;
formal_entry *formals;
struct hash_control *formal_hash;
int locals;
{
sb t;
*************** macro_expand_body (in, out, formals, for
*** 689,702 ****
else if (in->ptr[src] == '\\')
{
src++;
! if (in->ptr[src] == comment_char && comment_char != '\0')
! {
! /* This is a comment, just drop the rest of the line. */
! while (src < in->len
! && in->ptr[src] != '\n')
! src++;
! }
! else if (in->ptr[src] == '(')
{
/* Sub in till the next ')' literally. */
src++;
--- 688,694 ----
else if (in->ptr[src] == '\\')
{
src++;
! if (in->ptr[src] == '(')
{
/* Sub in till the next ')' literally. */
src++;
*************** macro_expand_body (in, out, formals, for
*** 779,785 ****
formal_entry *f;
src = sb_skip_white (src + 5, in);
! while (in->ptr[src] != '\n' && in->ptr[src] != comment_char)
{
static int loccnt;
char buf[20];
--- 771,777 ----
formal_entry *f;
src = sb_skip_white (src + 5, in);
! while (in->ptr[src] != '\n')
{
static int loccnt;
char buf[20];
*************** macro_expand_body (in, out, formals, for
*** 806,822 ****
}
}
}
- else if (comment_char != '\0'
- && in->ptr[src] == comment_char
- && src + 1 < in->len
- && in->ptr[src + 1] == comment_char
- && !inquote)
- {
- /* Two comment chars in a row cause the rest of the line to
- be dropped. */
- while (src < in->len && in->ptr[src] != '\n')
- src++;
- }
else if (in->ptr[src] == '"'
|| (macro_mri && in->ptr[src] == '\''))
{
--- 798,803 ----
*************** macro_expand_body (in, out, formals, for
*** 899,910 ****
body. */
static const char *
! macro_expand (idx, in, m, out, comment_char)
int idx;
sb *in;
macro_entry *m;
sb *out;
- int comment_char;
{
sb t;
formal_entry *ptr;
--- 880,890 ----
body. */
static const char *
! macro_expand (idx, in, m, out)
int idx;
sb *in;
macro_entry *m;
sb *out;
{
sb t;
formal_entry *ptr;
*************** macro_expand (idx, in, m, out, comment_c
*** 954,960 ****
/* Peel off the actuals and store them away in the hash tables' actuals. */
idx = sb_skip_white (idx, in);
! while (idx < in->len && in->ptr[idx] != comment_char)
{
int scan;
--- 934,940 ----
/* Peel off the actuals and store them away in the hash tables' actuals. */
idx = sb_skip_white (idx, in);
! while (idx < in->len)
{
int scan;
*************** macro_expand (idx, in, m, out, comment_c
*** 1056,1063 ****
sb_add_string (&ptr->actual, buffer);
}
! err = macro_expand_body (&m->sub, out, m->formals, m->formal_hash,
! comment_char, 1);
if (err != NULL)
return err;
--- 1036,1042 ----
sb_add_string (&ptr->actual, buffer);
}
! err = macro_expand_body (&m->sub, out, m->formals, m->formal_hash, 1);
if (err != NULL)
return err;
*************** macro_expand (idx, in, m, out, comment_c
*** 1090,1103 ****
}
/* Check for a macro. If one is found, put the expansion into
! *EXPAND. COMMENT_CHAR is the comment character--this is used by
! gasp. Return 1 if a macro is found, 0 otherwise. */
int
! check_macro (line, expand, comment_char, error, info)
const char *line;
sb *expand;
- int comment_char;
const char **error;
macro_entry **info;
{
--- 1069,1080 ----
}
/* Check for a macro. If one is found, put the expansion into
! *EXPAND. Return 1 if a macro is found, 0 otherwise. */
int
! check_macro (line, expand, error, info)
const char *line;
sb *expand;
const char **error;
macro_entry **info;
{
*************** check_macro (line, expand, comment_char,
*** 1135,1141 ****
sb_add_char (&line_sb, *s++);
sb_new (expand);
! *error = macro_expand (0, &line_sb, macro, expand, comment_char);
sb_kill (&line_sb);
--- 1112,1118 ----
sb_add_char (&line_sb, *s++);
sb_new (expand);
! *error = macro_expand (0, &line_sb, macro, expand);
sb_kill (&line_sb);
*************** delete_macro (name)
*** 1160,1172 ****
success, or an error message otherwise. */
const char *
! expand_irp (irpc, idx, in, out, get_line, comment_char)
int irpc;
int idx;
sb *in;
sb *out;
int (*get_line) PARAMS ((sb *));
- int comment_char;
{
const char *mn;
sb sub;
--- 1137,1148 ----
success, or an error message otherwise. */
const char *
! expand_irp (irpc, idx, in, out, get_line)
int irpc;
int idx;
sb *in;
sb *out;
int (*get_line) PARAMS ((sb *));
{
const char *mn;
sb sub;
*************** expand_irp (irpc, idx, in, out, get_line
*** 1204,1213 ****
sb_reset (out);
idx = sb_skip_comma (idx, in);
! if (idx >= in->len || in->ptr[idx] == comment_char)
{
/* Expand once with a null string. */
! err = macro_expand_body (&sub, out, &f, h, comment_char, 0);
if (err != NULL)
return err;
}
--- 1180,1189 ----
sb_reset (out);
idx = sb_skip_comma (idx, in);
! if (idx >= in->len)
{
/* Expand once with a null string. */
! err = macro_expand_body (&sub, out, &f, h, 0);
if (err != NULL)
return err;
}
*************** expand_irp (irpc, idx, in, out, get_line
*** 1215,1221 ****
{
if (irpc && in->ptr[idx] == '"')
++idx;
! while (idx < in->len && in->ptr[idx] != comment_char)
{
if (!irpc)
idx = get_any_string (idx, in, &f.actual, 1, 0);
--- 1191,1197 ----
{
if (irpc && in->ptr[idx] == '"')
++idx;
! while (idx < in->len)
{
if (!irpc)
idx = get_any_string (idx, in, &f.actual, 1, 0);
*************** expand_irp (irpc, idx, in, out, get_line
*** 1226,1232 ****
int nxt;
nxt = sb_skip_white (idx + 1, in);
! if (nxt >= in->len || in->ptr[nxt] == comment_char)
{
idx = nxt;
break;
--- 1202,1208 ----
int nxt;
nxt = sb_skip_white (idx + 1, in);
! if (nxt >= in->len)
{
idx = nxt;
break;
*************** expand_irp (irpc, idx, in, out, get_line
*** 1236,1242 ****
sb_add_char (&f.actual, in->ptr[idx]);
++idx;
}
! err = macro_expand_body (&sub, out, &f, h, comment_char, 0);
if (err != NULL)
return err;
if (!irpc)
--- 1212,1218 ----
sb_add_char (&f.actual, in->ptr[idx]);
++idx;
}
! err = macro_expand_body (&sub, out, &f, h, 0);
if (err != NULL)
return err;
if (!irpc)
Index: macro.h
===================================================================
RCS file: /cvs/src/src/gas/macro.h,v
retrieving revision 1.6
diff -c -3 -p -w -r1.6 macro.h
*** macro.h 18 May 2002 12:53:30 -0000 1.6
--- macro.h 2 Dec 2002 14:39:17 -0000
***************
*** 1,5 ****
! /* macro.h - header file for macro support for gas and gasp
! Copyright 1994, 1995, 1996, 1997, 1998, 2000
Free Software Foundation, Inc.
Written by Steve and Judy Chamberlain of Cygnus Support,
--- 1,5 ----
! /* macro.h - header file for macro support for gas
! Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2002
Free Software Foundation, Inc.
Written by Steve and Judy Chamberlain of Cygnus Support,
***************
*** 37,50 ****
name and its default value. Each time the macro is expanded, the
formals get the actual values attatched to them. */
! /* describe the formal arguments to a macro */
typedef struct formal_struct {
! struct formal_struct *next; /* next formal in list */
! sb name; /* name of the formal */
! sb def; /* the default value */
! sb actual; /* the actual argument (changed on each expansion) */
! int index; /* the index of the formal 0..formal_count-1 */
} formal_entry;
/* Other values found in the index field of a formal_entry. */
--- 37,50 ----
name and its default value. Each time the macro is expanded, the
formals get the actual values attatched to them. */
! /* Describe the formal arguments to a macro. */
typedef struct formal_struct {
! struct formal_struct *next; /* Next formal in list. */
! sb name; /* Name of the formal. */
! sb def; /* The default value. */
! sb actual; /* The actual argument (changed on each expansion). */
! int index; /* The index of the formal 0..formal_count - 1. */
} formal_entry;
/* Other values found in the index field of a formal_entry. */
*************** typedef struct formal_struct {
*** 52,64 ****
#define NARG_INDEX (-2)
#define LOCAL_INDEX (-3)
! /* describe the macro. */
! typedef struct macro_struct {
! sb sub; /* substitution text. */
! int formal_count; /* number of formal args. */
! formal_entry *formals; /* pointer to list of formal_structs */
! struct hash_control *formal_hash; /* hash table of formals. */
} macro_entry;
/* Whether any macros have been defined. */
--- 52,65 ----
#define NARG_INDEX (-2)
#define LOCAL_INDEX (-3)
! /* Describe the macro. */
! typedef struct macro_struct
! {
! sb sub; /* Substitution text. */
! int formal_count; /* Number of formal args. */
! formal_entry *formals; /* Pointer to list of formal_structs. */
! struct hash_control *formal_hash; /* Hash table of formals. */
} macro_entry;
/* Whether any macros have been defined. */
*************** extern int macro_nest;
*** 72,87 ****
extern int buffer_and_nest
PARAMS ((const char *, const char *, sb *, int (*) PARAMS ((sb *))));
extern void macro_init
! PARAMS ((int alternate, int mri, int strip_at,
! int (*) PARAMS ((const char *, int, sb *, int *))));
! extern void macro_mri_mode PARAMS ((int));
extern const char *define_macro
! PARAMS ((int idx, sb *in, sb *label, int (*get_line) PARAMS ((sb *)),
! const char **namep));
! extern int check_macro PARAMS ((const char *, sb *, int, const char **,
! macro_entry **));
! extern void delete_macro PARAMS ((const char *));
extern const char *expand_irp
! PARAMS ((int, int, sb *, sb *, int (*) PARAMS ((sb *)), int));
#endif
--- 73,88 ----
extern int buffer_and_nest
PARAMS ((const char *, const char *, sb *, int (*) PARAMS ((sb *))));
extern void macro_init
! PARAMS ((int, int, int, int (*) PARAMS ((const char *, int, sb *, int *))));
! extern void macro_mri_mode
! PARAMS ((int));
extern const char *define_macro
! PARAMS ((int, sb *, sb *, int (*) PARAMS ((sb *)), const char **));
! extern int check_macro
! PARAMS ((const char *, sb *, const char **, macro_entry **));
! extern void delete_macro
! PARAMS ((const char *));
extern const char *expand_irp
! PARAMS ((int, int, sb *, sb *, int (*) PARAMS ((sb *))));
#endif
Index: makefile.vms
===================================================================
RCS file: /cvs/src/src/gas/makefile.vms,v
retrieving revision 1.1.1.1
diff -c -3 -p -w -r1.1.1.1 makefile.vms
*** makefile.vms 3 May 1999 07:28:41 -0000 1.1.1.1
--- makefile.vms 2 Dec 2002 14:39:17 -0000
*************** OBJS=targ-cpu.obj,obj-format.obj,atof-ta
*** 45,52 ****
literal.obj,messages.obj,output-file.obj,read.obj,subsegs.obj,symbols.obj,\
write.obj,listing.obj,ecoff.obj,stabs.obj,sb.obj,macro.obj,ehopt.obj
- GASPOBJS = gasp.obj,macro.obj,sb.obj,hash.obj
-
LIBIBERTY = [-.libiberty]libiberty.olb
ifeq ($(ARCH),ALPHA)
--- 45,50 ----
*************** LIBOPCODES =
*** 59,65 ****
BFDDEP =
endif
! all: config.status $(BFDDEP) as.exe gasp.exe
as.exe: $(OBJS) $(LIBOPCODES) $(LIBBFD) $(LIBIBERTY)
ifeq ($(ARCH),ALPHA)
--- 57,63 ----
BFDDEP =
endif
! all: config.status $(BFDDEP) as.exe
as.exe: $(OBJS) $(LIBOPCODES) $(LIBBFD) $(LIBIBERTY)
ifeq ($(ARCH),ALPHA)
*************** else
*** 68,80 ****
link$(LFLAGS)/exe=$@ $(OBJS),$(LIBIBERTY)/lib$(LIBS)
endif
- gasp.exe: $(GASPOBJS) $(LIBBFD) $(LIBIBERTY)
- ifeq ($(ARCH),ALPHA)
- link$(LFLAGS)/exe=$@ $(GASPOBJS),$(LIBBFD)/lib,$(LIBIBERTY)/lib$(LIBS)
- else
- link$(LFLAGS)/exe=$@ $(GASPOBJS),$(LIBIBERTY)/lib$(LIBS)
- endif
-
config.status:
$$ @config-gas
--- 66,71 ----
*************** targ-cpu.obj: targ-cpu.c targ-cpu.h [.co
*** 108,114 ****
gmake -f makefile.vms "CC=$(CC)"
$(CD) [-.gas]
! install: as.exe gasp.exe
$(CP) $^ GNU_ROOT\:[BIN]
clean:
--- 99,105 ----
gmake -f makefile.vms "CC=$(CC)"
$(CD) [-.gas]
! install: as.exe
$(CP) $^ GNU_ROOT\:[BIN]
clean:
Index: mpw-make.sed
===================================================================
RCS file: /cvs/src/src/gas/mpw-make.sed,v
retrieving revision 1.1.1.1
diff -c -3 -p -w -r1.1.1.1 mpw-make.sed
*** mpw-make.sed 3 May 1999 07:28:41 -0000 1.1.1.1
--- mpw-make.sed 2 Dec 2002 14:39:17 -0000
*************** LOCAL_LOADLIBES = \
*** 58,75 ****
# Whack out the config.h dependency, it only causes excess rebuilds.
/{OBJS}/s/{OBJS} \\Option-f "{o}"config.h/{OBJS} \\Option-f/
- /gasp.c/s/gasp\.c "{o}"config.h/gasp.c/
# ALL_CFLAGS includes TDEFINES, which is not desirable at link time.
/CC_LD/s/ALL_CFLAGS/CFLAGS/g
# The resource file is called mac-as.r.
/as.new.r/s/as\.new\.r/mac-as.r/
- /gasp.new.r/s/gasp\.new\.r/mac-as.r/
# ...and the PROG_NAME doesn't have a .new in it.
/PROG_NAME/s/PROG_NAME='"'as.new'"'/PROG_NAME='"'as'"'/
- /PROG_NAME/s/PROG_NAME='"'gasp.new'"'/PROG_NAME='"'gasp'"'/
# Whack out recursive makes, they won't work.
/^[ ][ ]*srcroot=/,/^[ ][ ]*(cd /d
--- 58,72 ----
*************** install \\Option-f all install-only\
*** 90,96 ****
install-only \\Option-f\
NewFolderRecursive "{bindir}"\
Duplicate -y :as.new "{bindir}"as\
- Duplicate -y :gasp.new "{bindir}"gasp\
# Whack out config-rebuilding targets, they won't work.
--- 87,92 ----
Index: read.c
===================================================================
RCS file: /cvs/src/src/gas/read.c,v
retrieving revision 1.56
diff -c -3 -p -w -r1.56 read.c
*** read.c 2 Dec 2002 07:18:53 -0000 1.56
--- read.c 2 Dec 2002 14:39:18 -0000
*************** read_a_source_file (name)
*** 862,868 ****
const char *err;
macro_entry *macro;
! if (check_macro (s, &out, '\0', &err, ¯o))
{
if (err != NULL)
as_bad ("%s", err);
--- 862,868 ----
const char *err;
macro_entry *macro;
! if (check_macro (s, &out, &err, ¯o))
{
if (err != NULL)
as_bad ("%s", err);
*************** s_irp (irpc)
*** 1855,1861 ****
sb_new (&out);
! err = expand_irp (irpc, 0, &s, &out, get_line_sb, '\0');
if (err != NULL)
as_bad_where (file, line, "%s", err);
--- 1855,1861 ----
sb_new (&out);
! err = expand_irp (irpc, 0, &s, &out, get_line_sb);
if (err != NULL)
as_bad_where (file, line, "%s", err);
*************** get_line_sb (line)
*** 2296,2303 ****
return 1;
}
! /* Define a macro. This is an interface to macro.c, which is shared
! between gas and gasp. */
void
s_macro (ignore)
--- 2296,2302 ----
return 1;
}
! /* Define a macro. This is an interface to macro.c. */
void
s_macro (ignore)
Index: doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.am,v
retrieving revision 1.21
diff -c -3 -p -w -r1.21 Makefile.am
*** doc/Makefile.am 19 Jul 2002 07:52:39 -0000 1.21
--- doc/Makefile.am 2 Dec 2002 14:39:18 -0000
*************** POD2MAN = pod2man --center="GNU Developm
*** 15,22 ****
man_MANS = as.1
- # 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
--- 15,20 ----
*************** install: install-info
*** 71,77 ****
# This one isn't ready for prime time yet. Not even a little bit.
! noinst_TEXINFOS = internals.texi gasp.texi
DISTCLEANFILES = asconfig.texi
--- 69,75 ----
# This one isn't ready for prime time yet. Not even a little bit.
! noinst_TEXINFOS = internals.texi
DISTCLEANFILES = asconfig.texi
Index: testsuite/config/default.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/config/default.exp,v
retrieving revision 1.2
diff -c -3 -p -w -r1.2 default.exp
*** testsuite/config/default.exp 5 Apr 2001 15:31:46 -0000 1.2
--- testsuite/config/default.exp 2 Dec 2002 14:39:18 -0000
*************** if ![info exists AS] then {
*** 5,15 ****
set AS [findfile $base_dir/../as-new "../as-new" [transform as]]
}
- global GASP
- if ![info exists GASP] then {
- set GASP [findfile $base_dir/../gasp-new "../gasp-new" [transform gasp]]
- }
-
global ASFLAGS
if ![info exists ASFLAGS] then {
set ASFLAGS ""
--- 5,10 ----