aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-12-10 10:31:03 +0000
committerRoland McGrath <roland@gnu.org>2002-12-10 10:31:03 +0000
commit2402cdf37f8b8f9310af01ce9370d5e111402add (patch)
tree94439ffad1ce602391190fc6caf2c8fa9b769fd1
parent4e71f81ec2a0a767aa21d3e72a1425d16cd51acf (diff)
downloadglibc-2402cdf37f8b8f9310af01ce9370d5e111402add.tar
glibc-2402cdf37f8b8f9310af01ce9370d5e111402add.tar.gz
glibc-2402cdf37f8b8f9310af01ce9370d5e111402add.tar.bz2
glibc-2402cdf37f8b8f9310af01ce9370d5e111402add.zip
* 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.
-rw-r--r--ChangeLog21
-rw-r--r--elf/dl-support.c4
2 files changed, 25 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d7e42befd..8106f16d19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+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.
+
2002-12-10 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/closedir.c (__closedir): Remove __libc_lock_lock
diff --git a/elf/dl-support.c b/elf/dl-support.c
index 7d56237e1d..a7a810935c 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -214,6 +214,10 @@ _dl_non_dynamic_init (void)
DL_PLATFORM_INIT;
#endif
+#ifdef DL_OSVERSION_INIT
+ DL_OSVERSION_INIT;
+#endif
+
/* Now determine the length of the platform string. */
if (_dl_platform != NULL)
_dl_platformlen = strlen (_dl_platform);