diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2011-02-25 13:45:53 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2011-02-25 13:45:53 +0000 |
| commit | a45723bf2868c90f016ee009db656dcbe172c345 (patch) | |
| tree | 10b37519308d62eb5d968a33702bc0dfffd752a2 /gas/config/obj-elf.c | |
| parent | 858b940d92d83e21e667170444808665407063d3 (diff) | |
| download | binutils-redhat-a45723bf2868c90f016ee009db656dcbe172c345.tar.gz | |
PR gas/12519
* config/obj-elf.c (elf_frob_symbol): Properly handle size expression.
* ld-mn10300/i135409-3.s: Correct .size label reference.
* ld-sh/sh64/stolib.s: Likewise.
Diffstat (limited to 'gas/config/obj-elf.c')
| -rw-r--r-- | gas/config/obj-elf.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c index c6dc8d6e54..969a5091e8 100644 --- a/gas/config/obj-elf.c +++ b/gas/config/obj-elf.c @@ -1,6 +1,6 @@ /* ELF object file format Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -1889,23 +1889,11 @@ elf_frob_symbol (symbolS *symp, int *puntp) if (sy_obj->size != NULL) { - switch (sy_obj->size->X_op) - { - case O_subtract: - S_SET_SIZE (symp, - (S_GET_VALUE (sy_obj->size->X_add_symbol) - + sy_obj->size->X_add_number - - S_GET_VALUE (sy_obj->size->X_op_symbol))); - break; - case O_constant: - S_SET_SIZE (symp, - (S_GET_VALUE (sy_obj->size->X_add_symbol) - + sy_obj->size->X_add_number)); - break; - default: - as_bad (_(".size expression too complicated to fix up")); - break; - } + if (resolve_expression (sy_obj->size) + && sy_obj->size->X_op == O_constant) + S_SET_SIZE (symp, sy_obj->size->X_add_number); + else + as_bad (_(".size expression does not evaluate to a constant")); free (sy_obj->size); sy_obj->size = NULL; } |