(cr16c_elf_final_link_relocate): Remove duplicated return statements and

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

diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index 4d43cb93acb93da4782fd7575c4fb2cc31a9770d..d861847628c05c38c2987f8da6deb9405ac69a6e 100644 (file)
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -1,6 +1,6 @@
 /* BFD back-end for HP PA-RISC ELF files.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2001,
-   2002, 2003, 2004 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    Original code by
        Center for Software Science
@@ -1186,20 +1186,6 @@ elf32_hppa_check_relocs (bfd *abfd,
        case R_PARISC_DIR14F: /* Used for load/store from absolute locn.  */
        case R_PARISC_DIR14R:
        case R_PARISC_DIR21L: /* As above, and for ext branches too.  */
-#if 0
-         /* Help debug shared library creation.  Any of the above
-            relocs can be used in shared libs, but they may cause
-            pages to become unshared.  */
-         if (info->shared)
-           {
-             (*_bfd_error_handler)
-               (_("%B: relocation %s should not be used when making a shared object; recompile with -fPIC"),
-                abfd,
-                elf_hppa_howto_table[r_type].name);
-           }
-         /* Fall through.  */
-#endif
-
        case R_PARISC_DIR32: /* .word relocs.  */
          /* We may want to output a dynamic relocation later.  */
          need_entry = NEED_DYNREL;
@@ -1537,6 +1523,9 @@ elf32_hppa_gc_sweep_hook (bfd *abfd,
          struct elf32_hppa_dyn_reloc_entry *p;
 
          h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+         while (h->root.type == bfd_link_hash_indirect
+                || h->root.type == bfd_link_hash_warning)
+           h = (struct elf_link_hash_entry *) h->root.u.i.link;
          eh = (struct elf32_hppa_link_hash_entry *) h;
 
          for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
@@ -3250,14 +3239,6 @@ final_link_relocate (asection *input_section,
              == (((int) OP_ADDIL << 26) | (27 << 21)))
            {
              insn &= ~ (0x1f << 21);
-#if 0 /* debug them.  */
-             (*_bfd_error_handler)
-               (_("%B(%A+0x%lx): fixing %s"),
-                input_bfd,
-                input_section,
-                (long) rel->r_offset,
-                howto->name);
-#endif
            }
          /* Now try to make things easy for the dynamic linker.  */
 
@@ -3820,13 +3801,6 @@ elf32_hppa_relocate_section (bfd *output_bfd,
 
                  outrel.r_info = ELF32_R_INFO (indx, r_type);
                }
-#if 0
-             /* EH info can cause unaligned DIR32 relocs.
-                Tweak the reloc type for the dynamic linker.  */
-             if (r_type == R_PARISC_DIR32 && (outrel.r_offset & 3) != 0)
-               outrel.r_info = ELF32_R_INFO (ELF32_R_SYM (outrel.r_info),
-                                             R_PARISC_DIR32U);
-#endif
              sreloc = elf_section_data (input_section)->sreloc;
              if (sreloc == NULL)
                abort ();