diff options
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/config/tc-i386.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index a61ad0b..37b1872 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2014-04-28 Nick Clifton <nickc@redhat.com> + + PR gas/16858 + * config/tc-i386.c (md_apply_fix): Do not adjust value of + pc-relative fixes against weak symbols. + 2014-04-26 Alan Modra <amodra@gmail.com> * po/POTFILES.in: Regenerate. diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index cb62cf5..707ce59 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -9146,7 +9146,10 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED) #endif } #if defined (OBJ_COFF) && defined (TE_PE) - if (fixP->fx_addsy != NULL && S_IS_WEAK (fixP->fx_addsy)) + if (fixP->fx_addsy != NULL + && S_IS_WEAK (fixP->fx_addsy) + /* PR 16858: Do not modify weak function references. */ + && ! fixP->fx_pcrel) { value -= S_GET_VALUE (fixP->fx_addsy); } |