merge of b305fe132f91c44a41a877a48efc3bdfda785b73

     and c4704f02db5f42d7bcdb2feafc6199d7ac132da3

diff --git a/backends/ChangeLog b/backends/ChangeLog
index c054c58ed55a93559f62baab6d7df775823dc02b..b5ae13045358c9abb7eb19944ec1241b62565eaf 100644 (file)
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Roland McGrath  <roland@redhat.com>
+
+       * ppc64_retval.c: Remove SVR4_STRUCT_RETURN braino.
+
 2006-06-12  Ulrich Drepper  <drepper@redhat.com>
 
        * common-reloc.c (none_reloc_p): New function.

diff --git a/backends/ppc64_retval.c b/backends/ppc64_retval.c
index 70a0de7641205824147e21ecba762bcc87d06373..7f5e6f83d7785c7798c60b4e29d9ac7fa2094fe1 100644 (file)
--- a/backends/ppc64_retval.c
+++ b/backends/ppc64_retval.c
@@ -34,10 +34,6 @@
 #include "libebl_CPU.h"
 
 
-/* This is the SVR4 ELF ABI convention, but AIX and Linux do not use it.  */
-#define SVR4_STRUCT_RETURN 0
-
-
 /* r3.  */
 static const Dwarf_Op loc_intreg[] =
   {
@@ -137,7 +133,7 @@ ppc64_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp)
                return nloc_fp4regs;
            }
        }
-      if (size <= 8 && SVR4_STRUCT_RETURN)
+      if (size <= 8)
        {
        intreg:
          *locp = loc_intreg;

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 1a49526d5e71d7a4c823ffca3d6c7f0e8419a4cf..96fe56bc6c6f613c70e9e75cd64d7e8c93107b9d 100644 (file)
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-13  Roland McGrath  <roland@redhat.com>
+
+       * elf-from-memory.c (elf_from_remote_memory): Fix 32/64 typo.
+       Use __libdwfl_seterrno for elf_memory failure.
+
 2006-05-27  Ulrich Drepper  <drepper@redhat.com>
 
        * libdwfl.h: Add extern "C".

diff --git a/libdwfl/elf-from-memory.c b/libdwfl/elf-from-memory.c
index 90a0c4d808887122077a78cf1cb03af145078e28..2a174759b93ef81a25ed1f5d4fe8fec9f4c25db0 100644 (file)
--- a/libdwfl/elf-from-memory.c
+++ b/libdwfl/elf-from-memory.c
@@ -1,5 +1,5 @@
 /* Reconstruct an ELF file by reading the segments out of remote memory.
-   Copyright (C) 2005 Red Hat, Inc.
+   Copyright (C) 2005, 2006 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -338,7 +338,7 @@ elf_from_remote_memory (GElf_Addr ehdr_vma,
       xlatefrom.d_size = xlateto.d_size = sizeof ehdr.e64;
       xlatefrom.d_buf = &ehdr.e64;
       xlateto.d_buf = buffer;
-      if (elf32_xlatetof (&xlateto, &xlatefrom,
+      if (elf64_xlatetof (&xlateto, &xlatefrom,
                          ehdr.e64.e_ident[EI_DATA]) == NULL)
        goto libelf_error;
       break;
@@ -354,7 +354,7 @@ elf_from_remote_memory (GElf_Addr ehdr_vma,
   if (elf == NULL)
     {
       free (buffer);
-      return NULL;
+      goto libelf_error;
     }
 
   elf->flags |= ELF_F_MALLOCED;