-diff -urNbB binutils-2.16.91.0.2.org/gas/Makefile.am binutils-2.16.91.0.2/gas/Makefile.am
---- binutils-2.16.91.0.2.org/gas/Makefile.am 2005-07-20 19:27:27.000000000 +0000
-+++ binutils-2.16.91.0.2/gas/Makefile.am 2005-07-21 18:35:02.000000000 +0000
-@@ -204,7 +204,7 @@
+--- binutils-2.17.50.0.13/gas/Makefile.am.orig 2007-03-16 16:48:29.000000000 +0100
++++ binutils-2.17.50.0.13/gas/Makefile.am 2007-03-16 20:26:20.200480821 +0100
+@@ -199,7 +199,7 @@
symbols.c \
write.c
--CFILES = $(GAS_CFILES) itbl-ops.c
-+CFILES = $(GAS_CFILES) gasp.c itbl-ops.c
+-CFILES = $(GAS_CFILES) itbl-ops.c cgen.c
++CFILES = $(GAS_CFILES) gasp.c itbl-ops.c cgen.c
HFILES = \
as.h \
-@@ -466,7 +466,8 @@
+@@ -455,7 +455,8 @@
# 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_SCRIPTS = $(GDBINIT)
EXTRA_SCRIPTS = .gdbinit
-@@ -530,6 +531,10 @@
+@@ -517,6 +518,10 @@
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
EXPECT = expect
RUNTEST = runtest
RUNTESTFLAGS=
-@@ -2508,6 +2513,8 @@
- $(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
+@@ -2146,6 +2151,8 @@
+ subsegs.h struc-symbol.h
+ write.o: write.c subsegs.h $(INCDIR)/obstack.h output-file.h \
+ dwarf2dbg.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.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
-diff -urNbB binutils-2.16.91.0.2.org/gas/doc/Makefile.am binutils-2.16.91.0.2/gas/doc/Makefile.am
---- binutils-2.16.91.0.2.org/gas/doc/Makefile.am 2005-07-20 19:27:27.000000000 +0000
-+++ binutils-2.16.91.0.2/gas/doc/Makefile.am 2005-07-21 18:31:04.000000000 +0000
++ sb.h macro.h $(INCDIR)/xregex.h $(INCDIR)/xregex2.h
+ itbl-ops.o: itbl-ops.c itbl-ops.h
+ e-crisaout.o: $(srcdir)/config/e-crisaout.c emul-target.h
+ e-criself.o: $(srcdir)/config/e-criself.c emul-target.h
+--- binutils-2.17.50.0.13/gas/doc/Makefile.am.orig 2007-03-16 16:48:29.000000000 +0100
++++ binutils-2.17.50.0.13/gas/doc/Makefile.am 2007-03-16 20:27:05.810679469 +0100
@@ -15,7 +15,7 @@
man_MANS = as.1
-info_TEXINFOS = as.texinfo
+info_TEXINFOS = as.texinfo gasp.texinfo
+ as_TEXINFOS = asconfig.texi $(CPU_DOCS)
- asconfig.texi: $(CONFIG).texi
- rm -f asconfig.texi
-diff -urNbB binutils-2.16.91.0.2.org/gas/doc/gasp.texinfo binutils-2.16.91.0.2/gas/doc/gasp.texinfo
+ AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
--- binutils-2.16.91.0.2.org/gas/doc/gasp.texinfo 1970-01-01 00:00:00.000000000 +0000
+++ binutils-2.16.91.0.2/gas/doc/gasp.texinfo 2005-07-21 18:31:04.000000000 +0000
@@ -0,0 +1,1456 @@
+
+@contents
+@bye
-diff -urNbB binutils-2.16.91.0.2.org/gas/gasp.c binutils-2.16.91.0.2/gas/gasp.c
---- binutils-2.16.91.0.2.org/gas/gasp.c 1970-01-01 00:00:00.000000000 +0000
-+++ binutils-2.16.91.0.2/gas/gasp.c 2005-07-21 18:31:04.000000000 +0000
-@@ -0,0 +1,3983 @@
+--- binutils-2.17.50.0.2/gas/gasp.c.orig 1970-01-01 01:00:00.000000000 +0100
++++ binutils-2.17.50.0.2/gas/gasp.c 2006-06-07 11:22:13.774440000 +0200
+@@ -0,0 +1,3999 @@
+/* gasp.c - Gnu assembler preprocessor main program.
+ Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ Free Software Foundation, Inc.
+*/
+
+#include "config.h"
-+#include "bin-bugs.h"
++#include "bfdver.h"
+
+#include <assert.h>
+#include <stdio.h>
+ as_bad_internal (file, line, buffer);
+}
+
++/* Indicate assertion failure.
++ Arguments: Filename, line number, optional function name. */
++
++void
++as_assert (const char *file, int line, const char *fn)
++{
++ fprintf (stderr, _("Internal error!\n"));
++ if (fn)
++ fprintf (stderr, _("Assertion failure in %s at %s line %d.\n"),
++ fn, file, line);
++ else
++ fprintf (stderr, _("Assertion failure at %s line %d.\n"), file, line);
++ fprintf (stderr, _("Please report this bug.\n"));
++ xexit (EXIT_FAILURE);
++}
++
+#ifndef LEX_AT
+/* The m88k unfortunately uses @ as a label beginner. */
+#define LEX_AT 0
+
+/* just a stub to satisfy unused function in sb.o */
+int do_scrub_chars (int (*get) (char*, int), char *tostart, int tolen) {}
-diff -urNbB binutils-2.16.91.0.2.org/gas/macro.c binutils-2.16.91.0.2/gas/macro.c
--- binutils-2.16.91.0.2.org/gas/macro.c 2005-05-10 22:46:44.000000000 +0000
+++ binutils-2.16.91.0.2/gas/macro.c 2005-07-21 18:31:04.000000000 +0000
-@@ -77,8 +77,8 @@
+@@ -41,8 +41,8 @@
static int get_apost_token (int, sb *, sb *, int);
static int sub_actual (int, sb *, sb *, struct hash_control *, int, sb *, int);
static const char *macro_expand_body
static void free_macro(macro_entry *);
#define ISWHITE(x) ((x) == ' ' || (x) == '\t')
-@@ -762,7 +762,7 @@
+@@ -754,7 +754,7 @@
static const char *
macro_expand_body (sb *in, sb *out, formal_entry *formals,
{
sb t;
int src = 0, inquote = 0, macro_line = 0;
-@@ -794,7 +794,14 @@
+@@ -786,7 +786,14 @@
else if (in->ptr[src] == '\\')
{
src++;
{
/* Sub in till the next ')' literally. */
src++;
-@@ -875,7 +882,7 @@
+@@ -867,7 +874,7 @@
else
{
src = sb_skip_white (src + 5, in);
{
const char *name;
formal_entry *f = new_formal ();
-@@ -911,6 +918,17 @@
+@@ -903,6 +910,17 @@
}
}
}
else if (in->ptr[src] == '"'
|| (macro_mri && in->ptr[src] == '\''))
{
-@@ -992,7 +1010,7 @@
+@@ -984,7 +1002,7 @@
body. */
static const char *
{
sb t;
formal_entry *ptr;
-@@ -1038,7 +1056,7 @@
+@@ -1029,7 +1047,7 @@
/* Peel off the actuals and store them away in the hash tables' actuals. */
idx = sb_skip_white (idx, in);
{
int scan;
-@@ -1167,7 +1185,7 @@
+@@ -1156,7 +1174,7 @@
sb_add_string (&ptr->actual, buffer);
}
}
/* Discard any unnamed formal arguments. */
-@@ -1200,7 +1218,7 @@
+@@ -1189,7 +1207,7 @@
*EXPAND. Return 1 if a macro is found, 0 otherwise. */
int
const char **error, macro_entry **info)
{
const char *s;
-@@ -1235,7 +1253,7 @@
+@@ -1224,7 +1242,7 @@
sb_add_char (&line_sb, *s++);
sb_new (expand);
sb_kill (&line_sb);
-@@ -1296,7 +1314,7 @@
+@@ -1285,7 +1303,7 @@
success, or an error message otherwise. */
const char *
{
sb sub;
formal_entry f;
-@@ -1329,16 +1347,16 @@
+@@ -1318,10 +1336,10 @@
sb_reset (out);
idx = sb_skip_comma (idx, in);
}
else
{
- if (irpc && in->ptr[idx] == '"')
- ++idx;
+@@ -1333,7 +1351,7 @@
+ ++idx;
+ }
+
- while (idx < in->len)
+ while (idx < in->len && in->ptr[idx] != comment_char)
{
if (!irpc)
idx = get_any_string (idx, in, &f.actual);
-@@ -1349,7 +1367,7 @@
- int nxt;
-
+@@ -1347,7 +1365,7 @@
+ in_quotes = ! in_quotes;
+
nxt = sb_skip_white (idx + 1, in);
- if (nxt >= in->len)
+ if (nxt >= in->len || in->ptr[nxt] == comment_char)
{
idx = nxt;
break;
-@@ -1359,7 +1377,7 @@
- sb_add_char (&f.actual, in->ptr[idx]);
+@@ -1358,7 +1376,7 @@
++idx;
}
+
- err = macro_expand_body (&sub, out, &f, h, 0);
+ err = macro_expand_body (&sub, out, &f, h, 0, comment_char);
if (err != NULL)
break;
if (!irpc)
-diff -urNbB binutils-2.16.91.0.2.org/gas/macro.h binutils-2.16.91.0.2/gas/macro.h
--- binutils-2.16.91.0.2.org/gas/macro.h 2005-05-10 22:46:44.000000000 +0000
+++ binutils-2.16.91.0.2/gas/macro.h 2005-07-21 18:31:04.000000000 +0000
@@ -90,8 +90,8 @@
+extern const char *expand_irp (int, int, sb *, sb *, int (*) (sb *), int);
#endif
-diff -urNbB binutils-2.16.91.0.2.org/gas/read.c binutils-2.16.91.0.2/gas/read.c
--- binutils-2.16.91.0.2.org/gas/read.c 2005-06-22 20:53:34.000000000 +0000
+++ binutils-2.16.91.0.2/gas/read.c 2005-07-21 18:31:04.000000000 +0000
@@ -555,7 +555,7 @@
sb_new (&out);
-- err = expand_irp (irpc, 0, &s, &out, get_line_sb);
-+ err = expand_irp (irpc, 0, &s, &out, get_line_sb, '\0');
+- err = expand_irp (irpc, 0, &s, &out, get_non_macro_line_sb);
++ err = expand_irp (irpc, 0, &s, &out, get_non_macro_line_sb, '\0');
if (err != NULL)
as_bad_where (file, line, "%s", err);
projects / packages / binutils.git / blobdiff