- updated gettext BR

[packages/crossppc-binutils.git] / binutils-gasp.patch

diff --git a/binutils-gasp.patch b/binutils-gasp.patch
index 164fa00566d3ce7e0c5b459a4449d27189226d37..8ce5130ab9f7ad12f64297606ae81049f43fc296 100644 (file)
--- a/binutils-gasp.patch
+++ b/binutils-gasp.patch
@@ -30,15 +30,16 @@
  EXPECT = expect
  RUNTEST = runtest
  RUNTESTFLAGS=
-@@ -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
- e-crisaout.o: $(srcdir)/config/e-crisaout.c emul-target.h
- e-criself.o: $(srcdir)/config/e-criself.c emul-target.h
+@@ -682,6 +682,9 @@
+ itbl-lex.o: itbl-lex.c itbl-parse.h $(srcdir)/itbl-lex.h
+       $(COMPILE) -c $< $(NO_WERROR)
+ 
++gasp.o:gasp.c $(INCDIR)/getopt.h $(INCDIR)/safe-ctype.h \
++      sb.h macro.h $(INCDIR)/xregex.h $(INCDIR)/xregex2.h
++
+ # Disable -Werror, if it has been enabled, since old versions of bison/
+ # yacc will produce working code which contain compile time warnings.
+ itbl-parse.o: itbl-parse.c itbl-parse.h $(srcdir)/itbl-ops.h $(srcdir)/itbl-lex.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 @@
@@ -5513,17 +5514,6 @@
 +int do_scrub_chars (int (*get) (char*, int), char *tostart, int tolen) {}
 --- 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
-@@ -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
--  (sb *, sb *, formal_entry *, struct hash_control *, const macro_entry *);
--static const char *macro_expand (int, sb *, macro_entry *, sb *);
-+  (sb *, sb *, formal_entry *, struct hash_control *, const macro_entry *, int);
-+static const char *macro_expand (int, sb *, macro_entry *, sb *, int);
- static void free_macro(macro_entry *);
- 
- #define ISWHITE(x) ((x) == ' ' || (x) == '\t')
 @@ -754,7 +754,7 @@
  
  static const char *
@@ -5698,8 +5688,8 @@
  
    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);