2013-05-06 Paul Brook <paul@codesourcery.com>

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

diff --git a/bfd/rs6000-core.c b/bfd/rs6000-core.c
index e6405f962c338f11a5a92db2b76a415c10b315aa..d9c06b6c1df78fee209127ee24e0f1505f916b9c 100644 (file)
--- a/bfd/rs6000-core.c
+++ b/bfd/rs6000-core.c
@@ -1,31 +1,28 @@
 /* IBM RS/6000 "XCOFF" back-end for BFD.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
 /* IBM RS/6000 "XCOFF" back-end for BFD.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,

-   2001
+   2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009

    Free Software Foundation, Inc.
    Free Software Foundation, Inc.

-   FIXME: Can someone provide a transliteration of this name into ASCII?
-   Using the following chars caused a compiler warning on HIUX (so I replaced
-   them with octal escapes), and isn't useful without an understanding of what
-   character set it is.
-   Written by Metin G. Ozisik, Mimi Ph\373\364ng-Th\345o V\365,
-     and John Gilmore.
+   Written by Metin G. Ozisik, Mimi Phuong-Thao Vo, and John Gilmore.

    Archive support from Damon A. Permezel.
    Contributed by IBM Corporation and Cygnus Support.
 
    Archive support from Damon A. Permezel.
    Contributed by IBM Corporation and Cygnus Support.
 

-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.

 
 

-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.

 
 

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 

-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.  */

 
 /* This port currently only handles reading object files, except when
    compiled on an RS/6000 host.  -- no archive support, no core files.
 
 /* This port currently only handles reading object files, except when
    compiled on an RS/6000 host.  -- no archive support, no core files.


@@ -44,8 +41,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define _LONG_LONG
 #endif
 
 #define _LONG_LONG
 #endif
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 
 #ifdef AIX_CORE
 #include "libbfd.h"
 
 #ifdef AIX_CORE


@@ -71,6 +68,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/core.h>
 #include <sys/systemcfg.h>
 
 #include <sys/core.h>
 #include <sys/systemcfg.h>
 

+/* Borrowed from <sys/inttypes.h> on recent AIX versions.  */
+typedef unsigned long ptr_to_uint;
+

 #define        core_hdr(bfd)           ((CoreHdr *) bfd->tdata.any)
 
 /* AIX 4.1 changed the names and locations of a few items in the core file.
 #define        core_hdr(bfd)           ((CoreHdr *) bfd->tdata.any)
 
 /* AIX 4.1 changed the names and locations of a few items in the core file.


@@ -107,9 +107,9 @@ typedef union {
 
 typedef union {
 #ifdef AIX_CORE_DUMPX_CORE
 
 typedef union {
 #ifdef AIX_CORE_DUMPX_CORE

-  struct core_dumpx new;       /* new AIX 4.3+ core dump */
+  struct core_dumpx new_dump;  /* new AIX 4.3+ core dump */

 #else
 #else

-  struct core_dump new;                /* for simpler coding */
+  struct core_dump new_dump;           /* for simpler coding */

 #endif
   struct core_dump old;                /* old AIX 4.2- core dump, still used on
                                   4.3+ with appropriate SMIT config */
 #endif
   struct core_dump old;                /* old AIX 4.2- core dump, still used on
                                   4.3+ with appropriate SMIT config */


