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

	within a single line when make -j is used.
	(as_bad_internal): Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 30b616e0f71708ea5bbadbbf2bbf70ade950a6f9..0616ad548a4d69eafd4fa63984411b421a5c75e5 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -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.

diff --git a/gas/messages.c b/gas/messages.c
index 979253d2bec75503675e00664f673ee7df331b44..05c74420c2d1d7b85e2eec007479ef961f1672af 100644 (file)
--- 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