diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r-- | sysdeps/unix/sysv/linux/arm/readelflib.c | 18 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/ia64/readelflib.c | 18 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/readelflib.c | 18 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/readelflib.c | 18 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/riscv/readelflib.c | 18 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/readelflib.c | 18 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/readelflib.c | 18 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86/readelflib.c | 18 |
8 files changed, 64 insertions, 80 deletions
diff --git a/sysdeps/unix/sysv/linux/arm/readelflib.c b/sysdeps/unix/sysv/linux/arm/readelflib.c index 428b0f8..d4956e2 100644 --- a/sysdeps/unix/sysv/linux/arm/readelflib.c +++ b/sysdeps/unix/sysv/linux/arm/readelflib.c @@ -17,19 +17,17 @@ int process_elf32_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); int process_elf64_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); /* Returns 0 if everything is ok, != 0 in case of error. */ int process_elf_file (const char *file_name, const char *lib, int *flag, - unsigned int *osversion, unsigned int *isa_level, - char **soname, void *file_contents, size_t file_length) + unsigned int *isa_level, char **soname, void *file_contents, + size_t file_length) { ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents; int ret; @@ -38,8 +36,8 @@ process_elf_file (const char *file_name, const char *lib, int *flag, { Elf32_Ehdr *elf32_header = (Elf32_Ehdr *) elf_header; - ret = process_elf32_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + ret = process_elf32_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); if (!ret && EF_ARM_EABI_VERSION (elf32_header->e_flags) == EF_ARM_EABI_VER5) { @@ -57,8 +55,8 @@ process_elf_file (const char *file_name, const char *lib, int *flag, } else { - ret = process_elf64_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + ret = process_elf64_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); /* AArch64 libraries are always libc.so.6+. */ if (!ret) *flag = FLAG_AARCH64_LIB64|FLAG_ELF_LIBC6; diff --git a/sysdeps/unix/sysv/linux/ia64/readelflib.c b/sysdeps/unix/sysv/linux/ia64/readelflib.c index cd09181..bfd3558 100644 --- a/sysdeps/unix/sysv/linux/ia64/readelflib.c +++ b/sysdeps/unix/sysv/linux/ia64/readelflib.c @@ -17,30 +17,28 @@ int process_elf32_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); int process_elf64_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); /* Returns 0 if everything is ok, != 0 in case of error. */ int process_elf_file (const char *file_name, const char *lib, int *flag, - unsigned int *osversion, unsigned int *isa_level, - char **soname, void *file_contents, size_t file_length) + unsigned int *isa_level, char **soname, void *file_contents, + size_t file_length) { ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents; int ret; if (elf_header->e_ident [EI_CLASS] == ELFCLASS32) - return process_elf32_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + return process_elf32_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); else { - ret = process_elf64_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + ret = process_elf64_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); /* Intel 64bit libraries are always libc.so.6+. */ if (!ret) *flag = FLAG_IA64_LIB64|FLAG_ELF_LIBC6; diff --git a/sysdeps/unix/sysv/linux/mips/readelflib.c b/sysdeps/unix/sysv/linux/mips/readelflib.c index cfa6a12..8c66ba1 100644 --- a/sysdeps/unix/sysv/linux/mips/readelflib.c +++ b/sysdeps/unix/sysv/linux/mips/readelflib.c @@ -17,19 +17,17 @@ int process_elf32_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); int process_elf64_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); /* Returns 0 if everything is ok, != 0 in case of error. */ int process_elf_file (const char *file_name, const char *lib, int *flag, - unsigned int *osversion, unsigned int *isa_level, - char **soname, void *file_contents, size_t file_length) + unsigned int *isa_level, char **soname, void *file_contents, + size_t file_length) { union { @@ -43,8 +41,8 @@ process_elf_file (const char *file_name, const char *lib, int *flag, elf_header.eh = file_contents; if (elf_header.eh->e_ident [EI_CLASS] == ELFCLASS32) { - ret = process_elf32_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + ret = process_elf32_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); if (!ret) { Elf32_Word flags = elf_header.eh32->e_flags; @@ -60,8 +58,8 @@ process_elf_file (const char *file_name, const char *lib, int *flag, } else { - ret = process_elf64_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + ret = process_elf64_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); /* n64 libraries are always libc.so.6+. */ if (!ret) { diff --git a/sysdeps/unix/sysv/linux/powerpc/readelflib.c b/sysdeps/unix/sysv/linux/powerpc/readelflib.c index 90ea9bf..3b6902e 100644 --- a/sysdeps/unix/sysv/linux/powerpc/readelflib.c +++ b/sysdeps/unix/sysv/linux/powerpc/readelflib.c @@ -18,30 +18,28 @@ int process_elf32_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); int process_elf64_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); /* Returns 0 if everything is ok, != 0 in case of error. */ int process_elf_file (const char *file_name, const char *lib, int *flag, - unsigned int *osversion, unsigned int *isa_level, - char **soname, void *file_contents, size_t file_length) + unsigned int *isa_level, char **soname, void *file_contents, + size_t file_length) { ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents; int ret; if (elf_header->e_ident [EI_CLASS] == ELFCLASS32) - return process_elf32_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + return process_elf32_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); else { - ret = process_elf64_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + ret = process_elf64_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); /* PowerPC 64bit libraries are always libc.so.6+. */ if (!ret) *flag = FLAG_POWERPC_LIB64|FLAG_ELF_LIBC6; diff --git a/sysdeps/unix/sysv/linux/riscv/readelflib.c b/sysdeps/unix/sysv/linux/riscv/readelflib.c index 29f1ac6..db882c0 100644 --- a/sysdeps/unix/sysv/linux/riscv/readelflib.c +++ b/sysdeps/unix/sysv/linux/riscv/readelflib.c @@ -18,12 +18,10 @@ int process_elf32_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); int process_elf64_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); /* The ELF flags supported by our current glibc port: @@ -40,8 +38,8 @@ int process_elf64_file (const char *file_name, const char *lib, /* Returns 0 if everything is ok, != 0 in case of error. */ int process_elf_file (const char *file_name, const char *lib, int *flag, - unsigned int *osversion, unsigned int *isa_level, - char **soname, void *file_contents, size_t file_length) + unsigned int *isa_level, char **soname, void *file_contents, + size_t file_length) { ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents; Elf32_Ehdr *elf32_header = (Elf32_Ehdr *) elf_header; @@ -54,14 +52,14 @@ process_elf_file (const char *file_name, const char *lib, int *flag, if (elf_header->e_ident [EI_CLASS] == ELFCLASS32) { - ret = process_elf32_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + ret = process_elf32_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); flags = elf32_header->e_flags; } else { - ret = process_elf64_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + ret = process_elf64_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); flags = elf64_header->e_flags; } diff --git a/sysdeps/unix/sysv/linux/s390/readelflib.c b/sysdeps/unix/sysv/linux/s390/readelflib.c index e3f51cc..063fce9 100644 --- a/sysdeps/unix/sysv/linux/s390/readelflib.c +++ b/sysdeps/unix/sysv/linux/s390/readelflib.c @@ -17,30 +17,28 @@ int process_elf32_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); int process_elf64_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); /* Returns 0 if everything is ok, != 0 in case of error. */ int process_elf_file (const char *file_name, const char *lib, int *flag, - unsigned int *osversion, unsigned int *isa_level, - char **soname, void *file_contents, size_t file_length) + unsigned int *isa_level, char **soname, void *file_contents, + size_t file_length) { ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents; int ret; if (elf_header->e_ident [EI_CLASS] == ELFCLASS32) - return process_elf32_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + return process_elf32_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); else { - ret = process_elf64_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + ret = process_elf64_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); /* S/390 64bit libraries are always libc.so.6+. */ if (!ret) *flag = FLAG_S390_LIB64|FLAG_ELF_LIBC6; diff --git a/sysdeps/unix/sysv/linux/sparc/readelflib.c b/sysdeps/unix/sysv/linux/sparc/readelflib.c index bc7b1f4..97d4416 100644 --- a/sysdeps/unix/sysv/linux/sparc/readelflib.c +++ b/sysdeps/unix/sysv/linux/sparc/readelflib.c @@ -17,30 +17,28 @@ int process_elf32_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); int process_elf64_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); /* Returns 0 if everything is ok, != 0 in case of error. */ int process_elf_file (const char *file_name, const char *lib, int *flag, - unsigned int *osversion, unsigned int *isa_level, - char **soname, void *file_contents, size_t file_length) + unsigned int *isa_level, char **soname, void *file_contents, + size_t file_length) { ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents; int ret; if (elf_header->e_ident [EI_CLASS] == ELFCLASS32) - return process_elf32_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + return process_elf32_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); else { - ret = process_elf64_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + ret = process_elf64_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); /* Sparc 64bit libraries are always libc.so.6+. */ if (!ret) *flag = FLAG_SPARC_LIB64|FLAG_ELF_LIBC6; diff --git a/sysdeps/unix/sysv/linux/x86/readelflib.c b/sysdeps/unix/sysv/linux/x86/readelflib.c index 8863b75..cfa2a9d 100644 --- a/sysdeps/unix/sysv/linux/x86/readelflib.c +++ b/sysdeps/unix/sysv/linux/x86/readelflib.c @@ -16,19 +16,17 @@ <https://www.gnu.org/licenses/>. */ int process_elf32_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); int process_elf64_file (const char *file_name, const char *lib, - int *flag, unsigned int *osversion, - unsigned int *isa_level, char **soname, + int *flag, unsigned int *isa_level, char **soname, void *file_contents, size_t file_length); /* Returns 0 if everything is ok, != 0 in case of error. */ int process_elf_file (const char *file_name, const char *lib, int *flag, - unsigned int *osversion, unsigned int *isa_level, - char **soname, void *file_contents, size_t file_length) + unsigned int *isa_level, char **soname, void *file_contents, + size_t file_length) { ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents; int ret, file_flag = 0; @@ -67,11 +65,11 @@ failed: } if (elf_header->e_ident[EI_CLASS] == ELFCLASS32) - ret = process_elf32_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + ret = process_elf32_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); else - ret = process_elf64_file (file_name, lib, flag, osversion, isa_level, - soname, file_contents, file_length); + ret = process_elf64_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); if (!ret && file_flag) *flag = file_flag; |