summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2008-08-24 21:43:00 +0000
committerAndreas Schwab <schwab@linux-m68k.org>2008-08-24 21:43:00 +0000
commit61f620b44240a032df4aacd9ed152d37abbb30e7 (patch)
tree40173ed436f2e42f38e74a72328743948edcfacf
parent65b24fe02a8264cbfdfeeed89ffe17bee3b7bd29 (diff)
downloadbinutils-redhat-61f620b44240a032df4aacd9ed152d37abbb30e7.tar.gz
(_bfd_elf_write_section_eh_frame): Do proper
extension when calculating difference of offsets.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf-eh-frame.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bf9d580228..5c34381195 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-24 Andreas Schwab <schwab@suse.de>
+
+ * elf-eh-frame.c (_bfd_elf_write_section_eh_frame): Do proper
+ extension when calculating difference of offsets.
+
2008-08-24 Alan Modra <amodra@bigpond.net.au>
* configure.in: Update a number of obsolete autoconf macros.
diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
index 9b88499e48..7151a39763 100644
--- a/bfd/elf-eh-frame.c
+++ b/bfd/elf-eh-frame.c
@@ -1445,7 +1445,7 @@ _bfd_elf_write_section_eh_frame (bfd *abfd,
val = read_value (abfd, buf, per_width,
get_DW_EH_PE_signed (per_encoding));
- val += ent->offset - ent->new_offset;
+ val += (bfd_vma) ent->offset - ent->new_offset;
val -= extra_string + extra_data;
write_value (abfd, buf, val, per_width);
action &= ~4;
@@ -1504,7 +1504,7 @@ _bfd_elf_write_section_eh_frame (bfd *abfd,
}
break;
case DW_EH_PE_pcrel:
- value += ent->offset - ent->new_offset;
+ value += (bfd_vma) ent->offset - ent->new_offset;
address += (sec->output_section->vma
+ sec->output_offset
+ ent->offset + 8);
@@ -1538,7 +1538,7 @@ _bfd_elf_write_section_eh_frame (bfd *abfd,
if (value)
{
if ((ent->lsda_encoding & 0xf0) == DW_EH_PE_pcrel)
- value += ent->offset - ent->new_offset;
+ value += (bfd_vma) ent->offset - ent->new_offset;
else if (cie->u.cie.make_lsda_relative)
value -= (sec->output_section->vma
+ sec->output_offset
@@ -1577,7 +1577,7 @@ _bfd_elf_write_section_eh_frame (bfd *abfd,
continue;
if ((ent->fde_encoding & 0xf0) == DW_EH_PE_pcrel)
- value += ent->offset + 8 - new_offset;
+ value += (bfd_vma) ent->offset + 8 - new_offset;
if (ent->make_relative)
value -= (sec->output_section->vma
+ sec->output_offset