diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-03-04 10:27:15 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-05-16 15:03:49 -0300 |
| commit | c628c2296392ed3bf2cb8d8470668e64fe53389f (patch) | |
| tree | 9b81205495c9f84e216555e5630ece715a1c1523 /sysdeps/generic | |
| parent | b46d250656794e63a2946c481fda29271342dd1a (diff) | |
| download | glibc-c628c2296392ed3bf2cb8d8470668e64fe53389f.tar.gz glibc-c628c2296392ed3bf2cb8d8470668e64fe53389f.tar.xz glibc-c628c2296392ed3bf2cb8d8470668e64fe53389f.zip | |
elf: Remove ldconfig kernel version check
Now that it was removed on libc.so.
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/dl-cache.h | 2 | ||||
| -rw-r--r-- | sysdeps/generic/ldconfig.h | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h index df385dca2d..93d4bea930 100644 --- a/sysdeps/generic/dl-cache.h +++ b/sysdeps/generic/dl-cache.h @@ -95,7 +95,7 @@ struct file_entry_new uint32_t key, value; /* String table indices. */ }; }; - uint32_t osversion; /* Required OS version. */ + uint32_t osversion_unused; /* Required OS version (unused). */ uint64_t hwcap; /* Hwcap entry. */ }; diff --git a/sysdeps/generic/ldconfig.h b/sysdeps/generic/ldconfig.h index 94f008bd90..7cc898db61 100644 --- a/sysdeps/generic/ldconfig.h +++ b/sysdeps/generic/ldconfig.h @@ -70,8 +70,7 @@ const char *glibc_hwcaps_subdirectory_name extern void add_to_cache (const char *path, const char *filename, const char *soname, int flags, - unsigned int osversion, unsigned int isa_level, - uint64_t hwcap, + unsigned int isa_level, uint64_t hwcap, struct glibc_hwcaps_subdirectory *); extern void init_aux_cache (void); @@ -79,28 +78,23 @@ extern void init_aux_cache (void); extern void load_aux_cache (const char *aux_cache_name); extern int search_aux_cache (struct stat *stat_buf, int *flags, - unsigned int *osversion, unsigned int *isa_level, char **soname); extern void add_to_aux_cache (struct stat *stat_buf, int flags, - unsigned int osversion, unsigned int isa_level, const char *soname); extern void save_aux_cache (const char *aux_cache_name); /* Declared in readlib.c. */ extern int process_file (const char *real_file_name, const char *file_name, - const char *lib, int *flag, - unsigned int *osversion, unsigned int *isa_level, - char **soname, int is_link, - struct stat *stat_buf); + const char *lib, int *flag, unsigned int *isa_level, + char **soname, int is_link, struct stat *stat_buf); extern char *implicit_soname (const char *lib, int flag); /* Declared in readelflib.c. */ extern int process_elf_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); /* Declared in chroot_canon.c. */ |