as error output not -j64 safe

as error output not -j64 safe

[Mike Stump]

So when dealing with error messages, it is important that they be one per line and -j safe.  This fixes intermingled output when -j64 is used on linux:

diff --git a/binutils/gas/messages.c b/binutils/gas/messages.c
index e1734f2..c3a551b 100644
--- a/binutils/gas/messages.c
+++ b/binutils/gas/messages.c
@@ -219,13 +219,10 @@ 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);
 #ifndef NO_LISTING
   listing_error (buffer);
 #endif

Re: as error output not -j64 safe

[Andrew Pinski]

On Thu, May 15, 2014 at 3:48 PM, Mike Stump <mikestump@comcast.net> wrote:
> So when dealing with error messages, it is important that they be one per line and -j safe.  This fixes intermingled output when -j64 is used on linux:
>
> diff --git a/binutils/gas/messages.c b/binutils/gas/messages.c
> index e1734f2..c3a551b 100644
> --- a/binutils/gas/messages.c
> +++ b/binutils/gas/messages.c
> @@ -219,13 +219,10 @@ 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);
>  #ifndef NO_LISTING
>    listing_error (buffer);
>  #endif
>

This changes the semantics of the error message if file is null.
Try:
   if (file)
     {
       if (line != 0)
         fprintf (stderr, "%s:%u: %s %s\n", file, line, _("Error:"), buffer);
       else
         fprintf (stderr, "%s: %s %s\n", file, _("Error:"), buffer);
     }
else
       fprintf (stderr, "%s %s\n", _("Error:"), buffer);

Thanks,
Andrew

Re: as error output not -j64 safe

[Mike Stump]

On May 15, 2014, at 3:52 PM, Andrew Pinski <pinskia@gmail.com> wrote:
> On Thu, May 15, 2014 at 3:48 PM, Mike Stump <mikestump@comcast.net> wrote:
>> So when dealing with error messages, it is important that they be one per line and -j safe.  This fixes intermingled output when -j64 is used on linux:
>> 
>> diff --git a/binutils/gas/messages.c b/binutils/gas/messages.c
>> index e1734f2..c3a551b 100644
>> --- a/binutils/gas/messages.c
>> +++ b/binutils/gas/messages.c
>> @@ -219,13 +219,10 @@ 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);
>> #ifndef NO_LISTING
>>   listing_error (buffer);
>> #endif
>> 
> 
> This changes the semantics of the error message if file is null.

Yes, thanks for the catch:

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

Re: as error output not -j64 safe

[Alan Modra]

On Thu, May 15, 2014 at 04:13:24PM -0700, Mike Stump wrote:
> --- a/binutils/gas/messages.c
> +++ b/binutils/gas/messages.c
> @@ -219,13 +219,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

OK.  Please also fix as_warn_internal similarly to the above.  There
are quite a few more cases of the same problem in this file, if you
care to look..

-- 
Alan Modra
Australia Development Lab, IBM

Re: as error output not -j64 safe

[Mike Stump]

