diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2020-12-05 07:01:58 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2021-01-13 05:51:17 -0800 |
| commit | efbbd9c33adfa843d65860b1b02adebb8ecb57ce (patch) | |
| tree | 79c61c55698036fc99ec936ea400c7a9975eef28 /sysdeps/unix/sysv/linux/mips | |
| parent | 86a4d3fa7d1bda3c02cf713cf289d6f893970117 (diff) | |
| download | glibc-efbbd9c33adfa843d65860b1b02adebb8ecb57ce.tar.gz glibc-efbbd9c33adfa843d65860b1b02adebb8ecb57ce.tar.xz glibc-efbbd9c33adfa843d65860b1b02adebb8ecb57ce.zip | |
ldconfig/x86: Store ISA level in cache and aux cache
Store ISA level in the portion of the unused upper 32 bits of the hwcaps field in cache and the unused pad field in aux cache. ISA level is stored and checked only for shared objects in glibc-hwcaps subdirectories. The shared objects in the default directories aren't checked since there are no fallbacks for these shared objects. Tested on x86-64-v2, x86-64-v3 and x86-64-v4 machines with --disable-hardcoded-path-in-tests and --enable-hardcoded-path-in-tests.
Diffstat (limited to 'sysdeps/unix/sysv/linux/mips')
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/readelflib.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/mips/readelflib.c b/sysdeps/unix/sysv/linux/mips/readelflib.c index e50bc3ce23..d0e809d893 100644 --- a/sysdeps/unix/sysv/linux/mips/readelflib.c +++ b/sysdeps/unix/sysv/linux/mips/readelflib.c @@ -20,18 +20,20 @@ <https://www.gnu.org/licenses/>. */ -int process_elf32_file (const char *file_name, const char *lib, int *flag, - unsigned int *osversion, char **soname, +int process_elf32_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); -int process_elf64_file (const char *file_name, const char *lib, int *flag, - unsigned int *osversion, char **soname, +int process_elf64_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); /* 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, char **soname, void *file_contents, - size_t file_length) + unsigned int *osversion, unsigned int *isa_level, + char **soname, void *file_contents, size_t file_length) { union { @@ -45,8 +47,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, soname, - file_contents, file_length); + ret = process_elf32_file (file_name, lib, flag, osversion, isa_level, + soname, file_contents, file_length); if (!ret) { Elf32_Word flags = elf_header.eh32->e_flags; @@ -62,8 +64,8 @@ process_elf_file (const char *file_name, const char *lib, int *flag, } else { - ret = process_elf64_file (file_name, lib, flag, osversion, soname, - file_contents, file_length); + ret = process_elf64_file (file_name, lib, flag, osversion, isa_level, + soname, file_contents, file_length); /* n64 libraries are always libc.so.6+. */ if (!ret) { |