darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Mention symbol name in non-constant .size expression.

Browse source 
gas/

2011-03-05  H.J. Lu  <hongjiu.lu@intel.com>

	* config/obj-elf.c (elf_frob_symbol): Mention symbol name in
	non-constant .size expression.

gas/testsuite/

2011-03-05  H.J. Lu  <hongjiu.lu@intel.com>

	* gas/elf/bad-size.err: Updated.
This commit is contained in:
H.J. Lu 2011-03-06 14:05:25 +00:00
parent e51411190f
commit 49002d7f0e
4 changed files with 53 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gas/ChangeLog
View file

@ -1,3 +1,8 @@
2011-03-05 H.J. Lu <hongjiu.lu@intel.com>
* config/obj-elf.c (elf_frob_symbol): Mention symbol name in
non-constant .size expression.
2011-03-02 Nick Clifton <nickc@redhat.com>
* ecoff.c: Incldue filenames.h

48
gas/config/obj-elf.c
View file

@ -1879,6 +1879,7 @@ void
elf_frob_symbol (symbolS *symp, int *puntp)
{
struct elf_obj_sy *sy_obj;
expressionS *size;
#ifdef NEED_ECOFF_DEBUG
if (ECOFF_DEBUGGING)
@ -1887,13 +1888,50 @@ elf_frob_symbol (symbolS *symp, int *puntp)
sy_obj = symbol_get_obj (symp);
if (sy_obj->size != NULL)
size = sy_obj->size;
if (size != NULL)
{
if (resolve_expression (sy_obj->size)
&& sy_obj->size->X_op == O_constant)
S_SET_SIZE (symp, sy_obj->size->X_add_number);
if (resolve_expression (size)
&& size->X_op == O_constant)
S_SET_SIZE (symp, size->X_add_number);
else
as_bad (_(".size expression does not evaluate to a constant"));
{
const char *op_name = NULL;
const char *add_name = NULL;
if (size->X_op == O_subtract)
{
op_name = S_GET_NAME (size->X_op_symbol);
add_name = S_GET_NAME (size->X_add_symbol);
if (strcmp (op_name, FAKE_LABEL_NAME) == 0)
op_name = NULL;
if (strcmp (add_name, FAKE_LABEL_NAME) == 0)
add_name = NULL;
if (op_name && add_name)
as_bad (_(".size expression with symbols `%s' and `%s' "
"does not evaluate to a constant"),
op_name, add_name);
else
{
const char *name;
if (op_name)
name = op_name;
else if (add_name)
name = add_name;
else
name = NULL;
if (name)
as_bad (_(".size expression with symbol `%s' "
"does not evaluate to a constant"), name);
}
}
if (!op_name && !add_name)
as_bad (_(".size expression does not evaluate to a constant"));
}
free (sy_obj->size);
sy_obj->size = NULL;
}

4
gas/testsuite/ChangeLog
View file

@ -1,3 +1,7 @@
2011-03-05 H.J. Lu <hongjiu.lu@intel.com>
* gas/elf/bad-size.err: Updated.
2011-02-28 Maciej W. Rozycki <macro@codesourcery.com>
* gas/mips/alnv_ps-swap.d: New test for ALNV.PS instruction

2
gas/testsuite/gas/elf/bad-size.err
View file

@ -1,2 +1,2 @@
.*bad-size\.s: Assembler messages:
.*bad-size\.s:6: Error: .*
.*bad-size\.s:6: Error:.*`_test_nop'.*