diff options
author | Lucas A. M. Magalhaes <lamm@linux.ibm.com> | 2022-07-14 14:37:22 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-08-04 09:09:48 -0300 |
commit | 8ee878592c4a642937152c8308b8faef86bcfc40 (patch) | |
tree | bc02c572bc8c3441d59922be09705b27870e2793 /elf/readlib.c | |
parent | 5a57ad23ba73be7aefd2c243489330f5cd8d3ca6 (diff) | |
download | glibc-8ee878592c4a642937152c8308b8faef86bcfc40.tar.gz glibc-8ee878592c4a642937152c8308b8faef86bcfc40.tar.xz glibc-8ee878592c4a642937152c8308b8faef86bcfc40.zip |
Assume only FLAG_ELF_LIBC6 suport
The older libc versions are obsolete for over twenty years now. This patch removes the special flags for libc5 and libc4 and assumes that all libraries cached are libc6 compatible and use FLAG_ELF_LIBC6. Checked with a build for all affected architectures. Co-authored-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf/readlib.c')
-rw-r--r-- | elf/readlib.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/elf/readlib.c b/elf/readlib.c index ed42fbd48e..be65e3d0e9 100644 --- a/elf/readlib.c +++ b/elf/readlib.c @@ -43,24 +43,6 @@ struct known_names int flag; }; -static struct known_names interpreters[] = -{ - { "/lib/" LD_SO, FLAG_ELF_LIBC6 }, -#ifdef SYSDEP_KNOWN_INTERPRETER_NAMES - SYSDEP_KNOWN_INTERPRETER_NAMES -#endif -}; - -static struct known_names known_libs[] = -{ - { LIBC_SO, FLAG_ELF_LIBC6 }, - { LIBM_SO, FLAG_ELF_LIBC6 }, -#ifdef SYSDEP_KNOWN_LIBRARY_NAMES - SYSDEP_KNOWN_LIBRARY_NAMES -#endif -}; - - /* Check if string corresponds to a GDB Python file. */ static bool is_gdb_python_file (const char *name) @@ -83,7 +65,8 @@ process_file (const char *real_file_name, const char *file_name, struct exec *aout_header; ret = 0; - *flag = FLAG_ANY; + /* Just set FLAG_ELF_LIBC6 as old formats are not supported anymore. */ + *flag = FLAG_ELF_LIBC6; *soname = NULL; file = fopen (real_file_name, "rb"); @@ -150,7 +133,6 @@ process_file (const char *real_file_name, const char *file_name, *dot = '\0'; } *soname = copy; - *flag = FLAG_LIBC4; goto done; } @@ -191,9 +173,6 @@ implicit_soname (const char *lib, int flag) { char *soname = xstrdup (lib); - if ((flag & FLAG_TYPE_MASK) != FLAG_LIBC4) - return soname; - /* Aout files don't have a soname, just return the name including the major number. */ char *major = strstr (soname, ".so."); |