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.
This commit is contained in:
Jan Beulich 2006-02-28 07:57:09 +00:00
parent 0e31b3e1a3
commit 9f6f925e1e
5 changed files with 14 additions and 6 deletions

View File

@ -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

View File

@ -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
{

View File

@ -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.

View File

@ -1,5 +1,5 @@
.macro m1 str
.ascii &str
.ascii "&str"
.endm
.data

View File

@ -20,7 +20,7 @@ m2 1, 3
m2 9, 27
m3 "abc"
m3 <123>
m3 <"1", "23">
.noaltmacro