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 83d9f6b..28f5c53 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,9 @@
 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
        * macro.c (getstring): Don't treat parentheses special anymore.
        (get_any_string): Don't consider '(' and ')' as quoting anymore.

diff --git a/gas/macro.c b/gas/macro.c
index 0f3d507..af98bad 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 4f3e09d..7f91b24 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 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.
        * gas/macros/macros.exp: Run new test.
 

diff --git a/gas/testsuite/gas/all/altmac2.s b/gas/testsuite/gas/all/altmac2.s
index 6038460..05f79af 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 a681981..d295539 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