Fix whitespace in gas listing errors and warnings

gas/
	* listing.c (listing_warning, listing_error): Add space after colon.
	* messages.c (as_warn_internal, as_bad_internal): Use the same
	string as above.
gas/testsuite/
	* gas/d30v/bittest.l: Update for changed whitespace.
	* gas/d30v/serial.l: Likewise.
	* gas/d30v/serial2.l: Likewise.
	* gas/d30v/serial2O.l: Likewise.
	* gas/d30v/warn_oddreg.l: Likewise.
	* gas/i386/inval-equ-2.l: Likewise.
	* gas/i386/mpx-inval-1.l: Likewise.
	* gas/i386/sse-check-error.l: Likewise.
	* gas/i386/x86-64-mpx-inval-1.l: Likewise.
	* gas/i386/x86-64-mpx-inval-2.l: Likewise.
	* gas/i386/x86-64-size-inval-1.l: Likewise.
	* gas/i386/x86-64-sse-check-error.l: Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 064b8cf73c9ed70ff24eded71a77f95e3090d918..98186d3242686dc3b8177d6da77ea3c85aae44a1 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-22  Alan Modra  <amodra@gmail.com>
+
+       * listing.c (listing_warning, listing_error): Add space after colon.
+       * messages.c (as_warn_internal, as_bad_internal): Use the same
+       string as above.
+
 2014-05-20  Matthew Fortune  <matthew.fortune@imgtec.com>
 
        * config/tc-mips.c (file_mips_opts_checked): New static global.

diff --git a/gas/listing.c b/gas/listing.c
index 24450cfe1e34e86360a211b913cd1d7ee5f48dac..0192dd0f714ed933d7db9b468cd1946092f91b90 100644 (file)
--- 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 d592b36a687fa899f3adb1594c4ac264b6cf8069..2865c9dab5157ebe85df2b00a2c34c74f32bef80 100644 (file)
--- 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/ChangeLog b/gas/testsuite/ChangeLog
index b027f53edcee7e6ef56147420e4cee84445e2a9a..855add8e3c14271836a381cdc966d790b3e62eda 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2014-05-22  Alan Modra  <amodra@gmail.com>
+
+       * gas/d30v/bittest.l: Update for changed whitespace.
+       * gas/d30v/serial.l: Likewise.
+       * gas/d30v/serial2.l: Likewise.
+       * gas/d30v/serial2O.l: Likewise.
+       * gas/d30v/warn_oddreg.l: Likewise.
+       * gas/i386/inval-equ-2.l: Likewise.
+       * gas/i386/mpx-inval-1.l: Likewise.
+       * gas/i386/sse-check-error.l: Likewise.
+       * gas/i386/x86-64-mpx-inval-1.l: Likewise.
+       * gas/i386/x86-64-mpx-inval-2.l: Likewise.
+       * gas/i386/x86-64-size-inval-1.l: Likewise.
+       * gas/i386/x86-64-sse-check-error.l: Likewise.
+
 2014-05-20  Matthew Fortune  <matthew.fortune@imgtec.com>
 
        * gas/mips/mips.exp: Add new tests.  Use 64-bit ABI for relax-bc1any.

diff --git a/gas/testsuite/gas/d30v/bittest.l b/gas/testsuite/gas/d30v/bittest.l
index 250003f919463a0a3efdf835011a576dd0977b33..c3d029ca2acebd2264bb5270bbcbb35cddd871b3 100644 (file)
--- 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 84b475d3c06365b447d1576e77b783fa8a5e82a1..8ee33bf8673265ac8adcdc08b3b3751deead388f 100644 (file)
--- 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 a799bb906c08568a8cbaf15b03f1f1e3aac32b8f..327c0f3b22f82d713f8ae1f93ec8882dd69e9fc5 100644 (file)
--- 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 dc5b9c785741e964c5d93ab91528c0efeacef9de..ed7e71ded33e595a6da9ab9fa9023e4be82bfff0 100644 (file)
--- 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 f1fb43cb2ca97909b72ab4a29318d1693c706fdc..3b9d2dddcfcc3c322d78d652a216858509429cba 100644 (file)
--- 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 7a4f483989dedc4d89fd36832b0605194de09472..eafaf2540527b96f0c20d236580afe712cd83e00 100644 (file)
--- 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 41de5a0df9aca6edae7d7db327e27bc2674ae033..121aad6c9ac37b3c10711c6409d199ca90d4a181 100644 (file)
--- 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 bd1c4f697fa4bd977a5c68f67557b0860a95972d..5df6d6713858a6c00da57930e9483154051c8755 100644 (file)
--- 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 e78ab7c150c5b53463bdb69cb87bf5c851c33cdf..16b3aff95a28c38c4f46f7fb2b9ab2dabd8f9f4d 100644 (file)
--- 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 820d87a90ae4f9531b241c94abfc161862772765..c7be066ffe6b6241658199714f68039c8f475c69 100644 (file)
--- 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 856174d6ca8da30ef3ccc7eda692092abbea7325..1d60ac1397fee087d7f6c911672e28196890f9e9 100644 (file)
--- 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 bd1c4f697fa4bd977a5c68f67557b0860a95972d..5df6d6713858a6c00da57930e9483154051c8755 100644 (file)
--- 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