OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gas/

Browse Source 
* 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.
This commit is contained in:
Alan Modra 2011-03-18 11:16:28 +00:00
parent 04648e6590
commit 144886fa6b
8 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gas/ChangeLog
View File

@ -1,3 +1,10 @@
2011-03-18 Alan Modra <amodra@gmail.com>
* 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.
2011-03-18 Alan Modra <amodra@gmail.com> 2011-03-18 Alan Modra <amodra@gmail.com>
* read.c (read_a_source_file): Remove md_after_pass_hook. * read.c (read_a_source_file): Remove md_after_pass_hook.

11
gas/input-scrub.c
View File

@ -1,6 +1,6 @@
/* input_scrub.c - Break up input buffers into whole numbers of lines. /* input_scrub.c - Break up input buffers into whole numbers of lines.
Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 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. Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler. This file is part of GAS, the GNU Assembler.
@ -100,10 +100,9 @@ int macro_nest;
static char *physical_input_file; static char *physical_input_file;
static char *logical_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. */ /* A line ends in '\n' or eof. */
static unsigned int physical_input_line;
static line_numberT physical_input_line;
static int logical_input_line; static int logical_input_line;
/* Struct used to save the state of the input handler during include files */ /* Struct used to save the state of the input handler during include files */
@ -115,7 +114,7 @@ struct input_save {
unsigned int buffer_length; unsigned int buffer_length;
char * physical_input_file; char * physical_input_file;
char * logical_input_file; char * logical_input_file;
line_numberT physical_input_line; unsigned int physical_input_line;
int logical_input_line; int logical_input_line;
int sb_index; int sb_index;
sb from_sb; sb from_sb;
@ -304,6 +303,8 @@ void
input_scrub_close (void) input_scrub_close (void)
{ {
input_file_close (); input_file_close ();
physical_input_line = 0;
logical_input_line = -1;
} }
char * char *

23
gas/messages.c
View File

@ -1,6 +1,6 @@
/* messages.c - error reporter - /* messages.c - error reporter -
Copyright 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, Copyright 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001,
2003, 2004, 2005, 2006, 2007, 2008 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler. This file is part of GAS, the GNU Assembler.
@ -113,7 +113,12 @@ as_show_where (void)
as_where (&file, &line); as_where (&file, &line);
identify (file); identify (file);
if (file) if (file)
fprintf (stderr, "%s:%u: ", file, line); {
if (line != 0)
fprintf (stderr, "%s:%u: ", file, line);
else
fprintf (stderr, "%s: ", file);
}
} }
/* Send to stderr a string as a warning, and locate warning /* Send to stderr a string as a warning, and locate warning
@ -146,7 +151,12 @@ as_warn_internal (char *file, unsigned int line, char *buffer)
identify (file); identify (file);
if (file) if (file)
fprintf (stderr, "%s:%u: ", file, line); {
if (line != 0)
fprintf (stderr, "%s:%u: ", file, line);
else
fprintf (stderr, "%s: ", file);
}
fprintf (stderr, _("Warning: ")); fprintf (stderr, _("Warning: "));
fputs (buffer, stderr); fputs (buffer, stderr);
(void) putc ('\n', stderr); (void) putc ('\n', stderr);
@ -207,7 +217,12 @@ as_bad_internal (char *file, unsigned int line, char *buffer)
identify (file); identify (file);
if (file) if (file)
fprintf (stderr, "%s:%u: ", file, line); {
if (line != 0)
fprintf (stderr, "%s:%u: ", file, line);
else
fprintf (stderr, "%s: ", file);
}
fprintf (stderr, _("Error: ")); fprintf (stderr, _("Error: "));
fputs (buffer, stderr); fputs (buffer, stderr);
(void) putc ('\n', stderr); (void) putc ('\n', stderr);

7
gas/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2011-03-18 Alan Modra <amodra@gmail.com>
* 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.
2011-03-17 H.J. Lu <hongjiu.lu@intel.com> 2011-03-17 H.J. Lu <hongjiu.lu@intel.com>
PR gas/12589 PR gas/12589

2
gas/testsuite/gas/elf/bad-size.err
View File

@ -1,2 +1,2 @@
.*bad-size\.s: Assembler messages: .*bad-size\.s: Assembler messages:
.*bad-size\.s:6: Error: .* .*bad-size\.s:.* Error: .*

2
gas/testsuite/gas/i386/bad-size.warn
View File

@ -1,2 +1,2 @@
.*bad-size\.s: Assembler messages: .*bad-size\.s: Assembler messages:
.*bad-size\.s:6: Warning: .* .*bad-size\.s: Warning: .*

6
gas/testsuite/gas/i386/inval-equ-2.l
View File

@ -1,7 +1,7 @@
.*: Assembler messages: .*: Assembler messages:
.*:8: Error: .* .*: Error: .*
.*:8: Error: .* .*: Error: .*
.*:8: Error: .* .*: Error: .*
GAS LISTING .* GAS LISTING .*

2
gas/testsuite/gas/symver/symver2.l
View File

@ -1,2 +1,2 @@
.*: Assembler messages: .*: Assembler messages:
.*:8: Error: invalid attempt to declare external version name as default in symbol `foo@@version1' .*: Error: invalid attempt to declare external version name as default in symbol `foo@@version1'