@@ -120,9 +120,9 @@ typedef union {
 #ifdef CORE_VERSION_1
 typedef union {
 #ifdef AIX_CORE_DUMPX_CORE
 #ifdef CORE_VERSION_1
 typedef union {
 #ifdef AIX_CORE_DUMPX_CORE

-  struct vm_infox new;
+  struct vm_infox new_dump;

 #else
 #else

-  struct vm_info new;
+  struct vm_info new_dump;

 #endif
   struct vm_info old;
 } VmInfo;
 #endif
   struct vm_info old;
 } VmInfo;


@@ -136,6 +136,19 @@ typedef union {
 # define CORE_NEW(c)   0
 #endif
 
 # define CORE_NEW(c)   0
 #endif
 

+/* Return whether CoreHdr C usese core_dumpxx structure.
+
+   FIXME: the core file format version number used here definitely indicates
+   that struct core_dumpxx should be used to represent the core file header,
+   but that may not be the only such format version number.  */
+
+#ifdef AIX_5_CORE
+# define CORE_DUMPXX_VERSION   267312562
+# define CNEW_IS_CORE_DUMPXX(c) ((c).new_dump.c_version == CORE_DUMPXX_VERSION)
+#else
+# define CNEW_IS_CORE_DUMPXX(c) 0
+#endif
+

 /* Return the c_stackorg field from struct core_dumpx C.  */
 
 #ifdef AIX_CORE_DUMPX_CORE
 /* Return the c_stackorg field from struct core_dumpx C.  */
 
 #ifdef AIX_CORE_DUMPX_CORE


@@ -182,7 +195,7 @@ typedef union {
 
 /* Return the c_impl field from struct core_dumpx C.  */
 
 
 /* Return the c_impl field from struct core_dumpx C.  */
 

-#ifdef AIX_CORE_DUMPX_CORE
+#if defined (HAVE_ST_C_IMPL) || defined (AIX_5_CORE)

 # define CNEW_IMPL(c)  (c).c_impl
 #else
 # define CNEW_IMPL(c)  0
 # define CNEW_IMPL(c)  (c).c_impl
 #else
 # define CNEW_IMPL(c)  0


@@ -250,26 +263,35 @@ typedef union {
 #define CORE_COMMONSZ  ((int) &((struct core_dump *) 0)->c_entries \
                         + sizeof (((struct core_dump *) 0)->c_entries))
 
 #define CORE_COMMONSZ  ((int) &((struct core_dump *) 0)->c_entries \
                         + sizeof (((struct core_dump *) 0)->c_entries))
 

+/* Define prototypes for certain functions, to avoid a compiler warning
+   saying that they are missing.  */
+
+const bfd_target * rs6000coff_core_p (bfd *abfd);
+bfd_boolean rs6000coff_core_file_matches_executable_p (bfd *core_bfd,
+                                                       bfd *exec_bfd);
+char * rs6000coff_core_file_failing_command (bfd *abfd);
+int rs6000coff_core_file_failing_signal (bfd *abfd);
+

 /* Try to read into CORE the header from the core file associated with ABFD.
    Return success.  */
 
 /* Try to read into CORE the header from the core file associated with ABFD.
    Return success.  */
 

-static boolean
+static bfd_boolean

 read_hdr (bfd *abfd, CoreHdr *core)
 {
   bfd_size_type size;
 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
 read_hdr (bfd *abfd, CoreHdr *core)
 {
   bfd_size_type size;
 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)

-    return false;
+    return FALSE;

 
   /* Read the leading portion that old and new core dump structures have in
      common.  */
   size = CORE_COMMONSZ;
   if (bfd_bread (core, size, abfd) != size)
 
   /* Read the leading portion that old and new core dump structures have in
      common.  */
   size = CORE_COMMONSZ;
   if (bfd_bread (core, size, abfd) != size)

-    return false;
+    return FALSE;

 
   /* Read the trailing portion of the structure.  */
   if (CORE_NEW (*core))
 
   /* Read the trailing portion of the structure.  */
   if (CORE_NEW (*core))

-    size = sizeof (core->new);
+    size = sizeof (core->new_dump);

   else
     size = sizeof (core->old);
   size -= CORE_COMMONSZ;
   else
     size = sizeof (core->old);
   size -= CORE_COMMONSZ;


@@ -277,22 +299,16 @@ read_hdr (bfd *abfd, CoreHdr *core)
 }
 
 static asection *
 }
 
 static asection *

-make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
-     bfd *abfd;
-     const char *name;
-     flagword flags;
-     bfd_size_type _raw_size;
-     bfd_vma vma;
-     file_ptr filepos;
+make_bfd_asection (bfd *abfd, const char *name, flagword flags,
+                  bfd_size_type size, bfd_vma vma, file_ptr filepos)

 {
   asection *asect;
 
 {
   asection *asect;
 

-  asect = bfd_make_section_anyway (abfd, name);
+  asect = bfd_make_section_anyway_with_flags (abfd, name, flags);

   if (!asect)
     return NULL;
 
   if (!asect)
     return NULL;
 

-  asect->flags = flags;
-  asect->_raw_size = _raw_size;
+  asect->size = size;

   asect->vma = vma;
   asect->filepos = filepos;
   asect->alignment_power = 8;
   asect->vma = vma;
   asect->filepos = filepos;
   asect->alignment_power = 8;


@@ -304,8 +320,7 @@ make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
    magic number or anything like, in rs6000coff.  */
 
 const bfd_target *
    magic number or anything like, in rs6000coff.  */
 
 const bfd_target *

-rs6000coff_core_p (abfd)
-     bfd *abfd;
+rs6000coff_core_p (bfd *abfd)

 {
   CoreHdr core;
   struct stat statbuf;
 {
   CoreHdr core;
   struct stat statbuf;


@@ -327,37 +342,44 @@ rs6000coff_core_p (abfd)
       return NULL;
     }
 
       return NULL;
     }
 

+  /* This isn't the right handler for 64-bit core files on AIX 5.x.  */
+  if (CORE_NEW (core) && CNEW_IS_CORE_DUMPXX (core))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+

   /* Copy fields from new or old core structure.  */
   if (CORE_NEW (core))
     {
   /* Copy fields from new or old core structure.  */
   if (CORE_NEW (core))
     {

-      c_flag = core.new.c_flag;
-      c_stack = (file_ptr) core.new.c_stack;
-      c_size = core.new.c_size;
-      c_stackend = CNEW_STACKORG (core.new) + c_size;
-      c_lsize = CNEW_LSIZE (core.new);
-      c_loader = CNEW_LOADER (core.new);
-      proc64 = CNEW_PROC64 (core.new);
+      c_flag = core.new_dump.c_flag;
+      c_stack = (file_ptr) core.new_dump.c_stack;
+      c_size = core.new_dump.c_size;
+      c_stackend = CNEW_STACKORG (core.new_dump) + c_size;
+      c_lsize = CNEW_LSIZE (core.new_dump);
+      c_loader = CNEW_LOADER (core.new_dump);
+      proc64 = CNEW_PROC64 (core.new_dump);

     }
   else
     {
       c_flag = core.old.c_flag;
     }
   else
     {
       c_flag = core.old.c_flag;

-      c_stack = (file_ptr) core.old.c_stack;
+      c_stack = (file_ptr) (ptr_to_uint) core.old.c_stack;

       c_size = core.old.c_size;
       c_stackend = COLD_STACKEND;
       c_lsize = 0x7ffffff;
       c_size = core.old.c_size;
       c_stackend = COLD_STACKEND;
       c_lsize = 0x7ffffff;

-      c_loader = (file_ptr) COLD_LOADER (core.old);
+      c_loader = (file_ptr) (ptr_to_uint) COLD_LOADER (core.old);

       proc64 = 0;
     }
 
   if (proc64)
     {
       proc64 = 0;
     }
 
   if (proc64)
     {

-      c_regsize = sizeof (CNEW_CONTEXT64 (core.new));
-      c_regptr = &CNEW_CONTEXT64 (core.new);
+      c_regsize = sizeof (CNEW_CONTEXT64 (core.new_dump));
+      c_regptr = &CNEW_CONTEXT64 (core.new_dump);

     }
   else if (CORE_NEW (core))
     {
     }
   else if (CORE_NEW (core))
     {

-      c_regsize = sizeof (CNEW_MSTSAVE (core.new));
-      c_regptr = &CNEW_MSTSAVE (core.new);
+      c_regsize = sizeof (CNEW_MSTSAVE (core.new_dump));
+      c_regptr = &CNEW_MSTSAVE (core.new_dump);

     }
   else
     {
     }
   else
     {


@@ -427,7 +449,7 @@ rs6000coff_core_p (abfd)
                           bfd_get_filename (abfd));
 
   /* Allocate core file header.  */
                           bfd_get_filename (abfd));
 
   /* Allocate core file header.  */

-  size = CORE_NEW (core) ? sizeof (core.new) : sizeof (core.old);
+  size = CORE_NEW (core) ? sizeof (core.new_dump) : sizeof (core.old);

   tmpptr = (char *) bfd_zalloc (abfd, (bfd_size_type) size);
   if (!tmpptr)
     return NULL;
   tmpptr = (char *) bfd_zalloc (abfd, (bfd_size_type) size);
   if (!tmpptr)
     return NULL;


@@ -442,7 +464,7 @@ rs6000coff_core_p (abfd)
       enum bfd_architecture arch;
       unsigned long mach;
 
       enum bfd_architecture arch;
       unsigned long mach;
 

-      switch (CNEW_IMPL (core.new))
+      switch (CNEW_IMPL (core.new_dump))

        {
        case POWER_RS1:
        case POWER_RSC:
        {
        case POWER_RS1:
        case POWER_RSC:


@@ -462,13 +484,13 @@ rs6000coff_core_p (abfd)
   if (!make_bfd_asection (abfd, ".stack",
                          SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
                          c_size, c_stackend - c_size, c_stack))
   if (!make_bfd_asection (abfd, ".stack",
                          SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
                          c_size, c_stackend - c_size, c_stack))

-    return NULL;
+    goto fail;

 
   /* .reg section for all registers.  */
   if (!make_bfd_asection (abfd, ".reg",
                          SEC_HAS_CONTENTS,
                          c_regsize, (bfd_vma) 0, c_regoff))
 
   /* .reg section for all registers.  */
   if (!make_bfd_asection (abfd, ".reg",
                          SEC_HAS_CONTENTS,
                          c_regsize, (bfd_vma) 0, c_regoff))

-    return NULL;
+    goto fail;

 
   /* .ldinfo section.
      To actually find out how long this section is in this particular
 
   /* .ldinfo section.
      To actually find out how long this section is in this particular


@@ -477,7 +499,7 @@ rs6000coff_core_p (abfd)
   if (!make_bfd_asection (abfd, ".ldinfo",
                          SEC_HAS_CONTENTS,
                          c_lsize, (bfd_vma) 0, c_loader))
   if (!make_bfd_asection (abfd, ".ldinfo",
                          SEC_HAS_CONTENTS,
                          c_lsize, (bfd_vma) 0, c_loader))

-    return NULL;
+    goto fail;

 
 #ifndef CORE_VERSION_1
   /* .data section if present.
 
 #ifndef CORE_VERSION_1
   /* .data section if present.


@@ -494,7 +516,7 @@ rs6000coff_core_p (abfd)
                              (bfd_vma)
                                CDATA_ADDR (core.old.c_u.u_dsize),
                              c_stack + c_size))
                              (bfd_vma)
                                CDATA_ADDR (core.old.c_u.u_dsize),
                              c_stack + c_size))

-       return NULL;
+       goto fail;

     }
 #endif
 
     }
 #endif
 


@@ -515,17 +537,17 @@ rs6000coff_core_p (abfd)
 
     if (CORE_NEW (core))
       {
 
     if (CORE_NEW (core))
       {

-       c_datasize = CNEW_DATASIZE (core.new);
-       c_data = (file_ptr) core.new.c_data;
-       c_vmregions = core.new.c_vmregions;
-       c_vmm = (file_ptr) core.new.c_vmm;
+       c_datasize = CNEW_DATASIZE (core.new_dump);
+       c_data = (file_ptr) core.new_dump.c_data;
+       c_vmregions = core.new_dump.c_vmregions;
+       c_vmm = (file_ptr) core.new_dump.c_vmm;

       }
     else
       {
        c_datasize = core.old.c_datasize;
       }
     else
       {
        c_datasize = core.old.c_datasize;

-       c_data = (file_ptr) core.old.c_data;
+       c_data = (file_ptr) (ptr_to_uint) core.old.c_data;

        c_vmregions = core.old.c_vmregions;
        c_vmregions = core.old.c_vmregions;

-       c_vmm = (file_ptr) core.old.c_vmm;
+       c_vmm = (file_ptr) (ptr_to_uint) core.old.c_vmm;

       }
 
     /* .data section from executable.  */
       }
 
     /* .data section from executable.  */


@@ -536,7 +558,7 @@ rs6000coff_core_p (abfd)
                                c_datasize,
                                (bfd_vma) CDATA_ADDR (c_datasize),
                                c_data))
                                c_datasize,
                                (bfd_vma) CDATA_ADDR (c_datasize),
                                c_data))

