aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-arm.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ef2ac33..4b58436 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-07 Christophe Lyon <christophe.lyon@st.com>
+
+ * elf32-arm.c (arm_type_of_stub): Don't crash on local symbols in
+ the presence of a PLT.
+
2008-07-07 Alan Modra <amodra@bigpond.net.au>
* bfd.c (bfd_demangle): Always trim off bfd_get_symbol_leading_char.
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 2faefdf..2ee0bb2 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -2777,7 +2777,7 @@ arm_type_of_stub (struct bfd_link_info *info,
/* If the call will go through a PLT entry then we do not need
glue. */
- if (globals->splt != NULL && hash->root.plt.offset != (bfd_vma) -1)
+ if (globals->splt != NULL && hash != NULL && hash->root.plt.offset != (bfd_vma) -1)
return stub_type;
if (r_type == R_ARM_THM_CALL)