mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-25 16:34:04 +02:00
102 lines
3.3 KiB
Diff
102 lines
3.3 KiB
Diff
Retrieved from http://sources.redhat.com/ml/binutils/2004-04/msg00646.html
|
|
Fixes
|
|
localealias.s:544: Error: junk at end of line, first unrecognized character is `,'
|
|
when building glibc-2.3.2 with gcc-3.4.0 and binutils-2.15.90.0.3
|
|
|
|
Paths adjusted to match crosstool's patcher.
|
|
|
|
Message-Id: m3n052qw2g.fsf@whitebox.m5r.de
|
|
From: Andreas Schwab <schwab at suse dot de>
|
|
To: Nathan Sidwell <nathan at codesourcery dot com>
|
|
Cc: Ian Lance Taylor <ian at wasabisystems dot com>, binutils at sources dot redhat dot com
|
|
Date: Fri, 23 Apr 2004 22:27:19 +0200
|
|
Subject: Re: demand_empty_rest_of_line and ignore_rest_of_line
|
|
|
|
Nathan Sidwell <nathan@codesourcery.com> writes:
|
|
|
|
> Index: read.c
|
|
> ===================================================================
|
|
> RCS file: /cvs/src/src/gas/read.c,v
|
|
> retrieving revision 1.76
|
|
> diff -c -3 -p -r1.76 read.c
|
|
> *** read.c 12 Mar 2004 17:48:12 -0000 1.76
|
|
> --- read.c 18 Mar 2004 09:56:05 -0000
|
|
> *************** read_a_source_file (char *name)
|
|
> *** 1053,1059 ****
|
|
> #endif
|
|
> input_line_pointer--;
|
|
> /* Report unknown char as ignored. */
|
|
> ! ignore_rest_of_line ();
|
|
> }
|
|
>
|
|
> #ifdef md_after_pass_hook
|
|
> --- 1053,1059 ----
|
|
> #endif
|
|
> input_line_pointer--;
|
|
> /* Report unknown char as ignored. */
|
|
> ! demand_empty_rest_of_line ();
|
|
> }
|
|
>
|
|
> #ifdef md_after_pass_hook
|
|
|
|
This means that the unknown character is no longer ignored, despite the
|
|
comment. As a side effect a line starting with a line comment character
|
|
not followed by APP in NO_APP mode now triggers an error instead of just a
|
|
warning, breaking builds of glibc on m68k-linux. Earlier in
|
|
read_a_source_file where #APP is handled there is another comment that
|
|
claims that unknown comments are ignored, when in fact they aren't (only
|
|
the initial line comment character is skipped).
|
|
|
|
Note that the presence of #APP will mess up the line counters, but
|
|
that appears to be difficult to fix.
|
|
|
|
Andreas.
|
|
|
|
2004-04-23 Andreas Schwab <schwab@suse.de>
|
|
|
|
* read.c (read_a_source_file): Ignore unknown text after line
|
|
comment character. Fix misleading comment.
|
|
|
|
--- binutils/gas/read.c.~1.78.~ 2004-04-23 08:58:23.000000000 +0200
|
|
+++ binutils/gas/read.c 2004-04-23 21:49:01.000000000 +0200
|
|
@@ -1,6 +1,6 @@
|
|
/* read.c - read a source file -
|
|
Copyright 1986, 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
|
|
- 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
|
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
|
|
|
This file is part of GAS, the GNU Assembler.
|
|
|
|
@@ -950,10 +950,14 @@ read_a_source_file (char *name)
|
|
unsigned int new_length;
|
|
char *tmp_buf = 0;
|
|
|
|
- bump_line_counters ();
|
|
s = input_line_pointer;
|
|
if (strncmp (s, "APP\n", 4))
|
|
- continue; /* We ignore it */
|
|
+ {
|
|
+ /* We ignore it */
|
|
+ ignore_rest_of_line ();
|
|
+ continue;
|
|
+ }
|
|
+ bump_line_counters ();
|
|
s += 4;
|
|
|
|
sb_new (&sbuf);
|
|
@@ -1052,7 +1056,7 @@ read_a_source_file (char *name)
|
|
continue;
|
|
#endif
|
|
input_line_pointer--;
|
|
- /* Report unknown char as ignored. */
|
|
+ /* Report unknown char as error. */
|
|
demand_empty_rest_of_line ();
|
|
}
|
|
|
|
|
|
--
|
|
Andreas Schwab, SuSE Labs, schwab@suse.de
|
|
SuSE Linux AG, MaxfeldstraÃe 5, 90409 NÃrnberg, Germany
|
|
Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
|
|
"And now for something completely different."
|