-         return NULL;
+         goto fail;

       }
 
     /* .data sections from loaded objects.  */
       }
 
     /* .data sections from loaded objects.  */


@@ -548,9 +570,9 @@ rs6000coff_core_p (abfd)
     while (1)
       {
        if (bfd_seek (abfd, c_loader, SEEK_SET) != 0)
     while (1)
       {
        if (bfd_seek (abfd, c_loader, SEEK_SET) != 0)

-         return NULL;
+         goto fail;

        if (bfd_bread (&ldinfo, size, abfd) != size)
        if (bfd_bread (&ldinfo, size, abfd) != size)

-         return NULL;
+         goto fail;

 
        if (proc64)
          {
 
        if (proc64)
          {


@@ -571,7 +593,7 @@ rs6000coff_core_p (abfd)
          if (!make_bfd_asection (abfd, ".data",
                                  SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
                                  ldi_datasize, ldi_dataorg, ldi_core))
          if (!make_bfd_asection (abfd, ".data",
                                  SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
                                  ldi_datasize, ldi_dataorg, ldi_core))

-           return NULL;
+           goto fail;

 
        if (ldi_next == 0)
          break;
 
        if (ldi_next == 0)
          break;


@@ -584,7 +606,7 @@ rs6000coff_core_p (abfd)
        bfd_size_type i;
 
        if (bfd_seek (abfd, c_vmm, SEEK_SET) != 0)
        bfd_size_type i;
 
        if (bfd_seek (abfd, c_vmm, SEEK_SET) != 0)

-         return NULL;
+         goto fail;

 
        for (i = 0; i < c_vmregions; i++)
          {
 
        for (i = 0; i < c_vmregions; i++)
          {


@@ -593,15 +615,15 @@ rs6000coff_core_p (abfd)
            file_ptr vminfo_offset;
            bfd_vma vminfo_addr;
 
            file_ptr vminfo_offset;
            bfd_vma vminfo_addr;
 

-           size = CORE_NEW (core) ? sizeof (vminfo.new) : sizeof (vminfo.old);
+           size = CORE_NEW (core) ? sizeof (vminfo.new_dump) : sizeof (vminfo.old);

            if (bfd_bread (&vminfo, size, abfd) != size)
            if (bfd_bread (&vminfo, size, abfd) != size)

-             return NULL;
+             goto fail;

 
            if (CORE_NEW (core))
              {
 
            if (CORE_NEW (core))
              {

-               vminfo_addr = (bfd_vma) vminfo.new.vminfo_addr;
-               vminfo_size = vminfo.new.vminfo_size;
-               vminfo_offset = vminfo.new.vminfo_offset;
+               vminfo_addr = (bfd_vma) vminfo.new_dump.vminfo_addr;
+               vminfo_size = vminfo.new_dump.vminfo_size;
+               vminfo_offset = vminfo.new_dump.vminfo_offset;

              }
            else
              {
              }
            else
              {


@@ -615,50 +637,54 @@ rs6000coff_core_p (abfd)
                                      SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
                                      vminfo_size, vminfo_addr,
                                      vminfo_offset))
                                      SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
                                      vminfo_size, vminfo_addr,
                                      vminfo_offset))

-               return NULL;
+               goto fail;

          }
       }
   }
 #endif
 
   return abfd->xvec;           /* This is garbage for now.  */
          }
       }
   }
 #endif
 
   return abfd->xvec;           /* This is garbage for now.  */

