aboutsummaryrefslogtreecommitdiff
path: root/gas/messages.c
diff options
context:
space:
mode:
authorMike Stump <mikestump@comcast.net>2014-05-20 12:45:30 -0700
committerMike Stump <mikestump@comcast.net>2014-05-20 12:45:30 -0700
commit39128ec026ca07a3a1cf2c2096afb3f17fa1d5d8 (patch)
treea2a2b7c17beb575b834875ac5996a3862d2fad6d /gas/messages.c
parentbceec4b91193a4485f94c1fe56e20bc755674e59 (diff)
downloadgdb-39128ec026ca07a3a1cf2c2096afb3f17fa1d5d8.zip
gdb-39128ec026ca07a3a1cf2c2096afb3f17fa1d5d8.tar.gz
gdb-39128ec026ca07a3a1cf2c2096afb3f17fa1d5d8.tar.bz2
* messages.c (as_warn_internal): Ensure we don't interleave output
within a single line when make -j is used. (as_bad_internal): Likewise.
Diffstat (limited to 'gas/messages.c')
-rw-r--r--gas/messages.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/gas/messages.c b/gas/messages.c
index 979253d..05c7442 100644
--- a/gas/messages.c
+++ b/gas/messages.c
@@ -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