(xcoff64_core_p): Constify return_value variable. Also, do not use core_hdr

macro as it evaluates to a cast of an lvalue which is no longer supported by
GCC 4.0.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9fd5c3b..875a2e9 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-09  Rodney Brown  <rbrown@bravurasolutions.com.au>
+           Nick Clifton  <nickc@redhat.com>
+
+       * aix5ppc-core.c (xcoff64_core_p): Constify return_value
+       variable.  Also, do not use core_hdr macro as it evaluates to a
+       cast of an lvalue which is no longer supported by GCC 4.0.
+
 2005-08-08  Eric Dönges <Eric.Doenges@betty-tv.com>
 
        * archures.c (bfd_mach_msp21): New MSP430 machine number.

diff --git a/bfd/aix5ppc-core.c b/bfd/aix5ppc-core.c
index 89b6d8a..6b588ba 100644 (file)
--- a/bfd/aix5ppc-core.c
+++ b/bfd/aix5ppc-core.c
@@ -1,5 +1,5 @@
 /* IBM RS/6000 "XCOFF" back-end for BFD.
-   Copyright 2001, 2002, 2003, 2004
+   Copyright 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
    Written by Tom Rix
    Contributed by Red Hat Inc.
@@ -55,7 +55,7 @@ xcoff64_core_p (bfd *abfd)
   bfd_vma ld_offset;
   bfd_size_type i;
   struct vm_infox vminfo;
-  bfd_target *return_value = NULL;
+  const bfd_target *return_value = NULL;
 
   /* Get the header.  */
   if (bfd_seek (abfd, 0, SEEK_SET) != 0)
@@ -111,7 +111,10 @@ xcoff64_core_p (bfd *abfd)
     return return_value;
 
   memcpy (new_core_hdr, &core, sizeof (struct core_dumpxx));
-  core_hdr(abfd) = (char *)new_core_hdr;
+  /* The core_hdr() macro is no longer used here because it would
+     expand to code relying on gcc's cast-as-lvalue extension,
+     which was removed in gcc 4.0.  */
+  abfd->tdata.any = new_core_hdr;
 
   /* .stack section.  */
   sec = bfd_make_section_anyway (abfd, ".stack");