diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2011-03-18 11:16:27 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2011-03-18 11:16:27 +0000 |
| commit | e46e442ff38ee5317226fb172407f42f55647b37 (patch) | |
| tree | b1c9d28dc00292cd3a3220b3fd224f1a2502af36 /gas/input-scrub.c | |
| parent | b87acf1fa000441dd855228a0f9dc8f1aaf310d7 (diff) | |
| download | binutils-redhat-e46e442ff38ee5317226fb172407f42f55647b37.tar.gz | |
gas/
* input-scrub.c (line_numberT): Delete.
(input_scrub_close): Reset line counters.
* messages.c (as_show_where): Don't print invalid line number.
(as_warn_internal, as_bad_internal): Likewise.
gas/testsuite/
* gas/elf/bad-size.err: Adjust expected error.
* gas/i386/bad-size.warn: Likewise.
* gas/i386/inval-equ-2.l: Likewise.
* gas/symver/symver2.l: Likewise.
Diffstat (limited to 'gas/input-scrub.c')
| -rw-r--r-- | gas/input-scrub.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gas/input-scrub.c b/gas/input-scrub.c index d616f632ec..c6169b3146 100644 --- a/gas/input-scrub.c +++ b/gas/input-scrub.c @@ -1,6 +1,6 @@ /* input_scrub.c - Break up input buffers into whole numbers of lines. Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 2000, 2001, 2003, 2005, 2006, 2007, 2008 + 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -100,10 +100,9 @@ int macro_nest; static char *physical_input_file; static char *logical_input_file; -typedef unsigned int line_numberT; /* 1-origin line number in a source file. */ +/* 1-origin line number in a source file. */ /* A line ends in '\n' or eof. */ - -static line_numberT physical_input_line; +static unsigned int physical_input_line; static int logical_input_line; /* Struct used to save the state of the input handler during include files */ @@ -115,7 +114,7 @@ struct input_save { unsigned int buffer_length; char * physical_input_file; char * logical_input_file; - line_numberT physical_input_line; + unsigned int physical_input_line; int logical_input_line; int sb_index; sb from_sb; @@ -304,6 +303,8 @@ void input_scrub_close (void) { input_file_close (); + physical_input_line = 0; + logical_input_line = -1; } char * |