diff options
| author | Roland McGrath <roland@gnu.org> | 2002-12-10 10:30:54 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-12-10 10:30:54 +0000 |
| commit | 4e71f81ec2a0a767aa21d3e72a1425d16cd51acf (patch) | |
| tree | 6ad138067788cd865ae14bf659b86d565c84feed /sysdeps/unix/sysv/linux/i386/dl-librecon.h | |
| parent | 5a6dcd0d8952ae3a4bf50fe921617ed52f51669e (diff) | |
2002-12-10 Roland McGrath <roland@redhat.com>
* sysdeps/unix/sysv/linux/dl-librecon.h (EXTRA_LD_ENVVARS): Refer to
and move contents to ...
(EXTRA_LD_ENVVARS_LINUX): ... this new macro. Add break for nonmatch.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS): Use
it instead of duplicating its contents.
(EXTRA_LD_ENVVARS): Likewise. Add break for nonmatch.
2002-12-09 Jakub Jelinek <jakub@redhat.com>
* elf/dl-support.c (_dl_non_dynamic_init): Add DL_OSVERSION_INIT if
defined.
* sysdeps/unix/sysv/linux/dl-librecon.h (_dl_osversion_init): New
function.
(EXTRA_LD_ENVVARS): Use it.
(DL_OSVERSION_INIT): Define.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Include linux
dl-librecon.h.
(EXTRA_LD_ENVVARS): Undef before defining. Use _dl_osversion_init.
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386/dl-librecon.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/dl-librecon.h | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/dl-librecon.h b/sysdeps/unix/sysv/linux/i386/dl-librecon.h index e01631146a..3163c58103 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-librecon.h +++ b/sysdeps/unix/sysv/linux/i386/dl-librecon.h @@ -19,7 +19,8 @@ 02111-1307 USA. */ #ifndef _DL_LIBRECON_H -#define _DL_LIBRECON_H 1 + +#include <sysdeps/unix/sysv/linux/dl-librecon.h> #define DISTINGUISH_LIB_VERSIONS \ do \ @@ -47,36 +48,12 @@ while (0) /* Recognizing extra environment variables. */ -#define EXTRA_LD_ENVVARS \ - case 13: \ - if (memcmp (envline, "ASSUME_KERNEL", 13) == 0) \ - { \ - unsigned long int i, j, osversion = 0; \ - char *p = &envline[14], *q; \ - \ - for (i = 0; i < 3; i++, p = q + 1) \ - { \ - j = __strtoul_internal (p, &q, 0, 0); \ - if (j >= 255 || p == q || (i < 2 && *q && *q != '.')) \ - { \ - osversion = 0; \ - break; \ - } \ - osversion |= j << (16 - 8 * i); \ - if (!*q) \ - break; \ - } \ - if (osversion) \ - GL(dl_osversion) = osversion; \ - break; \ - } \ - \ +#undef EXTRA_LD_ENVVARS +#define EXTRA_LD_ENVVARS EXTRA_LD_ENVVARS_LINUX \ case 15: \ if (memcmp (envline, "LIBRARY_VERSION", 15) == 0) \ - { \ - GL(dl_correct_cache_id) = envline[16] == '5' ? 2 : 3; \ - break; \ - } + GL(dl_correct_cache_id) = envline[16] == '5' ? 2 : 3; \ + break; \ /* Extra unsecure variables. The names are all stuffed in a single string which means they have to be terminated with a '\0' explicitly. */ |