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 83d9f6b20bebb42cc7ffc7a2ccbf887073184646..28f5c530fc9a45306365eae02284465e0eb8163b 100644 (file)
--- 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 0f3d507d9f847576264e7db8d9ca35e71f050cfe..af98bada6a866e6dd87f3f7ddf30b14fcf302e09 100644 (file)
--- 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 4f3e09d83417e65e75852c382130a63c4dc31330..7f91b24a99fcaa069f3ea736672f6868788a8696 100644 (file)
--- 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 603846057e113899a5afd3b977e08a0250bf3e94..05f79afdd22097c8aa102de4a7a47ededf7b72f3 100644 (file)
--- 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 a68198121a6c93e2dcb1b9721ea18feba6120a4e..d2955391dd2eb55b3a3bcc7f8785400e240003a6 100644 (file)
--- 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