aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf-eh-frame.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 87fc635..c10e1a5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-30 Richard Sandiford <rsandifo@nildram.co.uk>
+
+ * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Use the
+ ELF header to choose between 32-bit and 64-bit relocation structures.
+
2007-11-29 Mark Shinwell <shinwell@codesourcery.com>
* archures.c (bfd_mach_mips_loongson_2e): New.
diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
index 473e890..db1b9ea 100644
--- a/bfd/elf-eh-frame.c
+++ b/bfd/elf-eh-frame.c
@@ -683,7 +683,8 @@ _bfd_elf_discard_section_eh_frame
unsigned long r_symndx;
#ifdef BFD64
- if (ptr_size == 8)
+ if (elf_elfheader (abfd)->e_ident[EI_CLASS]
+ == ELFCLASS64)
r_symndx = ELF64_R_SYM (cookie->rel->r_info);
else
#endif