diff options
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/obj-elf.c | 24 | ||||
| -rw-r--r-- | ld/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-mn10300/i135409-3.s | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-sh/sh64/stolib.s | 2 |
5 files changed, 18 insertions, 20 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 73ee82a..b90e75f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2011-02-25 Alan Modra <amodra@gmail.com> + + PR gas/12519 + * config/obj-elf.c (elf_frob_symbol): Properly handle size expression. + 2011-02-21 Maciej W. Rozycki <macro@codesourcery.com> * config/tc-mips.c (mips_ip) <'o'>: Remove duplicate diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c index c6dc8d6..969a509 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; } diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 1de772b..b7de27d 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-02-25 Alan Modra <amodra@gmail.com> + + * ld-mn10300/i135409-3.s: Correct .size label reference. + * ld-sh/sh64/stolib.s: Likewise. + 2011-02-23 H.J. Lu <hongjiu.lu@intel.com> * ld-elf/new.cc: Don't include <exception_defines.h>. diff --git a/ld/testsuite/ld-mn10300/i135409-3.s b/ld/testsuite/ld-mn10300/i135409-3.s index e83ad96..8113b78 100644 --- a/ld/testsuite/ld-mn10300/i135409-3.s +++ b/ld/testsuite/ld-mn10300/i135409-3.s @@ -10,7 +10,7 @@ A: BOTTOM: .balign 0x8 add D0,D1 - .size _func, .-func + .size _func, .-_func .data L001: diff --git a/ld/testsuite/ld-sh/sh64/stolib.s b/ld/testsuite/ld-sh/sh64/stolib.s index 587faa6..a5dee2b 100644 --- a/ld/testsuite/ld-sh/sh64/stolib.s +++ b/ld/testsuite/ld-sh/sh64/stolib.s @@ -4,4 +4,4 @@ bar: ptabs r18, tr0 blink tr0, r63 - .Lfe_bar: .size bar,.Lfe_bar-X +.Lfe_bar: .size bar,.Lfe_bar-bar |