]>
Commit | Line | Data |
---|---|---|
1d4ec104 MT |
1 | Retrieved from http://sources.redhat.com/ml/binutils/2004-04/msg00646.html |
2 | Fixes | |
3 | localealias.s:544: Error: junk at end of line, first unrecognized character is `,' | |
4 | when building glibc-2.3.2 with gcc-3.4.0 and binutils-2.15.90.0.3 | |
5 | ||
6 | Paths adjusted to match crosstool's patcher. | |
7 | ||
8 | Message-Id: m3n052qw2g.fsf@whitebox.m5r.de | |
9 | From: Andreas Schwab <schwab at suse dot de> | |
10 | To: Nathan Sidwell <nathan at codesourcery dot com> | |
11 | Cc: Ian Lance Taylor <ian at wasabisystems dot com>, binutils at sources dot redhat dot com | |
12 | Date: Fri, 23 Apr 2004 22:27:19 +0200 | |
13 | Subject: Re: demand_empty_rest_of_line and ignore_rest_of_line | |
14 | ||
15 | Nathan Sidwell <nathan@codesourcery.com> writes: | |
16 | ||
17 | > Index: read.c | |
18 | > =================================================================== | |
19 | > RCS file: /cvs/src/src/gas/read.c,v | |
20 | > retrieving revision 1.76 | |
21 | > diff -c -3 -p -r1.76 read.c | |
22 | > *** read.c 12 Mar 2004 17:48:12 -0000 1.76 | |
23 | > --- read.c 18 Mar 2004 09:56:05 -0000 | |
24 | > *************** read_a_source_file (char *name) | |
25 | > *** 1053,1059 **** | |
26 | > #endif | |
27 | > input_line_pointer--; | |
28 | > /* Report unknown char as ignored. */ | |
29 | > ! ignore_rest_of_line (); | |
30 | > } | |
31 | > | |
32 | > #ifdef md_after_pass_hook | |
33 | > --- 1053,1059 ---- | |
34 | > #endif | |
35 | > input_line_pointer--; | |
36 | > /* Report unknown char as ignored. */ | |
37 | > ! demand_empty_rest_of_line (); | |
38 | > } | |
39 | > | |
40 | > #ifdef md_after_pass_hook | |
41 | ||
42 | This means that the unknown character is no longer ignored, despite the | |
43 | comment. As a side effect a line starting with a line comment character | |
44 | not followed by APP in NO_APP mode now triggers an error instead of just a | |
45 | warning, breaking builds of glibc on m68k-linux. Earlier in | |
46 | read_a_source_file where #APP is handled there is another comment that | |
47 | claims that unknown comments are ignored, when in fact they aren't (only | |
48 | the initial line comment character is skipped). | |
49 | ||
50 | Note that the presence of #APP will mess up the line counters, but | |
51 | that appears to be difficult to fix. | |
52 | ||
53 | Andreas. | |
54 | ||
55 | 2004-04-23 Andreas Schwab <schwab@suse.de> | |
56 | ||
57 | * read.c (read_a_source_file): Ignore unknown text after line | |
58 | comment character. Fix misleading comment. | |
59 | ||
60 | --- binutils/gas/read.c.~1.78.~ 2004-04-23 08:58:23.000000000 +0200 | |
61 | +++ binutils/gas/read.c 2004-04-23 21:49:01.000000000 +0200 | |
62 | @@ -950,10 +950,14 @@ read_a_source_file (char *name) | |
63 | unsigned int new_length; | |
64 | char *tmp_buf = 0; | |
65 | ||
66 | - bump_line_counters (); | |
67 | s = input_line_pointer; | |
68 | if (strncmp (s, "APP\n", 4)) | |
69 | - continue; /* We ignore it */ | |
70 | + { | |
71 | + /* We ignore it */ | |
72 | + ignore_rest_of_line (); | |
73 | + continue; | |
74 | + } | |
75 | + bump_line_counters (); | |
76 | s += 4; | |
77 | ||
78 | sb_new (&sbuf); | |
79 | @@ -1052,7 +1056,7 @@ read_a_source_file (char *name) | |
80 | continue; | |
81 | #endif | |
82 | input_line_pointer--; | |
83 | - /* Report unknown char as ignored. */ | |
84 | + /* Report unknown char as error. */ | |
85 | demand_empty_rest_of_line (); | |
86 | } | |
87 | ||
88 | ||
89 | -- | |
90 | Andreas Schwab, SuSE Labs, schwab@suse.de | |
91 | SuSE Linux AG, MaxfeldstraÃe 5, 90409 NÃrnberg, Germany | |
92 | Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 | |
93 | "And now for something completely different." |