*** empty log message ***

[deliverable/binutils-gdb.git] / bfd / hpux-core.c

diff --git a/bfd/hpux-core.c b/bfd/hpux-core.c
index 32b4eb4178860dfae871531ee6bf8226318e873e..e68a715b588fd5e18a2c052224ac50ffb2322c14 100644 (file)
--- a/bfd/hpux-core.c
+++ b/bfd/hpux-core.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This file can only be compiled on systems which use HP/UX style
    core files.  */
@@ -145,6 +145,17 @@ make_bfd_asection (abfd, name, flags, size, vma, alignment_power)
   return asect;
 }
 
+/* Return true if the given core file section corresponds to a thread,
+   based on its name.  */
+
+static int
+thread_section_p (bfd *abfd ATTRIBUTE_UNUSED,
+                  asection *sect,
+                  void *obj ATTRIBUTE_UNUSED)
+{
+  return (strncmp (bfd_section_name (abfd, sect), ".reg/", 5) == 0);
+}
+
 /* this function builds a bfd target if the file is a corefile.
    It returns null or 0 if it finds out thaat it is not a core file.
    The way it checks this is by looking for allowed 'type' field values.
@@ -207,7 +218,7 @@ hpux_core_core_file_p (abfd)
 
               /* However, we also want to create those sections with the
                  file positioned at the start of the record, it seems. */
-            if (bfd_seek (abfd, (file_ptr) -core_header.len, SEEK_CUR) != 0)
+            if (bfd_seek (abfd, -((file_ptr) core_header.len), SEEK_CUR) != 0)
               break;
 
 #if defined(PROC_INFO_HAS_THREAD_ID)
@@ -233,10 +244,11 @@ hpux_core_core_file_p (abfd)
             if (core_kernel_thread_id (abfd) == 0)
               {
                 if (!make_bfd_asection (abfd, ".reg",
-                                        SEC_HAS_CONTENTS,
-                                        core_header.len,
-                                        (int) &proc_info - (int) & proc_info.hw_regs,
-                                        2))
+                                       SEC_HAS_CONTENTS,
+                                       core_header.len,
+                                       (bfd_vma) offsetof (struct proc_info,
+                                                           hw_regs),
+                                       2))
                  goto fail;
               }
             else
@@ -248,17 +260,19 @@ hpux_core_core_file_p (abfd)
                    if (!make_bfd_asection (abfd, ".reg",
                                            SEC_HAS_CONTENTS,
                                            core_header.len,
-                                           (int) &proc_info - (int) & proc_info.hw_regs,
+                                           (bfd_vma)offsetof (struct proc_info,
+                                                              hw_regs),
                                            2))
                      goto fail;
                   }
                 /* We always make one of these sections, for every thread. */
                 sprintf (secname, ".reg/%d", core_kernel_thread_id (abfd));
                 if (!make_bfd_asection (abfd, secname,
-                                        SEC_HAS_CONTENTS,
-                                        core_header.len,
-                                        (int) &proc_info - (int) & proc_info.hw_regs,
-                                        2))
+                                       SEC_HAS_CONTENTS,
+                                       core_header.len,
+                                       (bfd_vma) offsetof (struct proc_info,
+                                                           hw_regs),
+                                       2))
                  goto fail;
               }
            core_signal (abfd) = proc_info.sig;
@@ -301,6 +315,29 @@ hpux_core_core_file_p (abfd)
 
   /* OK, we believe you.  You're a core file (sure, sure).  */
 
+  /* On HP/UX, we sometimes encounter core files where none of the threads
+     was found to be the running thread (ie the signal was set to -1 for
+     all threads).  This happens when the program was aborted externally
+     via a TT_CORE ttrace system call.  In that case, we just pick one
+     thread at random to be the active thread.  */
+  if (core_kernel_thread_id (abfd) != 0
+      && bfd_get_section_by_name (abfd, ".reg") == NULL)
+    {
+      asection *asect = bfd_sections_find_if (abfd, thread_section_p, NULL);
+      asection *reg_sect;
+
+      if (asect != NULL)
+        {
+          reg_sect = make_bfd_asection (abfd, ".reg", asect->flags,
+                                        asect->size, asect->vma,
+                                        asect->alignment_power);
+          if (reg_sect == NULL)
+            goto fail;
+
+          reg_sect->filepos = asect->filepos;
+        }
+    }
+
   /* Were there sections of unknown type?  If so, yet there were
      at least some complete sections of known type, then, issue
      a warning.  Possibly the core file was generated on a version