From be8080bdd746ac2b07fb0bcad23a9677844bb200 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 22 Feb 2019 00:28:01 +0100 Subject: libelf: Remove unused internal __elf[32|64]_msize functions. Those functions were intended for ELF versions where the memory and file sizes of data structures are different. They were never used because libelf depends on the file and memory sizes being equal (otherwise using mmap wouldn't work). Signed-off-by: Mark Wielaard --- libelf/ChangeLog | 7 +++++++ libelf/elf32_fsize.c | 2 -- libelf/libelfP.h | 10 ---------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/libelf/ChangeLog b/libelf/ChangeLog index ff00d1de..28cab9c4 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,10 @@ +2019-02-24 Mark Wielaard + + * elf32_fsize.c (local_strong_alias): Remove definition. + (msize): Remove alias. + * libelfP.h (__elf32_msize): Remove definition. + (__elf64_msize): Likewise. + 2019-02-21 Mark Wielaard * common.h (determine_kind): Only accept EV_CURRENT. diff --git a/libelf/elf32_fsize.c b/libelf/elf32_fsize.c index 0f468de5..139f4a91 100644 --- a/libelf/elf32_fsize.c +++ b/libelf/elf32_fsize.c @@ -58,5 +58,3 @@ elfw2(LIBELFBITS, fsize) (Elf_Type type, size_t count, unsigned int version) return (count * __libelf_type_sizes[ELFW(ELFCLASS,LIBELFBITS) - 1][type]); } -#define local_strong_alias(n1, n2) strong_alias (n1, n2) -local_strong_alias (elfw2(LIBELFBITS, fsize), __elfw2(LIBELFBITS, msize)) diff --git a/libelf/libelfP.h b/libelf/libelfP.h index bc9a404d..3a96a3b0 100644 --- a/libelf/libelfP.h +++ b/libelf/libelfP.h @@ -444,16 +444,6 @@ extern const uint_fast8_t __libelf_type_aligns[ELFCLASSNUM - 1][ELF_T_NUM] extern Elf_Type __libelf_data_type (Elf *elf, int sh_type, GElf_Xword align) internal_function; -/* The libelf API does not have such a function but it is still useful. - Get the memory size for the given type. - - These functions cannot be marked internal since they are aliases - of the export elfXX_fsize functions.*/ -extern size_t __elf32_msize (Elf_Type __type, size_t __count, - unsigned int __version) __const_attribute__; -extern size_t __elf64_msize (Elf_Type __type, size_t __count, - unsigned int __version) __const_attribute__; - /* Create Elf descriptor from memory image. */ extern Elf *__libelf_read_mmaped_file (int fildes, void *map_address, -- cgit v1.2.1