+
+ fail:
+  bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;

 }
 
 }
 

-/* Return `true' if given core is from the given executable.  */
+/* Return `TRUE' if given core is from the given executable.  */

 
 

-boolean
-rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd;
-     bfd *exec_bfd;
+bfd_boolean
+rs6000coff_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)

 {
   CoreHdr core;
   bfd_size_type size;
   char *path, *s;
   size_t alloc;
   const char *str1, *str2;
 {
   CoreHdr core;
   bfd_size_type size;
   char *path, *s;
   size_t alloc;
   const char *str1, *str2;

-  boolean ret;
+  bfd_boolean ret;

   file_ptr c_loader;
 
   if (!read_hdr (core_bfd, &core))
   file_ptr c_loader;
 
   if (!read_hdr (core_bfd, &core))

-    return false;
+    return FALSE;

 
   if (CORE_NEW (core))
 
   if (CORE_NEW (core))

-    c_loader = CNEW_LOADER (core.new);
+    c_loader = CNEW_LOADER (core.new_dump);

   else
   else

-    c_loader = (file_ptr) COLD_LOADER (core.old);
+    c_loader = (file_ptr) (ptr_to_uint) COLD_LOADER (core.old);

 
 

-  if (CORE_NEW (core) && CNEW_PROC64 (core.new))
+  if (CORE_NEW (core) && CNEW_PROC64 (core.new_dump))

     size = (int) ((LdInfo *) 0)->l64.ldinfo_filename;
   else
     size = (int) ((LdInfo *) 0)->l32.ldinfo_filename;
 
   if (bfd_seek (core_bfd, c_loader + size, SEEK_SET) != 0)
     size = (int) ((LdInfo *) 0)->l64.ldinfo_filename;
   else
     size = (int) ((LdInfo *) 0)->l32.ldinfo_filename;
 
   if (bfd_seek (core_bfd, c_loader + size, SEEK_SET) != 0)

-    return false;
+    return FALSE;

 
   alloc = 100;
   path = bfd_malloc ((bfd_size_type) alloc);
   if (path == NULL)
 
   alloc = 100;
   path = bfd_malloc ((bfd_size_type) alloc);
   if (path == NULL)

-    return false;
+    return FALSE;

   s = path;
 
   while (1)
   s = path;
 
   while (1)


@@ -666,7 +692,7 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
       if (bfd_bread (s, (bfd_size_type) 1, core_bfd) != 1)
        {
          free (path);
       if (bfd_bread (s, (bfd_size_type) 1, core_bfd) != 1)
        {
          free (path);

-         return false;
+         return FALSE;

        }
       if (*s == '\0')
        break;
        }
       if (*s == '\0')
        break;


@@ -680,7 +706,7 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
          if (n == NULL)
            {
              free (path);
          if (n == NULL)
            {
              free (path);

-             return false;
+             return FALSE;

            }
          s = n + (path - s);
          path = n;
            }
          s = n + (path - s);
          path = n;


@@ -695,9 +721,9 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
   str2 = str2 != NULL ? str2 + 1 : exec_bfd->filename;
 
   if (strcmp (str1, str2) == 0)
   str2 = str2 != NULL ? str2 + 1 : exec_bfd->filename;
 
   if (strcmp (str1, str2) == 0)

-    ret = true;
+    ret = TRUE;

   else
   else

-    ret = false;
+    ret = FALSE;

 
   free (path);
 
 
   free (path);
 


@@ -705,12 +731,11 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
 }
 
 char *
 }
 
 char *

-rs6000coff_core_file_failing_command (abfd)
-     bfd *abfd;
+rs6000coff_core_file_failing_command (bfd *abfd)

 {
   CoreHdr *core = core_hdr (abfd);
   char *com = CORE_NEW (*core) ?
 {
   CoreHdr *core = core_hdr (abfd);
   char *com = CORE_NEW (*core) ?

-    CNEW_COMM (core->new) : COLD_COMM (core->old);
+    CNEW_COMM (core->new_dump) : COLD_COMM (core->old);

 
   if (*com)
     return com;
 
   if (*com)
     return com;


@@ -719,11 +744,10 @@ rs6000coff_core_file_failing_command (abfd)
 }
 
 int
 }
 
 int

-rs6000coff_core_file_failing_signal (abfd)
-     bfd *abfd;
+rs6000coff_core_file_failing_signal (bfd *abfd)

 {
   CoreHdr *core = core_hdr (abfd);
 {
   CoreHdr *core = core_hdr (abfd);

-  return CORE_NEW (*core) ? core->new.c_signo : core->old.c_signo;
+  return CORE_NEW (*core) ? core->new_dump.c_signo : core->old.c_signo;

 }
 
 #endif /* AIX_CORE */
 }
 
 #endif /* AIX_CORE */