diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2015-09-29 13:47:38 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2015-09-29 14:35:52 -0700 |
| commit | b67d33c44ca7c0d8709b9d729fb238f51008c50c (patch) | |
| tree | ad9113b82797fac924a0e474bcd6669dba47fcb8 /libelf/gelf_xlatetof.c | |
| parent | 56e6b652fa71abee20fe70c83829928df57d40b2 (diff) | |
| parent | d8698e55cbe95e56c3a4cbd67c320048ea4f087a (diff) | |
| download | android_external_elfutils-b67d33c44ca7c0d8709b9d729fb238f51008c50c.tar.gz android_external_elfutils-b67d33c44ca7c0d8709b9d729fb238f51008c50c.tar.bz2 android_external_elfutils-b67d33c44ca7c0d8709b9d729fb238f51008c50c.zip | |
Merge in latest aosp/upstream-master d8698e55.
git merge d8698e55cbe95e56c3a4cbd67c320048ea4f087a
Include upstream changes up to Wed Sep 23 20:44:06 2015.
Update generated files:
./config.h
./libdw/known-dwarf.h
./version.h
Change-Id: Ica2510edda846659a0c89703aeafe85bd62abab8
Diffstat (limited to 'libelf/gelf_xlatetof.c')
| -rw-r--r-- | libelf/gelf_xlatetof.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libelf/gelf_xlatetof.c b/libelf/gelf_xlatetof.c index 3366bdcd..e2661805 100644 --- a/libelf/gelf_xlatetof.c +++ b/libelf/gelf_xlatetof.c @@ -1,5 +1,5 @@ /* Convert from memory to file representation. Generic ELF version. - Copyright (C) 2000, 2002 Red Hat, Inc. + Copyright (C) 2000, 2002, 2015 Red Hat, Inc. This file is part of elfutils. Written by Ulrich Drepper <drepper@redhat.com>, 2000. @@ -38,11 +38,8 @@ Elf_Data * -gelf_xlatetof (elf, dest, src, encode) - Elf *elf; - Elf_Data *dest; - const Elf_Data * src; - unsigned int encode; +gelf_xlatetof (Elf *elf, Elf_Data *dest, const Elf_Data * src, + unsigned int encode) { if (elf == NULL) return NULL; |