From: Albert Chin-A-Young <china@thewrittenword.com>

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

diff --git a/bfd/netbsd-core.c b/bfd/netbsd-core.c
index 876e079291db620a0b5ab7e70506a9f07217fa30..b7dfcd65f7e188573dac47345121e5cf7451bab9 100644 (file)
--- a/bfd/netbsd-core.c
+++ b/bfd/netbsd-core.c
@@ -34,7 +34,9 @@
    NetBSD/sparc64 overlaps with M_MIPS1.  */
 #define M_SPARC64_OPENBSD      M_MIPS1
 
-/* FIXME: On NetBSD/sparc CORE_FPU_OFFSET should be (sizeof (struct trapframe)).  */
+/* Offset of StackGhost cookie within `struct md_coredump' on
+   OpenBSD/sparc.  */
+#define CORE_WCOOKIE_OFFSET    344
 
 struct netbsd_core_struct
 {
@@ -63,7 +65,7 @@ netbsd_core_file_p (abfd)
 {
   int i, val;
   file_ptr offset;
-  asection *asect, *asect2;
+  asection *asect;
   struct core core;
   struct coreseg coreseg;
   bfd_size_type amt = sizeof core;
@@ -142,48 +144,79 @@ netbsd_core_file_p (abfd)
       asect->filepos = offset;
       asect->alignment_power = 2;
 
-      offset += coreseg.c_size;
-
-#ifdef CORE_FPU_OFFSET
-      switch (CORE_GETFLAG (coreseg))
+      if (CORE_GETMID (core) == M_SPARC_NETBSD
+         && CORE_GETFLAG (coreseg) == CORE_CPU
+         && coreseg.c_size > CORE_WCOOKIE_OFFSET)
        {
-       case CORE_CPU:
-         /* Hackish...  */
-         asect->_raw_size = CORE_FPU_OFFSET;
-         asect2 = bfd_make_section_anyway (abfd, ".reg2");
-         if (asect2 == NULL)
+         /* Truncate the .reg section.  */
+         asect->_raw_size = CORE_WCOOKIE_OFFSET;
+
+         /* And create the .wcookie section.  */
+         asect = bfd_make_section_anyway (abfd, ".wcookie");
+         if (asect == NULL)
            goto punt;
-         asect2->_raw_size = coreseg.c_size - CORE_FPU_OFFSET;
-         asect2->vma = 0;
-         asect2->filepos = asect->filepos + CORE_FPU_OFFSET;
-         asect2->alignment_power = 2;
-         asect2->flags = SEC_ALLOC + SEC_HAS_CONTENTS;
-         break;
+
+         asect->flags = SEC_ALLOC + SEC_HAS_CONTENTS;
+         asect->_raw_size = 4;
+         asect->vma = 0;
+         asect->filepos = offset + CORE_WCOOKIE_OFFSET;
+         asect->alignment_power = 2;
        }
-#endif
+
+      offset += coreseg.c_size;
+    }
+
+  /* Set architecture from machine ID.  */
+  switch (CORE_GETMID (core))
+    {
+    case M_ALPHA_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_alpha, 0);
+      break;
+
+    case M_ARM6_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_arm, bfd_mach_arm_3);
+      break;
+
+    case M_X86_64_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x86_64);
+      break;
+
+    case M_386_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_i386_i386);
+      break;
+
+    case M_68K_NETBSD:
+    case M_68K4K_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0);
+      break;
+
+    case M_88K_OPENBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_m88k, 0);
+      break;
+
+    case M_HPPA_OPENBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_hppa, bfd_mach_hppa11);
+      break;
+
+    case M_POWERPC_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_powerpc, bfd_mach_ppc);
+      break;
+
+    case M_SPARC_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_sparc, bfd_mach_sparc);
+      break;
+
+    case M_SPARC64_NETBSD:
+    case M_SPARC64_OPENBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_sparc, bfd_mach_sparc_v9);
+      break;
+
+    case M_VAX_NETBSD:
+    case M_VAX4K_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_vax, 0);
+      break;
     }
 
- /* Set architecture from machine ID.  */
- switch (CORE_GETMID (core))
-   {
-   case M_X86_64_NETBSD:
-     bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x86_64);
-     break;
-
-   case M_386_NETBSD:
-     bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_i386_i386);
-     break;
-
-   case M_SPARC_NETBSD:
-     bfd_default_set_arch_mach (abfd, bfd_arch_sparc, bfd_mach_sparc);
-     break;
-
-   case M_SPARC64_NETBSD:
-   case M_SPARC64_OPENBSD:
-     bfd_default_set_arch_mach (abfd, bfd_arch_sparc, bfd_mach_sparc_v9);
-     break;
-   }
- 
   /* OK, we believe you.  You're a core file (sure, sure).  */
   return abfd->xvec;