*** empty log message ***

[deliverable/binutils-gdb.git] / bfd / elf32-iq2000.c

diff --git a/bfd/elf32-iq2000.c b/bfd/elf32-iq2000.c
index 146dcaaecaf42a0d94719340dcc52e6e38da1e34..731b3206c5142b8725d64fa7c6821d6836dcf80b 100644 (file)
--- a/bfd/elf32-iq2000.c
+++ b/bfd/elf32-iq2000.c
@@ -1,5 +1,5 @@
 /* IQ2000-specific support for 32-bit ELF.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -452,9 +452,9 @@ iq2000_elf_check_relocs (bfd *abfd,
 
        case R_IQ2000_32:
          /* For debug section, change to special harvard-aware relocations.  */
-         if (memcmp (sec->name, ".debug", 6) == 0
-             || memcmp (sec->name, ".stab", 5) == 0
-             || memcmp (sec->name, ".eh_frame", 9) == 0)
+         if (CONST_STRNEQ (sec->name, ".debug")
+             || CONST_STRNEQ (sec->name, ".stab")
+             || CONST_STRNEQ (sec->name, ".eh_frame"))
            {
              ((Elf_Internal_Rela *) rel)->r_info
                = ELF32_R_INFO (ELF32_R_SYM (rel->r_info), R_IQ2000_32_DEBUG);
@@ -642,53 +642,25 @@ iq2000_elf_relocate_section (bfd *                     output_bfd ATTRIBUTE_UNUSED,
 }
 \f
 
-/* Update the got entry reference counts for the section being
-   removed.  */
-
-static bfd_boolean
-iq2000_elf_gc_sweep_hook (bfd *                            abfd ATTRIBUTE_UNUSED,
-                         struct bfd_link_info *    info ATTRIBUTE_UNUSED,
-                         asection *                sec ATTRIBUTE_UNUSED,
-                         const Elf_Internal_Rela * relocs ATTRIBUTE_UNUSED)
-{
-  return TRUE;
-}
-
 /* Return the section that should be marked against GC for a given
    relocation. */
 
 static asection *
-iq2000_elf_gc_mark_hook (asection *                  sec,
-                        struct bfd_link_info *       info ATTRIBUTE_UNUSED,
-                        Elf_Internal_Rela *          rel,
-                        struct elf_link_hash_entry * h,
-                        Elf_Internal_Sym *           sym)
+iq2000_elf_gc_mark_hook (asection *sec,
+                        struct bfd_link_info *info,
+                        Elf_Internal_Rela *rel,
+                        struct elf_link_hash_entry *h,
+                        Elf_Internal_Sym *sym)
 {
-  if (h == NULL)
-    return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
-
-  switch (ELF32_R_TYPE (rel->r_info))
-    {
-    case R_IQ2000_GNU_VTINHERIT:
-    case R_IQ2000_GNU_VTENTRY:
-      break;
-         
-    default:
-      switch (h->root.type)
-       {
-       case bfd_link_hash_defined:
-       case bfd_link_hash_defweak:
-         return h->root.u.def.section;
-             
-       case bfd_link_hash_common:
-         return h->root.u.c.p->section;
-             
-       default:
-         break;
-       }
-    }
-
-  return NULL;
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_IQ2000_GNU_VTINHERIT:
+      case R_IQ2000_GNU_VTENTRY:
+       return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
 }
 
 \f
@@ -874,7 +846,6 @@ iq2000_elf_object_p (bfd *abfd)
 #define elf_info_to_howto                      iq2000_info_to_howto_rela
 #define elf_backend_relocate_section           iq2000_elf_relocate_section
 #define elf_backend_gc_mark_hook               iq2000_elf_gc_mark_hook
-#define elf_backend_gc_sweep_hook              iq2000_elf_gc_sweep_hook
 #define elf_backend_check_relocs               iq2000_elf_check_relocs
 #define elf_backend_object_p                   iq2000_elf_object_p
 #define elf_backend_rela_normal                        1