From: Jan Beulich <jbeulich@novell.com>
Date: Wed, 27 Aug 2008 16:24:32 +0000 (+0000)
Subject: gas/
X-Git-Tag: binutils-2_19-branchpoint~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a87af0274f157bcf2d579dbb05bff098ba56693f;p=thirdparty%2Fbinutils-gdb.git

gas/
2008-08-27  Jan Beulich  <jbeulich@novell.com>

	* config/tc-i386.c (check_string): Use register_prefix for error
	message.
	(process_operands): Likewise.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ebf6828a29c..5e636250769 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Jan Beulich  <jbeulich@novell.com>
+
+	* config/tc-i386.c (check_string): Use register_prefix for error
+	message.
+	(process_operands): Likewise.
+
 2008-08-26  Mark Mitchell  <mark@codesourcery.com>
 
 	* c-arm.texi: Add tutorial on ARM unwinding pseudo ops.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 29ad7afa348..3083f28085f 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -3861,9 +3861,10 @@ check_string (void)
     {
       if (i.seg[0] != NULL && i.seg[0] != &es)
 	{
-	  as_bad (_("`%s' operand %d must use `%%es' segment"),
+	  as_bad (_("`%s' operand %d must use `%ses' segment"),
 		  i.tm.name,
-		  mem_op + 1);
+		  mem_op + 1,
+		  register_prefix);
 	  return 0;
 	}
       /* There's only ever one segment override allowed per instruction.
@@ -3876,9 +3877,10 @@ check_string (void)
     {
       if (i.seg[1] != NULL && i.seg[1] != &es)
 	{
-	  as_bad (_("`%s' operand %d must use `%%es' segment"),
+	  as_bad (_("`%s' operand %d must use `%ses' segment"),
 		  i.tm.name,
-		  mem_op + 2);
+		  mem_op + 2,
+		  register_prefix);
 	  return 0;
 	}
     }
@@ -4957,7 +4959,7 @@ duplicate:
 	  if (i.tm.base_opcode == POP_SEG_SHORT
 	      && i.op[0].regs->reg_num == 1)
 	    {
-	      as_bad (_("you can't `pop %%cs'"));
+	      as_bad (_("you can't `pop %scs'"), register_prefix);
 	      return 0;
 	    }
 	  i.tm.base_opcode |= (i.op[0].regs->reg_num << 3);