Merge commit 'upstream/2.20'

[msp430-binutils.git] / bfd / aix5ppc-core.c

diff --git a/bfd/aix5ppc-core.c b/bfd/aix5ppc-core.c
index 2b6fd674f7bed101074ce6e858932b0aaff392b6..7b0695aafc1459e3a90cd2d75c5b93036284a99d 100644 (file)
--- a/bfd/aix5ppc-core.c
+++ b/bfd/aix5ppc-core.c
@@ -1,5 +1,5 @@
 /* IBM RS/6000 "XCOFF" back-end for BFD.
 /* IBM RS/6000 "XCOFF" back-end for BFD.

-   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008

    Free Software Foundation, Inc.
    Written by Tom Rix
    Contributed by Red Hat Inc.
    Free Software Foundation, Inc.
    Written by Tom Rix
    Contributed by Red Hat Inc.


@@ -40,6 +40,10 @@ int xcoff64_core_file_failing_signal (bfd *);
 #include <sys/ldr.h>
 #include <core.h>
 
 #include <sys/ldr.h>
 #include <core.h>
 

+/* The default architecture and machine for matching core files.  */
+#define DEFAULT_ARCHITECTURE   bfd_arch_powerpc
+#define DEFAULT_MACHINE                bfd_mach_ppc_620
+

 #define        core_hdr(abfd)          ((struct core_dumpxx *) abfd->tdata.any)
 
 #define CHECK_FILE_OFFSET(s, v) \
 #define        core_hdr(abfd)          ((struct core_dumpxx *) abfd->tdata.any)
 
 #define CHECK_FILE_OFFSET(s, v) \


@@ -48,6 +52,8 @@ int xcoff64_core_file_failing_signal (bfd *);
 const bfd_target *
 xcoff64_core_p (bfd *abfd)
 {
 const bfd_target *
 xcoff64_core_p (bfd *abfd)
 {

+  enum bfd_architecture arch;
+  unsigned long mach;

   struct core_dumpxx core, *new_core_hdr;
   struct stat statbuf;
   asection *sec;
   struct core_dumpxx core, *new_core_hdr;
   struct stat statbuf;
   asection *sec;


@@ -218,6 +224,11 @@ xcoff64_core_p (bfd *abfd)
        }
     }
 
        }
     }
 

+  /* Set the architecture and machine.  */
+  arch = DEFAULT_ARCHITECTURE;
+  mach = DEFAULT_MACHINE;
+  bfd_default_set_arch_mach (abfd, arch, mach);
+

   return_value = (bfd_target *) abfd->xvec;    /* This is garbage for now.  */
 
  xcoff64_core_p_error:
   return_value = (bfd_target *) abfd->xvec;    /* This is garbage for now.  */
 
  xcoff64_core_p_error: