This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
PATCH: Mention symbol name in non-constant .size expression
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: binutils at sourceware dot org
- Cc: Alan Modra <amodra at gmail dot com>
- Date: Sat, 5 Mar 2011 07:32:49 -0800
- Subject: PATCH: Mention symbol name in non-constant .size expression
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
Hi,
The error message in non-constant .size expression doesn't show
the correct line number nor symbol names. It is hard to get the
line number right. This patch displays symbol name in non-constant
.size expression. It will help users identify the assembly code bugs.
OK to install?
Thanks.
H.J.
---
diff --git a/gas/ChangeLog.intel b/gas/ChangeLog.intel
index 8eb236d..38ee6a2 100644
--- a/gas/ChangeLog.intel
+++ b/gas/ChangeLog.intel
@@ -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.
+
2010-03-08 Alan Modra <amodra@gmail.com>
PR gas/11356
diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c
index 969a509..d43409a 100644
--- a/gas/config/obj-elf.c
+++ b/gas/config/obj-elf.c
@@ -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;
}
diff --git a/gas/testsuite/ChangeLog.intel b/gas/testsuite/ChangeLog.intel
index 47d7048..602730c 100644
--- a/gas/testsuite/ChangeLog.intel
+++ b/gas/testsuite/ChangeLog.intel
@@ -1,3 +1,7 @@
+2011-03-05 H.J. Lu <hongjiu.lu@intel.com>
+
+ * gas/elf/bad-size.err: Updated.
+
2010-03-08 H.J. Lu <hongjiu.lu@intel.com>
PR gas/9966
diff --git a/gas/testsuite/gas/elf/bad-size.err b/gas/testsuite/gas/elf/bad-size.err
index 5e01ef2..a5bfc31 100644
--- a/gas/testsuite/gas/elf/bad-size.err
+++ b/gas/testsuite/gas/elf/bad-size.err
@@ -1,2 +1,2 @@
.*bad-size\.s: Assembler messages:
-.*bad-size\.s:6: Error: .*
+.*bad-size\.s:6: Error:.*`_test_nop'.*