Re: as error output not -j64 safe

[Mike Stump <mikestump@comcast.net>]

[-- Attachment #1: Type: text/plain, Size: 735 bytes --]

On May 16, 2014, at 1:51 AM, Alan Modra <amodra@gmail.com> wrote:
> OK.

Thanks.  I noticed you tricksy people switched to git, welcome to 2005.

> Please also fix as_warn_internal similarly to the above.

Done.

> There are quite a few more cases of the same problem in this file, if you
> care to look..

Gosh, I want to solve these with fmemopen, but, that is not as portable as the existing code…  In any event, I’m not set up to do as much testing as I’d like for move invasive changes…

Here is what I checked in:

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.


[-- Attachment #2: gas.diffs.txt --]
[-- Type: text/plain, Size: 1339 bytes --]

diff --git a/binutils/gas/messages.c b/binutils/gas/messages.c
index e1734f2..5abf817 100644
--- a/binutils/gas/messages.c
+++ b/binutils/gas/messages.c
@@ -153,13 +153,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
@@ -219,13 +218,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