* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Deal with

	composite relocations against the personality data.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f016362e2a7207b0edb6d036e72eccb3ae07f579..43d5e45ef8cb9169094452419d19a8eee332c81a 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-14  Richard Sandiford  <rsandifo@redhat.com>
+
+       * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Deal with
+       composite relocations against the personality data.
+
 2004-11-13  Paul Brook  <paul@codesourcery.com>
 
        * bfd/elf32-arm.c (elf32_arm_final_link_relocate): Resolve

diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
index c4cf46f65cc063f6d81833805ba844d0bf0716bc..7468eef4f5affff4903ad01dccc785b6fd0026e5 100644 (file)
--- a/bfd/elf-eh-frame.c
+++ b/bfd/elf-eh-frame.c
@@ -498,7 +498,10 @@ _bfd_elf_discard_section_eh_frame
 
                              cie.personality = h;
                            }
-                         cookie->rel++;
+                         /* Cope with MIPS-style composite relocations.  */
+                         do
+                           cookie->rel++;
+                         while (GET_RELOC (buf) != NULL);
                        }
                      buf += per_width;
                    }