From: Jan Beulich <jbeulich@novell.com>
Date: Tue, 28 Feb 2006 07:57:09 +0000 (+0000)
Subject: gas/
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=9f6f925e1e1a5aee784d0e04663e3c7a4dc76f55;p=deliverable%2Fbinutils-gdb.git

gas/
2006-02-28  Jan Beulich  <jbeulich@novell.com>

	* macro.c (get_any_string): Don't insert quotes for <>-quoted input.

gas/testsuite/
2006-02-28  Jan Beulich  <jbeulich@novell.com>

	* gas/all/altmacro.s: Adjust.
	* gas/all/altmac2.s: Adjust.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 83d9f6b20b..28f5c530fc 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-28  Jan Beulich  <jbeulich@novell.com>
+
+	* macro.c (get_any_string): Don't insert quotes for <>-quoted input.
+
 2006-02-28  Jan Beulich  <jbeulich@novell.com>
 
 	PR/1070
diff --git a/gas/macro.c b/gas/macro.c
index 0f3d507d9f..af98bada6a 100644
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -415,13 +415,12 @@ get_any_string (int idx, sb *in, sb *out)
 	       || (in->ptr[idx] == '<' && (macro_alternate || macro_mri))
 	       || (macro_alternate && in->ptr[idx] == '\''))
 	{
-	  if (macro_alternate && ! macro_strip_at)
+	  if (macro_alternate && ! macro_strip_at && in->ptr[idx] != '<')
 	    {
 	      /* Keep the quotes.  */
-	      sb_add_char (out, '\"');
-
+	      sb_add_char (out, '"');
 	      idx = getstring (idx, in, out);
-	      sb_add_char (out, '\"');
+	      sb_add_char (out, '"');
 	    }
 	  else
 	    {
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 4f3e09d834..7f91b24a99 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-28  Jan Beulich  <jbeulich@novell.com>
+
+	* gas/all/altmacro.s: Adjust.
+	* gas/all/altmac2.s: Adjust.
+
 2006-02-28  Jan Beulich  <jbeulich@novell.com>
 
 	* gas/macros/paren[sd]: New.
diff --git a/gas/testsuite/gas/all/altmac2.s b/gas/testsuite/gas/all/altmac2.s
index 603846057e..05f79afdd2 100644
--- a/gas/testsuite/gas/all/altmac2.s
+++ b/gas/testsuite/gas/all/altmac2.s
@@ -1,5 +1,5 @@
 .macro	m1 str
-	.ascii	&str
+	.ascii	"&str"
 .endm
 
 	.data
diff --git a/gas/testsuite/gas/all/altmacro.s b/gas/testsuite/gas/all/altmacro.s
index a68198121a..d2955391dd 100644
--- a/gas/testsuite/gas/all/altmacro.s
+++ b/gas/testsuite/gas/all/altmacro.s
@@ -20,7 +20,7 @@ m2	1, 3
 m2	9, 27
 
 m3	"abc"
-m3	<123>
+m3	<"1", "23">
 
 	.noaltmacro