(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 00fd99048c3495623c4722c2bb947ad116321a9f..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)
@@ -1600,6 +1589,67 @@ elf32_hppa_gc_sweep_hook (bfd *abfd,
   return TRUE;
 }
 
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+elf32_hppa_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  size_t size;
+
+  switch (note->descsz)
+    {
+      default:
+       return FALSE;
+
+      case 396:                /* Linux/hppa */
+       /* pr_cursig */
+       elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+       /* pr_pid */
+       elf_tdata (abfd)->core_pid = bfd_get_32 (abfd, note->descdata + 24);
+
+       /* pr_reg */
+       offset = 72;
+       size = 320;
+
+       break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+                                         size, note->descpos + offset);
+}
+
+static bfd_boolean
+elf32_hppa_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+      default:
+       return FALSE;
+
+      case 124:                /* Linux/hppa elf_prpsinfo.  */
+       elf_tdata (abfd)->core_program
+         = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
+       elf_tdata (abfd)->core_command
+         = _bfd_elfcore_strndup (abfd, note->descdata + 44, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
 /* Our own version of hide_symbol, so that we can keep plt entries for
    plabels.  */
 
@@ -3189,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.  */
 
@@ -3759,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 ();
@@ -4165,6 +4200,8 @@ elf32_hppa_elf_get_symbol_type (Elf_Internal_Sym *elf_sym, int type)
 #define elf_backend_size_dynamic_sections    elf32_hppa_size_dynamic_sections
 #define elf_backend_gc_mark_hook            elf32_hppa_gc_mark_hook
 #define elf_backend_gc_sweep_hook           elf32_hppa_gc_sweep_hook
+#define elf_backend_grok_prstatus           elf32_hppa_grok_prstatus
+#define elf_backend_grok_psinfo                     elf32_hppa_grok_psinfo
 #define elf_backend_object_p                elf32_hppa_object_p
 #define elf_backend_final_write_processing   elf_hppa_final_write_processing
 #define elf_backend_post_process_headers     elf32_hppa_post_process_headers