* messages.c (as_warn_internal): Ensure we don't interleave output

within a single line when make -j is used.
	(as_bad_internal): Likewise.
This commit is contained in:
Mike Stump 2014-05-20 12:45:30 -07:00
parent bceec4b911
commit 39128ec026
2 changed files with 14 additions and 10 deletions

View File

@ -1,3 +1,9 @@
2014-05-20 Mike Stump <mikestump@comcast.net>
* messages.c (as_warn_internal): Ensure we don't interleave output
within a single line when make -j is used.
(as_bad_internal): Likewise.
2014-05-20 Richard Sandiford <rdsandiford@googlemail.com>
* config/obj-elf.h (obj_elf_seen_attribute): Declare.

View File

@ -151,13 +151,12 @@ as_warn_internal (char *file, unsigned int line, char *buffer)
if (file)
{
if (line != 0)
fprintf (stderr, "%s:%u: ", file, line);
fprintf (stderr, "%s:%u: %s %s\n", file, line, _("Warning: "), buffer);
else
fprintf (stderr, "%s: ", file);
fprintf (stderr, "%s: %s %s\n", file, _("Warning: "), buffer);
}
fprintf (stderr, _("Warning: "));
fputs (buffer, stderr);
(void) putc ('\n', stderr);
else
fprintf (stderr, "%s %s\n", _("Warning: "), buffer);
#ifndef NO_LISTING
listing_warning (buffer);
#endif
@ -217,13 +216,12 @@ as_bad_internal (char *file, unsigned int line, char *buffer)
if (file)
{
if (line != 0)
fprintf (stderr, "%s:%u: ", file, line);
fprintf (stderr, "%s:%u: %s %s\n", file, line, _("Error:"), buffer);
else
fprintf (stderr, "%s: ", file);
fprintf (stderr, "%s: %s %s\n", file, _("Error:"), buffer);
}
fprintf (stderr, _("Error: "));
fputs (buffer, stderr);
(void) putc ('\n', stderr);
else
fprintf (stderr, "%s %s\n", _("Error:"), buffer);
#ifndef NO_LISTING
listing_error (buffer);
#endif