FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(md_apply_fix3): Fix offset calculation for global label.

Browse source
This commit is contained in:
Nick Clifton 2005-01-04 10:20:36 +00:00
parent c9bc3b3d29
commit 18af0b39e6
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gas/ChangeLog
View file

@ -1,3 +1,8 @@
2005-01-04 Dmitry Diky <diwil@spec.ru>
* config/tc-msp430.c (md_apply_fix3): Fix offset calculation for
global label.
2005-01-03 David Mosberger <davidm@hpl.hp.com> 2005-01-03 David Mosberger <davidm@hpl.hp.com>
* config/tc-ia64.c (md): Add member "loc_directive_seen". * config/tc-ia64.c (md): Add member "loc_directive_seen".

16
gas/config/tc-msp430.c
View file

@ -1,6 +1,6 @@
/* tc-msp430.c -- Assembler code for the Texas Instruments MSP430 /* tc-msp430.c -- Assembler code for the Texas Instruments MSP430
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
Contributed by Dmitry Diky <diwil@mail.ru> Contributed by Dmitry Diky <diwil@mail.ru>
This file is part of GAS, the GNU Assembler. This file is part of GAS, the GNU Assembler.
@ -1851,7 +1851,19 @@ md_apply_fix3 (fixS * fixp, valueT * valuep, segT seg)
if (fixp->fx_addsy && (s == seg || s == absolute_section)) if (fixp->fx_addsy && (s == seg || s == absolute_section))
{ {
value = S_GET_VALUE (fixp->fx_addsy) + *valuep; /* FIXME: We can appear here only in case if we perform a pc
relative jump to the label which is i) global, ii) locally
defined or this is a jump to an absolute symbol.
If this is an absolute symbol -- everything is OK.
If this is a global label, we've got a symbol value defined
twice:
1. S_GET_VALUE (fixp->fx_addsy) will contain a symbol offset
from this section start
2. *valuep will contain the real offset from jump insn to the
label
So, the result of S_GET_VALUE (fixp->fx_addsy) + (* valuep);
will be incorrect. Therefore remove s_get_value. */
value = /* S_GET_VALUE (fixp->fx_addsy) + */ * valuep;
fixp->fx_done = 1; fixp->fx_done = 1;
} }
else else