[-- 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

RE: as error output not -j64 safe

[Matthew Fortune]

Hi Alan/Mike,

This patch has broken a lot of expected output in the gas testsuite.
Are individual ports expected to deal with the fallout or has this been
done already but awaiting commit? MIPS has 133 failures with this patch
applied.

Regards,
Matthew

> -----Original Message-----
> From: binutils-owner@sourceware.org [mailto:binutils-owner@sourceware.org]
> On Behalf Of Mike Stump
> Sent: 20 May 2014 21:28
> To: Alan Modra
> Cc: Andrew Pinski; binutils
> Subject: Re: as error output not -j64 safe
> 
> 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.

RE: as error output not -j64 safe

[Matthew Fortune]

> This patch has broken a lot of expected output in the gas testsuite.
> Are individual ports expected to deal with the fallout or has this been
> done already but awaiting commit? MIPS has 133 failures with this patch
> applied.

I didn't check the exact cause earlier. It is just extra whitespace
introduced in the refactoring. Committed as obvious, (hoping that is the
right way to treat this sort of fix).

Regards,
Matthew

	* messages.c (as_warn_internal): Remove extra whitespace from
	warning messages.
---
 gas/ChangeLog  |    5 +++++
 gas/messages.c |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 130b287..51974b5 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
 2014-05-20  Matthew Fortune  <matthew.fortune@imgtec.com>
 
+	* messages.c (as_warn_internal): Remove extra whitespace from
+	warning messages.
+
+2014-05-20  Matthew Fortune  <matthew.fortune@imgtec.com>
+
 	* config/tc-mips.c (FP64_ASES): Add ASE_MSA.
 	(mips_after_parse_args): Do not select ASE_MSA without -mfp64.
 
diff --git a/gas/messages.c b/gas/messages.c
index 05c7442..d592b36 100644
--- a/gas/messages.c
+++ b/gas/messages.c
@@ -151,12 +151,12 @@ as_warn_internal (char *file, unsigned int line, char *buffer)
   if (file)
     {
       if (line != 0)
-	fprintf (stderr, "%s:%u: %s %s\n", file, line, _("Warning: "), buffer);
+	fprintf (stderr, "%s:%u: %s %s\n", file, line, _("Warning:"), buffer);
       else
-	fprintf (stderr, "%s: %s %s\n", file, _("Warning: "), buffer);
+	fprintf (stderr, "%s: %s %s\n", file, _("Warning:"), buffer);
     }
   else
-    fprintf (stderr, "%s %s\n", _("Warning: "), buffer);
+    fprintf (stderr, "%s %s\n", _("Warning:"), buffer);
 #ifndef NO_LISTING
   listing_warning (buffer);
 #endif
-- 
1.7.1

> > -----Original Message-----
> > From: binutils-owner@sourceware.org [mailto:binutils-
> owner@sourceware.org]
> > On Behalf Of Mike Stump
> > Sent: 20 May 2014 21:28
> > To: Alan Modra
> > Cc: Andrew Pinski; binutils
> > Subject: Re: as error output not -j64 safe
> >
> > 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.

Re: as error output not -j64 safe

[Mike Stump]

On May 20, 2014, at 3:48 PM, Matthew Fortune <Matthew.Fortune@imgtec.com> wrote:
>> This patch has broken a lot of expected output in the gas testsuite.
>> Are individual ports expected to deal with the fallout or has this been
>> done already but awaiting commit? MIPS has 133 failures with this patch
>> applied.
> 
> I didn't check the exact cause earlier. It is just extra whitespace
> introduced in the refactoring. Committed as obvious, (hoping that is the
> right way to treat this sort of fix).

So, could a _() person comment on the change from _(“Error: “) —> _(“Error:”)…  I’m worried it kills translations unnecessarily…  or, maybe I just worry to much.

Thanks for spotting this.

Re: as error output not -j64 safe

[Alan Modra]

On Tue, May 20, 2014 at 03:57:06PM -0700, Mike Stump wrote:
> So, could a _() person comment on the change from _(“Error: “) —>
> _(“Error:”)…  I’m worried it kills translations unnecessarily…  or,
> maybe I just worry to much. 

I don't think it matters.  We have "Error:" and "Warning:" already in
listing.c, so that should match.

Hmm, that means in listings we print

	Error:blahblahblah

while the stderr output is

	Error: blahblahblah

Life isn't perfect.  :)

-- 
Alan Modra
Australia Development Lab, IBM

Re: as error output not -j64 safe

[Mike Stump]

On May 22, 2014, at 12:21 AM, Alan Modra <amodra@gmail.com> wrote:
> I don't think it matters.  We have "Error:" and "Warning:" already in
> listing.c, so that should match.
> 
> Hmm, that means in listings we print
> 
> 	Error:blahblahblah

> Life isn't perfect.  :)

It can be.  Try this out, if it tests out ok, either check it in (or let me know and I can).

diff --git a/gas/listing.c b/gas/listing.c
index 24450cf..69db6d2 100644
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -234,10 +234,11 @@ listing_message (const char *name, const char *message)
 {
   if (listing_tail != (list_info_type *) NULL)
     {
-      unsigned int l = strlen (name) + strlen (message) + 1;
+      unsigned int l = strlen (name) + 1 + strlen (message) + 1;
       char *n = (char *) xmalloc (l);
       struct list_message *lm = xmalloc (sizeof *lm);
       strcpy (n, name);
+      strcat (n, " ");
       strcat (n, message);
       lm->message = n;
       lm->next = NULL;

Re: as error output not -j64 safe

[Alan Modra]

On Thu, May 22, 2014 at 01:09:52AM -0700, Mike Stump wrote:
> On May 22, 2014, at 12:21 AM, Alan Modra <amodra@gmail.com> wrote:
> > I don't think it matters.  We have "Error:" and "Warning:" already in
> > listing.c, so that should match.
> > 
> > Hmm, that means in listings we print
> > 
> > 	Error:blahblahblah
> 
> > Life isn't perfect.  :)
> 
> It can be.  Try this out, if it tests out ok, either check it in (or let me know and I can).

Thanks, but I'm ahead of you.  Some tests needed tweaking.  This is
what I'll commit with a suitable changelog if the next test run passes.

diff --git a/gas/listing.c b/gas/listing.c
index 24450cf..0192dd0 100644
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -253,13 +253,13 @@ listing_message (const char *name, const char *message)
 void
 listing_warning (const char *message)
 {
-  listing_message (_("Warning:"), message);
+  listing_message (_("Warning: "), message);
 }
 
 void
 listing_error (const char *message)
 {
-  listing_message (_("Error:"), message);
+  listing_message (_("Error: "), message);
 }
 
 static file_info_type *
diff --git a/gas/messages.c b/gas/messages.c
index d592b36..2865c9d 100644
--- a/gas/messages.c
+++ b/gas/messages.c
@@ -151,12 +151,12 @@ as_warn_internal (char *file, unsigned int line, char *buffer)
   if (file)
     {
       if (line != 0)
-	fprintf (stderr, "%s:%u: %s %s\n", file, line, _("Warning:"), buffer);
+	fprintf (stderr, "%s:%u: %s%s\n", file, line, _("Warning: "), buffer);
       else
-	fprintf (stderr, "%s: %s %s\n", file, _("Warning:"), buffer);
+	fprintf (stderr, "%s: %s%s\n", file, _("Warning: "), buffer);
     }
   else
-    fprintf (stderr, "%s %s\n", _("Warning:"), buffer);
+    fprintf (stderr, "%s%s\n", _("Warning: "), buffer);
 #ifndef NO_LISTING
   listing_warning (buffer);
 #endif
@@ -216,12 +216,12 @@ as_bad_internal (char *file, unsigned int line, char *buffer)
   if (file)
     {
       if (line != 0)
-	fprintf (stderr, "%s:%u: %s %s\n", file, line, _("Error:"), buffer);
+	fprintf (stderr, "%s:%u: %s%s\n", file, line, _("Error: "), buffer);
       else
-	fprintf (stderr, "%s: %s %s\n", file, _("Error:"), buffer);
+	fprintf (stderr, "%s: %s%s\n", file, _("Error: "), buffer);
     }
   else
-    fprintf (stderr, "%s %s\n", _("Error:"), buffer);
+    fprintf (stderr, "%s%s\n", _("Error: "), buffer);
 #ifndef NO_LISTING
   listing_error (buffer);
 #endif
diff --git a/gas/testsuite/gas/d30v/bittest.l b/gas/testsuite/gas/d30v/bittest.l
index 250003f..c3d029c 100644
--- a/gas/testsuite/gas/d30v/bittest.l
+++ b/gas/testsuite/gas/d30v/bittest.l
@@ -19,16 +19,16 @@ GAS LISTING .*
   10 0000 00F00000 		nop -> ldw R1, @\(R2,R3\)
   10      84401083 
   11 0008 04406144 	        nop || ldw R6, @\(R5,R4\)
-.*  Warning:Swapping instruction order
+.*  Warning: Swapping instruction order
   11      00F00000 
   12              	        
   13 0010 00F00000 	        nop -> BSET R1, R2, R3 
   13      82201083 
   14 0018 80F00000 	        nop <- BTST F1, R2, R3 
-.*  Warning:Executing btst in IU in reverse serial may not work
+.*  Warning: Executing btst in IU in reverse serial may not work
   14      02001083 
   15 0020 00F00000 	        nop || BCLR R1, R2, R3
-.*  Warning:Executing bclr in IU may not work in parallel execution
+.*  Warning: Executing bclr in IU may not work in parallel execution
   15      02301083 
   16 0028 00F00000 	        nop -> BNOT R1, R2, R3
   16      82101083 
@@ -36,8 +36,8 @@ GAS LISTING .*
   17      80F00000 
   18              	        
   19 0038 047C0105 	        bset r1, r2, r3 || moddec r4, 5
-.*  Warning:Executing bset in IU may not work
-.*  Warning:Swapping instruction order
+.*  Warning: Executing bset in IU may not work
+.*  Warning: Swapping instruction order
   19      02201083 
   20              	
   21              	        bset r1, r2, r3
diff --git a/gas/testsuite/gas/d30v/serial.l b/gas/testsuite/gas/d30v/serial.l
index 84b475d..8ee33bf 100644
--- a/gas/testsuite/gas/d30v/serial.l
+++ b/gas/testsuite/gas/d30v/serial.l
@@ -12,20 +12,20 @@ GAS LISTING .*
    4              	# will never be executed.  GAS should detect this.
    5              		
    6 \?\?\?\? ........ 		trap r21 -> add r2, r0, r0 ; right instruction will never be executed.
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
    6      ........ 
    7 \?\?\?\? 08002000 		dbt     -> add r2, r0, r0               ; ditto
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
    7      00F00000 
    7      00B00000 
    7      00F00000 
    8 \?\?\?\? 08002000 		rtd     -> add r2, r0, r0               ; ditto
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
    8      00F00000 
    8      00A00000 
    8      00F00000 
    9 \?\?\?\? 08002000 		reit    -> add r2, r0, r0               ; ditto
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
    9      00F00000 
    9      00800000 
    9      00F00000 
diff --git a/gas/testsuite/gas/d30v/serial2.l b/gas/testsuite/gas/d30v/serial2.l
index a799bb9..327c0f3 100644
--- a/gas/testsuite/gas/d30v/serial2.l
+++ b/gas/testsuite/gas/d30v/serial2.l
@@ -27,58 +27,58 @@ GAS LISTING .*
    3              		.text
    4              		
    5 \?\?\?\? ........ 		bra -3 -> add r3,r0,0	; Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
    5      ........ 
    6 \?\?\?\? 08083000 		bsr -3 -> add r3,r0,0	; Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
    6      00F00000 
    6      002BFFFF 
    6      00F00000 
    7              	
    8 \?\?\?\? 08083000 		bra/tx -3 -> add r3,r0,0 ;       Valid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
    8      00F00000 
    8      100BFFFF 
    8      00F00000 
    9 \?\?\?\? 08083000 		bsr/tx -3 -> add r3,r0,0 ;       Valid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
    9      00F00000 
    9      102BFFFF 
    9      00F00000 
   10              	
   11 \?\?\?\? 08083000 		bsr -3 -> bsr -10	;       Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   11      00F00000 
   11      002BFFFF 
   11      00F00000 
   12 \?\?\?\? 002BFFFE 		bsr -3 -> bsr/xt -10    ;       Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   12      00F00000 
   12      002BFFFF 
   12      00F00000 
   13 \?\?\?\? 302BFFFE 		bsr/tx -3 -> bsr -10    ;       Valid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   13      00F00000 
   13      102BFFFF 
   13      00F00000 
   14 \?\?\?\? 002BFFFE 		bsr/tx -3 -> bsr/fx -10 ;       Valid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   14      00F00000 
   14      102BFFFF 
   14      00F00000 
   15              	
   16 \?\?\?\? 202BFFFE 		bra -3 -> bra  10       ;      Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   16      00F00000 
   16      000BFFFF 
   16      00F00000 
   17 \?\?\?\? 00080001 		bra -3 -> bra/tx 10     ;      Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   17      00F00000 
   17      000BFFFF 
   17      00F00000 
   18 \?\?\?\? 10080001 		bra/tx -3 -> bra 10     ;      Valid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
 \fGAS LISTING .*
 
 
@@ -86,49 +86,49 @@ GAS LISTING .*
   18      100BFFFF 
   18      00F00000 
   19 \?\?\?\? 00080001 		bra/tx -3 -> bra/fx 10  ;      Valid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   19      00F00000 
   19      100BFFFF 
   19      00F00000 
   20              	
   21 \?\?\?\? 20080001 		bsr -3 -> bra 10        ;      Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   21      00F00000 
   21      002BFFFF 
   21      00F00000 
   22 \?\?\?\? 00080001 		bsr -3 -> bra/tx 10     ;      Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   22      00F00000 
   22      002BFFFF 
   22      00F00000 
   23 \?\?\?\? 10080001 		bsr/tx -3 -> bra 10     ;      Valid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   23      00F00000 
   23      102BFFFF 
   23      00F00000 
   24 \?\?\?\? 00080001 		bsr/tx -3 -> bra/fx 10  ;      Valid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   24      00F00000 
   24      102BFFFF 
   24      00F00000 
   25              	
   26 \?\?\?\? 20080001 		bra -3 -> bsr 10        ;      Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   26      00F00000 
   26      000BFFFF 
   26      00F00000 
   27 \?\?\?\? 00280001 		bra -3 -> bsr/tx 10     ;      Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   27      00F00000 
   27      000BFFFF 
   27      00F00000 
   28 \?\?\?\? 10280001 		bra/tx -3 -> bsr 10     ;      Valid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   28      00F00000 
   28      100BFFFF 
   28      00F00000 
   29 \?\?\?\? 00280001 		bra/tx -3 -> bsr/fx 10  ;      Valid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   29      00F00000 
   29      100BFFFF 
   29      00F00000 
diff --git a/gas/testsuite/gas/d30v/serial2O.l b/gas/testsuite/gas/d30v/serial2O.l
index dc5b9c7..ed7e71d 100644
--- a/gas/testsuite/gas/d30v/serial2O.l
+++ b/gas/testsuite/gas/d30v/serial2O.l
@@ -17,10 +17,10 @@ GAS LISTING .*
    3              		.text
    4              		
    5 \?\?\?\? ........ 		bra -3 -> add r3,r0,0	; Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
    5      ........ 
    6 \?\?\?\? 08083000 		bsr -3 -> add r3,r0,0	; Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
    6      00F00000 
    6      002BFFFF 
    6      00F00000 
@@ -33,10 +33,10 @@ GAS LISTING .*
    9      88083000 
   10              	
   11 \?\?\?\? 002BFFFF 		bsr -3 -> bsr -10	;       Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   11      00F00000 
   12 \?\?\?\? 002BFFFE 		bsr -3 -> bsr/xt -10    ;       Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   12      00F00000 
   12      002BFFFF 
   12      00F00000 
@@ -48,10 +48,10 @@ GAS LISTING .*
   14      A02BFFFE 
   15              	
   16 \?\?\?\? 000BFFFF 		bra -3 -> bra  10       ;      Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   16      00F00000 
   17 \?\?\?\? 00080001 		bra -3 -> bra/tx 10     ;      Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   17      00F00000 
   17      000BFFFF 
   17      00F00000 
@@ -63,10 +63,10 @@ GAS LISTING .*
   19      A0080001 
   20              	
   21 \?\?\?\? 002BFFFF 		bsr -3 -> bra 10        ;      Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   21      00F00000 
   22 \?\?\?\? 00080001 		bsr -3 -> bra/tx 10     ;      Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   22      00F00000 
   22      002BFFFF 
 \fGAS LISTING .*
@@ -81,10 +81,10 @@ GAS LISTING .*
   24      A0080001 
   25              	
   26 \?\?\?\? 000BFFFF 		bra -3 -> bsr 10        ;      Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   26      00F00000 
   27 \?\?\?\? 00280001 		bra -3 -> bsr/tx 10     ;      Invalid
-\*\*\*\*  Error:Unable to mix instructions as specified
+.*  Error: Unable to mix instructions as specified
   27      00F00000 
   27      000BFFFF 
   27      00F00000 
diff --git a/gas/testsuite/gas/d30v/warn_oddreg.l b/gas/testsuite/gas/d30v/warn_oddreg.l
index f1fb43c..3b9d2dd 100644
--- a/gas/testsuite/gas/d30v/warn_oddreg.l
+++ b/gas/testsuite/gas/d30v/warn_oddreg.l
@@ -15,26 +15,26 @@ GAS LISTING .*
    3              	# and mulx2h
    4              	
    5 0000 05681000 	st2w r1, @(r0, 0)	||	nop 
-.*  Warning:Odd numbered register used as target of multi-register instruction
+.*  Warning: Odd numbered register used as target of multi-register instruction
    5      00F00000 
    6 0008 04681000 	ld2w r1, @(r0, 0)	||	nop 
-.*  Warning:Odd numbered register used as target of multi-register instruction
+.*  Warning: Odd numbered register used as target of multi-register instruction
    6      00F00000 
    7 0010 04581000 	ld4bh r1, @(r0, 0)	||	nop 
-.*  Warning:Odd numbered register used as target of multi-register instruction
+.*  Warning: Odd numbered register used as target of multi-register instruction
    7      00F00000 
    8 0018 04D81000 	ld4bhu r1, @(r0, 0)	||	nop 
-.*  Warning:Odd numbered register used as target of multi-register instruction
+.*  Warning: Odd numbered register used as target of multi-register instruction
    8      00F00000 
    9 0020 04381000 	ld2h r1, @(r0, 0)	||	nop 
-.*  Warning:Odd numbered register used as target of multi-register instruction
+.*  Warning: Odd numbered register used as target of multi-register instruction
    9      00F00000 
   10 0028 05581000 	st4hb r1, @(r0, 0)	||	nop 
-.*  Warning:Odd numbered register used as target of multi-register instruction
+.*  Warning: Odd numbered register used as target of multi-register instruction
   10      00F00000 
   11 0030 05381000 	st2h r1, @(r0, 0)	||	nop 
-.*  Warning:Odd numbered register used as target of multi-register instruction
+.*  Warning: Odd numbered register used as target of multi-register instruction
   11      00F00000 
   12 0038 00F00000 	nop	||	mulx2h r1, r5, r6   
-.*  Warning:Odd numbered register used as target of multi-register instruction
+.*  Warning: Odd numbered register used as target of multi-register instruction
   12      0A101146 
diff --git a/gas/testsuite/gas/i386/inval-equ-2.l b/gas/testsuite/gas/i386/inval-equ-2.l
index 7a4f483..eafaf25 100644
--- a/gas/testsuite/gas/i386/inval-equ-2.l
+++ b/gas/testsuite/gas/i386/inval-equ-2.l
@@ -15,7 +15,7 @@ GAS LISTING .*
 [ 	]*6[ 	]+\.globl  bar2
 [ 	]*7[ 	]+\.set    bar3,\(%eax\+1\)
 [ 	]*8[ 	]+\?\?\?\? A12A0000 		mov bar3,%eax
-\*\*\*\*  Error:can't make global register symbol `bar1'
-\*\*\*\*  Error:can't make global register symbol `bar2'
-\*\*\*\*  Error:can't make global register symbol `bar3'
+.*  Error: can't make global register symbol `bar1'
+.*  Error: can't make global register symbol `bar2'
+.*  Error: can't make global register symbol `bar3'
 [ 	]*8[ 	]+00
diff --git a/gas/testsuite/gas/i386/mpx-inval-1.l b/gas/testsuite/gas/i386/mpx-inval-1.l
index 41de5a0..121aad6 100644
--- a/gas/testsuite/gas/i386/mpx-inval-1.l
+++ b/gas/testsuite/gas/i386/mpx-inval-1.l
@@ -22,34 +22,34 @@ GAS LISTING .*
 [ 	]*4[ 	]+\.extern xxx
 [ 	]*5[ 	]+foo:
 [ 	]*6[ 	]+\?\?\?\? F201C3   		bnd add %eax, %ebx  		\# Bad
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*7[ 	]+\?\?\?\? 66F2AB   		bnd stosw \(%edi\)    		\# Bad
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*8[ 	]+\?\?\?\? 9A000000 		bnd lcall \$0x1234,\$xxx
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
-\*\*\*\*  Warning:skipping prefixes on this instruction
+.*  Error: expecting valid branch instruction after `bnd'
+.*  Warning: skipping prefixes on this instruction
 [ 	]*8[ 	]+003412
 [ 	]*9[ 	]+\?\?\?\? EA000000 		bnd ljmp \$0x1234,\$xxx
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
-\*\*\*\*  Warning:skipping prefixes on this instruction
+.*  Error: expecting valid branch instruction after `bnd'
+.*  Warning: skipping prefixes on this instruction
 [ 	]*9[ 	]+003412
 [ 	]*10[ 	]+\?\?\?\? F2E200   		bnd loop foo
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*11[ 	]+\?\?\?\? 67F2E300 		bnd jcxz foo
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*12[ 	]+
 [ 	]*13[ 	]+\.intel_syntax noprefix
 [ 	]*14[ 	]+\?\?\?\? F201C3   		bnd add ebx, eax		\# Bad
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*15[ 	]+\?\?\?\? 66F2AB   		bnd stos WORD PTR\[edi]		\# Bad
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*16[ 	]+\?\?\?\? 9A000000 		bnd lcall 0x1234,xxx
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*16[ 	]+003412
 [ 	]*17[ 	]+\?\?\?\? EA000000 		bnd ljmp 0x1234,xxx
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*17[ 	]+003412
 [ 	]*18[ 	]+\?\?\?\? F2E200   		bnd loop foo
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*19[ 	]+\?\?\?\? 67F2E300 		bnd jcxz foo
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
diff --git a/gas/testsuite/gas/i386/sse-check-error.l b/gas/testsuite/gas/i386/sse-check-error.l
index bd1c4f6..5df6d67 100644
--- a/gas/testsuite/gas/i386/sse-check-error.l
+++ b/gas/testsuite/gas/i386/sse-check-error.l
@@ -16,25 +16,25 @@ GAS LISTING .*
 [ 	]*5[ 	]+
 [ 	]*6[ 	]+\# SSE instruction
 [ 	]*7[ 	]+\?\?\?\? 0F58CA   		addps %xmm2,%xmm1
-\*\*\*\*  Error:SSE instruction `addps' is used
+.*  Error: SSE instruction `addps' is used
 [ 	]*8[ 	]+
 [ 	]*9[ 	]+\# SSE2 instruction
 [ 	]*10[ 	]+\?\?\?\? 660F58CA 		addpd %xmm2,%xmm1
-\*\*\*\*  Error:SSE instruction `addpd' is used
+.*  Error: SSE instruction `addpd' is used
 [ 	]*11[ 	]+
 [ 	]*12[ 	]+\# SSE3 instruction
 [ 	]*13[ 	]+\?\?\?\? 660FD0CA 		addsubpd %xmm2,%xmm1
-\*\*\*\*  Error:SSE instruction `addsubpd' is used
+.*  Error: SSE instruction `addsubpd' is used
 [ 	]*14[ 	]+
 [ 	]*15[ 	]+\# SSSE3 instruction
 [ 	]*16[ 	]+\?\?\?\? 660F3801 		phaddw %xmm2,%xmm1
-\*\*\*\*  Error:SSE instruction `phaddw' is used
+.*  Error: SSE instruction `phaddw' is used
 [ 	]*16[ 	]+CA
 [ 	]*17[ 	]+
 [ 	]*18[ 	]+\# SSE4 instructions
 [ 	]*19[ 	]+\?\?\?\? 660F3815 		blendvpd %xmm0,%xmm1,%xmm0
-\*\*\*\*  Error:SSE instruction `blendvpd' is used
+.*  Error: SSE instruction `blendvpd' is used
 [ 	]*19[ 	]+C1
 [ 	]*20[ 	]+\?\?\?\? 660F3837 		pcmpgtq %xmm1,%xmm0
-\*\*\*\*  Error:SSE instruction `pcmpgtq' is used
+.*  Error: SSE instruction `pcmpgtq' is used
 [ 	]*20[ 	]+C1
diff --git a/gas/testsuite/gas/i386/x86-64-mpx-inval-1.l b/gas/testsuite/gas/i386/x86-64-mpx-inval-1.l
index e78ab7c..16b3aff 100644
--- a/gas/testsuite/gas/i386/x86-64-mpx-inval-1.l
+++ b/gas/testsuite/gas/i386/x86-64-mpx-inval-1.l
@@ -14,20 +14,20 @@ GAS LISTING .*
 [ 	]*2[ 	]+\.allow_index_reg
 [ 	]*3[ 	]+\.text
 [ 	]*4[ 	]+\?\?\?\? F24801C3 		bnd add %rax, %rbx  		\# Bad
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*5[ 	]+\?\?\?\? 6766F2AB 		bnd stosw \(%edi\)    		\# Bad
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*6[ 	]+\?\?\?\? F2E200   		bnd loop foo
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*7[ 	]+\?\?\?\? F2E300   		bnd jrcxz foo
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*8[ 	]+
 [ 	]*9[ 	]+\.intel_syntax noprefix
 [ 	]*10[ 	]+\?\?\?\? F24801C3 		bnd add rbx, rax		\# Bad
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*11[ 	]+\?\?\?\? 6766F2AB 		bnd stos WORD PTR \[edi]		\# Bad
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*12[ 	]+\?\?\?\? F2E200   		bnd loop foo
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
 [ 	]*13[ 	]+\?\?\?\? F2E300   		bnd jrcxz foo
-\*\*\*\*  Error:expecting valid branch instruction after `bnd'
+.*  Error: expecting valid branch instruction after `bnd'
diff --git a/gas/testsuite/gas/i386/x86-64-mpx-inval-2.l b/gas/testsuite/gas/i386/x86-64-mpx-inval-2.l
index 820d87a..c7be066 100644
--- a/gas/testsuite/gas/i386/x86-64-mpx-inval-2.l
+++ b/gas/testsuite/gas/i386/x86-64-mpx-inval-2.l
@@ -40,57 +40,57 @@ GAS LISTING .*
 [ 	]*4[ 	]+
 [ 	]*5[ 	]+\#\#\# bndmk
 [ 	]*6[ 	]+\?\?\?\? 67F30F1B 		bndmk \(%eax\), %bnd1
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*6[ 	]+08
 [ 	]*7[ 	]+\?\?\?\? 67F30F1B 		bndmk 0x3\(%ecx,%ebx,1\), %bnd1
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*7[ 	]+4C1903
 [ 	]*8[ 	]+
 [ 	]*9[ 	]+\#\#\# bndmov
 [ 	]*10[ 	]+\?\?\?\? 6766410F 		bndmov \(%r8d\), %bnd1
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*10[ 	]+1A08
 [ 	]*11[ 	]+\?\?\?\? 6766410F 		bndmov 0x3\(%r9d,%edx,1\), %bnd1
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*11[ 	]+1A4C1103 
 [ 	]*12[ 	]+
 [ 	]*13[ 	]+\?\?\?\? 67660F1B 		bndmov %bnd1, \(%eax\)
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*13[ 	]+08
 [ 	]*14[ 	]+\?\?\?\? 67660F1B 		bndmov %bnd1, 0x3\(%ecx,%eax,1\)
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*14[ 	]+4C0103
 [ 	]*15[ 	]+
 [ 	]*16[ 	]+\#\#\# bndcl
 [ 	]*17[ 	]+\?\?\?\? 67F30F1A 		bndcl \(%ecx\), %bnd1
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*17[ 	]+09
 [ 	]*18[ 	]+\?\?\?\? 67F30F1A 		bndcl 0x3\(%ecx,%eax,1\), %bnd1
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*18[ 	]+4C0103
 [ 	]*19[ 	]+
 [ 	]*20[ 	]+\#\#\# bndcu
 [ 	]*21[ 	]+\?\?\?\? 67F20F1A 		bndcu \(%ecx\), %bnd1
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*21[ 	]+09
 [ 	]*22[ 	]+\?\?\?\? 67F20F1A 		bndcu 0x3\(%ecx,%eax,1\), %bnd1
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*22[ 	]+4C0103
 [ 	]*23[ 	]+
 [ 	]*24[ 	]+\#\#\# bndcn
 [ 	]*25[ 	]+\?\?\?\? 67F20F1B 		bndcn \(%ecx\), %bnd1
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*25[ 	]+09
 [ 	]*26[ 	]+\?\?\?\? 67F20F1B 		bndcn 0x3\(%ecx,%eax,1\), %bnd1
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*26[ 	]+4C0103
 [ 	]*27[ 	]+
 [ 	]*28[ 	]+\#\#\# bndstx
 [ 	]*29[ 	]+\?\?\?\? 670F1B44 		bndstx %bnd0, 0x3\(%eax,%ebx,1\)
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*29[ 	]+1803
 [ 	]*30[ 	]+\?\?\?\? 670F1B53 		bndstx %bnd2, 3\(%ebx,1\)
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 \fGAS LISTING .*
 
 
@@ -98,57 +98,57 @@ GAS LISTING .*
 [ 	]*31[ 	]+
 [ 	]*32[ 	]+\#\#\# bndldx
 [ 	]*33[ 	]+\?\?\?\? 670F1A44 		bndldx 0x3\(%eax,%ebx,1\), %bnd0
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*33[ 	]+1803
 [ 	]*34[ 	]+\?\?\?\? 670F1A53 		bndldx 3\(%ebx,1\), %bnd2
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*34[ 	]+03
 [ 	]*35[ 	]+
 [ 	]*36[ 	]+\.intel_syntax noprefix
 [ 	]*37[ 	]+\?\?\?\? 67F30F1B 		bndmk bnd1, \[eax\]
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*37[ 	]+08
 [ 	]*38[ 	]+\?\?\?\? 67F30F1B 		bndmk bnd1, \[edx\+1\*eax\+0x3\]
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*38[ 	]+4C0203
 [ 	]*39[ 	]+
 [ 	]*40[ 	]+\#\#\# bndmov
 [ 	]*41[ 	]+\?\?\?\? 67660F1A 		bndmov bnd1, \[eax\]
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*41[ 	]+08
 [ 	]*42[ 	]+\?\?\?\? 67660F1A 		bndmov bnd1, \[edx\+1\*eax\+0x3\]
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*42[ 	]+4C0203
 [ 	]*43[ 	]+
 [ 	]*44[ 	]+\?\?\?\? 67660F1B 		bndmov \[eax\], bnd1
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*44[ 	]+08
 [ 	]*45[ 	]+\?\?\?\? 67660F1B 		bndmov \[edx\+1\*eax\+0x3\], bnd1
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*45[ 	]+4C0203
 [ 	]*46[ 	]+
 [ 	]*47[ 	]+\#\#\# bndcl
 [ 	]*48[ 	]+\?\?\?\? 67F30F1A 		bndcl bnd1, \[eax\]
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*48[ 	]+08
 [ 	]*49[ 	]+\?\?\?\? 67F30F1A 		bndcl bnd1, \[edx\+1\*eax\+0x3\]
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*49[ 	]+4C0203
 [ 	]*50[ 	]+
 [ 	]*51[ 	]+\#\#\# bndcu
 [ 	]*52[ 	]+\?\?\?\? 67F20F1A 		bndcu bnd1, \[eax\]
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*52[ 	]+08
 [ 	]*53[ 	]+\?\?\?\? 67F20F1A 		bndcu bnd1, \[edx\+1\*eax\+0x3\]
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*53[ 	]+4C0203
 [ 	]*54[ 	]+
 [ 	]*55[ 	]+\#\#\# bndcn
 [ 	]*56[ 	]+\?\?\?\? 67F20F1B 		bndcn bnd1, \[eax\]
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*56[ 	]+08
 [ 	]*57[ 	]+\?\?\?\? 67F20F1B 		bndcn bnd1, \[edx\+1\*eax\+0x3\]
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*57[ 	]+4C0203
 [ 	]*58[ 	]+
 \fGAS LISTING .*
@@ -156,18 +156,18 @@ GAS LISTING .*
 
 [ 	]*59[ 	]+\#\#\# bndstx
 [ 	]*60[ 	]+\?\?\?\? 670F1B44 		bndstx \[eax\+ebx\*1\+0x3\], bnd0
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*60[ 	]+1803
 [ 	]*61[ 	]+\?\?\?\? 670F1B14 		bndstx \[1\*ebx\+3\], bnd2
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*61[ 	]+1D030000 
 [ 	]*61[ 	]+00
 [ 	]*62[ 	]+
 [ 	]*63[ 	]+\#\#\# bndldx
 [ 	]*64[ 	]+\?\?\?\? 670F1A44 		bndldx bnd0, \[eax\+ebx\*1\+0x3\]
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*64[ 	]+1803
 [ 	]*65[ 	]+\?\?\?\? 670F1A14 		bndldx bnd2, \[1\*ebx\+3\]
-\*\*\*\*  Error:32-bit address isn't allowed in 64-bit MPX instructions\.
+.*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*65[ 	]+1D030000 
 [ 	]*65[ 	]+00
diff --git a/gas/testsuite/gas/i386/x86-64-size-inval-1.l b/gas/testsuite/gas/i386/x86-64-size-inval-1.l
index 856174d..1d60ac1 100644
--- a/gas/testsuite/gas/i386/x86-64-size-inval-1.l
+++ b/gas/testsuite/gas/i386/x86-64-size-inval-1.l
@@ -19,7 +19,7 @@ GAS LISTING .*
 [ 	]*9[ 	]+\.data
 [ 	]*10[ 	]+\?\?\?\? 5E000000 		\.long	xxx@SIZE \+ 100
 [ 	]*11[ 	]+\?\?\?\? ECFFFFFF 		\.long	yyy@SIZE - 100
-\*\*\*\*  Error:symbol size computation overflow
-\*\*\*\*  Error:symbol size computation overflow
-\*\*\*\*  Error:symbol size computation overflow
-\*\*\*\*  Error:symbol size computation overflow
+.*  Error: symbol size computation overflow
+.*  Error: symbol size computation overflow
+.*  Error: symbol size computation overflow
+.*  Error: symbol size computation overflow
diff --git a/gas/testsuite/gas/i386/x86-64-sse-check-error.l b/gas/testsuite/gas/i386/x86-64-sse-check-error.l
index bd1c4f6..5df6d67 100644
--- a/gas/testsuite/gas/i386/x86-64-sse-check-error.l
+++ b/gas/testsuite/gas/i386/x86-64-sse-check-error.l
@@ -16,25 +16,25 @@ GAS LISTING .*
 [ 	]*5[ 	]+
 [ 	]*6[ 	]+\# SSE instruction
 [ 	]*7[ 	]+\?\?\?\? 0F58CA   		addps %xmm2,%xmm1
-\*\*\*\*  Error:SSE instruction `addps' is used
+.*  Error: SSE instruction `addps' is used
 [ 	]*8[ 	]+
 [ 	]*9[ 	]+\# SSE2 instruction
 [ 	]*10[ 	]+\?\?\?\? 660F58CA 		addpd %xmm2,%xmm1
-\*\*\*\*  Error:SSE instruction `addpd' is used
+.*  Error: SSE instruction `addpd' is used
 [ 	]*11[ 	]+
 [ 	]*12[ 	]+\# SSE3 instruction
 [ 	]*13[ 	]+\?\?\?\? 660FD0CA 		addsubpd %xmm2,%xmm1
-\*\*\*\*  Error:SSE instruction `addsubpd' is used
+.*  Error: SSE instruction `addsubpd' is used
 [ 	]*14[ 	]+
 [ 	]*15[ 	]+\# SSSE3 instruction
 [ 	]*16[ 	]+\?\?\?\? 660F3801 		phaddw %xmm2,%xmm1
-\*\*\*\*  Error:SSE instruction `phaddw' is used
+.*  Error: SSE instruction `phaddw' is used
 [ 	]*16[ 	]+CA
 [ 	]*17[ 	]+
 [ 	]*18[ 	]+\# SSE4 instructions
 [ 	]*19[ 	]+\?\?\?\? 660F3815 		blendvpd %xmm0,%xmm1,%xmm0
-\*\*\*\*  Error:SSE instruction `blendvpd' is used
+.*  Error: SSE instruction `blendvpd' is used
 [ 	]*19[ 	]+C1
 [ 	]*20[ 	]+\?\?\?\? 660F3837 		pcmpgtq %xmm1,%xmm0
-\*\*\*\*  Error:SSE instruction `pcmpgtq' is used
+.*  Error: SSE instruction `pcmpgtq' is used
 [ 	]*20[ 	]+C1


-- 
Alan Modra
Australia Development Lab, IBM