From 051ce150c4267833cb3389edd49cc2399e0003ea Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 30 Nov 2009 14:36:21 +0000 Subject: [PATCH] PR gas/11032 * config/tc-arm.c (relax_adr): Cope with a frag with no symbol. --- gas/ChangeLog | 5 +++++ gas/config/tc-arm.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 2c7c2193f..7f6432b73 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2009-11-30 Nick Clifton + + PR gas/11032 + * config/tc-arm.c (relax_adr): Cope with a frag with no symbol. + 2009-11-19 Jan Beulich * read.c (pseudo_set): Also call copy_symbol_attributes() for diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 7cbf6ff44..0ef05dfef 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -4972,13 +4972,13 @@ parse_address_main (char **str, int i, int group_relocations, { if (skip_past_char (&p, '=') == FAIL) { - /* bare address - translate to PC-relative offset */ + /* Bare address - translate to PC-relative offset. */ inst.reloc.pc_rel = 1; inst.operands[i].reg = REG_PC; inst.operands[i].isreg = 1; inst.operands[i].preind = 1; } - /* else a load-constant pseudo op, no special treatment needed here */ + /* Otherwise a load-constant pseudo op, no special treatment needed here. */ if (my_get_expression (&inst.reloc.exp, &p, GE_NO_PREFIX)) return PARSE_OPERAND_FAIL; @@ -18335,7 +18335,8 @@ relax_adr (fragS *fragp, asection *sec, long stretch) offsetT val; /* Assume worst case for symbols not known to be in the same section. */ - if (!S_IS_DEFINED (fragp->fr_symbol) + if (fragp->fr_symbol == NULL + || !S_IS_DEFINED (fragp->fr_symbol) || sec != S_GET_SEGMENT (fragp->fr_symbol)) return 4; -- 2.11.4.GIT