diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-06-15 03:07:46 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-06-15 03:07:46 +0000 |
| commit | d5a7519085f35bf48c9b33b8698835b24caa2da1 (patch) | |
| tree | 9f61add4cad3bb4f545e93e837c24df8ba601af8 | |
| parent | 595d0e7e9f368f04f0d9e04b902c8dc1073103e6 (diff) | |
| download | elfutils-d5a7519085f35bf48c9b33b8698835b24caa2da1.tar.gz | |
merge of b305fe132f91c44a41a877a48efc3bdfda785b73
and c4704f02db5f42d7bcdb2feafc6199d7ac132da3
| -rw-r--r-- | backends/ChangeLog | 4 | ||||
| -rw-r--r-- | backends/ppc64_retval.c | 6 | ||||
| -rw-r--r-- | libdwfl/ChangeLog | 5 | ||||
| -rw-r--r-- | libdwfl/elf-from-memory.c | 6 |
4 files changed, 13 insertions, 8 deletions
diff --git a/backends/ChangeLog b/backends/ChangeLog index c054c58e..b5ae1304 100644 --- 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 70a0de76..7f5e6f83 100644 --- 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 1a49526d..96fe56bc 100644 --- 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 90a0c4d8..2a174759 100644 --- 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; |