FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* configure.in (i386-go32): When it's a host set

Browse source 
host_makefile_frag.
	* gasp.c  (get_any_string): Fix handling of % when in PharLap
	mode.
This commit is contained in:
Steve Chamberlain 1994-06-28 01:20:04 +00:00
parent 1b01afe630
commit 40b559d27f
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gas/gasp.c
View file

@ -1699,10 +1699,11 @@ do_form (idx, in)
} }
int int
get_any_string (idx, in, out) get_any_string (idx, in, out, expand)
int idx; int idx;
sb *in; sb *in;
sb *out; sb *out;
int expand;
{ {
sb_reset (out); sb_reset (out);
idx = sb_skip_white (idx, in); idx = sb_skip_white (idx, in);
@ -1711,7 +1712,8 @@ get_any_string (idx, in, out)
if (idx < in->len) if (idx < in->len)
{ {
if (in->ptr[idx] == '%' if (in->ptr[idx] == '%'
&& alternate) && alternate
&& expand)
{ {
int val; int val;
char buf[20]; char buf[20];
@ -1720,19 +1722,19 @@ get_any_string (idx, in, out)
idx + 1, idx + 1,
in, in,
&val); &val);
sprintf(buf, "\"%d\"", val); sprintf(buf, "%d", val);
sb_add_string (out, buf); sb_add_string (out, buf);
} }
else if (in->ptr[idx] == '"' else if (in->ptr[idx] == '"'
|| in->ptr[idx] == '<' || in->ptr[idx] == '<'
|| (alternate && in->ptr[idx] == '\'')) || (alternate && in->ptr[idx] == '\''))
{ {
if (alternate) if (alternate && !expand)
{ {
/* Keep the quotes */ /* Keep the quotes */
sb_add_char (out, '\"'); /* sb_add_char (out, '\"');*/
idx = getstring (idx, in, out); idx = getstring (idx, in, out);
sb_add_char (out, '\"'); /* sb_add_char (out, '\"');*/
} }
else { else {
@ -1990,7 +1992,7 @@ get_and_process (idx, in, out)
{ {
sb t; sb t;
sb_new (&t); sb_new (&t);
idx = get_any_string (idx, in, &t); idx = get_any_string (idx, in, &t, 1);
process_assigns (0, &t, out); process_assigns (0, &t, out);
sb_kill (&t); sb_kill (&t);
return idx; return idx;
@ -2674,7 +2676,7 @@ do_formals (macro, idx, in)
if (idx < in->len && in->ptr[idx] == '=') if (idx < in->len && in->ptr[idx] == '=')
{ {
/* Got a default */ /* Got a default */
idx = get_any_string (idx + 1, in, &formal->def); idx = get_any_string (idx + 1, in, &formal->def, 1);
} }
} }
@ -2786,6 +2788,9 @@ get_token (idx, in, name)
sb_add_char (name, in->ptr[idx++]); sb_add_char (name, in->ptr[idx++]);
} }
} }
/* Ignore trailing & */
if (alternate && idx < in->len && in->ptr[idx] == '&')
idx++;
return idx; return idx;
} }
@ -2872,9 +2877,9 @@ macro_expand (name, idx, in, m)
scan = idx; scan = idx;
while (scan < in->len while (scan < in->len
&& !ISSEP (in->ptr[scan]) && !ISSEP (in->ptr[scan])
&& in->ptr[scan] != '=') && (!alternate && in->ptr[scan] != '='))
scan++; scan++;
if (scan < in->len && in->ptr[scan] == '=') if (scan < in->len && (!alternate) && in->ptr[scan] == '=')
{ {
is_keyword = 1; is_keyword = 1;
if (is_positional) if (is_positional)
@ -2900,7 +2905,7 @@ macro_expand (name, idx, in, m)
{ {
/* Insert this value into the right place */ /* Insert this value into the right place */
sb_reset (&ptr->value.f->actual); sb_reset (&ptr->value.f->actual);
idx = get_any_string (idx + 1, in, &ptr->value.f->actual); idx = get_any_string (idx + 1, in, &ptr->value.f->actual, 0);
} }
} }
else else
@ -2919,7 +2924,7 @@ macro_expand (name, idx, in, m)
} }
sb_reset (&f->actual); sb_reset (&f->actual);
idx = get_any_string (idx, in, &f->actual); idx = get_any_string (idx, in, &f->actual, 1);
f = f->next; f = f->next;
} }
idx = sb_skip_comma (idx, in); idx = sb_skip_comma (idx, in);
@ -3154,7 +3159,7 @@ do_sdata (idx, in, type)
idx = sb_skip_white (idx, in); idx = sb_skip_white (idx, in);
while (!eol (idx, in)) while (!eol (idx, in))
{ {
pidx = idx = get_any_string (idx, in, &acc); pidx = idx = get_any_string (idx, in, &acc, 1);
if (type == 'c') if (type == 'c')
{ {
if (acc.len > 255) if (acc.len > 255)