aboutsummaryrefslogtreecommitdiff
path: root/elf/rtld.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-03-08 07:35:10 +0000
committerUlrich Drepper <drepper@redhat.com>2008-03-08 07:35:10 +0000
commit7c22c7ec9a8170f3d1006ddf21d74cd9d2316332 (patch)
treefba9543f411d48001c40e81cd32b0ed44c0d5928 /elf/rtld.c
parent93025f9373f4efde62aab31aa03c4744fd3bed62 (diff)
downloadglibc-7c22c7ec9a8170f3d1006ddf21d74cd9d2316332.tar
glibc-7c22c7ec9a8170f3d1006ddf21d74cd9d2316332.tar.gz
glibc-7c22c7ec9a8170f3d1006ddf21d74cd9d2316332.tar.bz2
glibc-7c22c7ec9a8170f3d1006ddf21d74cd9d2316332.zip
[BZ #5786]
* elf/dl-sysdep.c: Undefine ROUND after use. * sysdeps/generic/ldsodefs.h [HAVE_DL_DISCOVER_OSVERSION] (struct rtld_global_ro): Add _dl_tls_get_addr_soft element. * elf/rtld.c (rtld_global_ro): Initialize _dl_discover_osversion. * sysdeps/unix/sysv/linux/dl-osinfo.h: Move _dl_discover_osversion to ... * sysdeps/unix/sysv/linux/dl-sysdep.c: ...here. * sysdeps/unix/sysv/linux/dl-sysdep.h: Declare _dl_discover_osversion if necessary. * sysdeps/unix/sysv/linux/sysconf.c: Handle _SC_ARG_MAX here.
Diffstat (limited to 'elf/rtld.c')
-rw-r--r--elf/rtld.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 9497e5d43f..46bece7fa3 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -162,7 +162,10 @@ struct rtld_global_ro _rtld_global_ro attribute_relro =
._dl_check_caller = _dl_check_caller,
._dl_open = _dl_open,
._dl_close = _dl_close,
- ._dl_tls_get_addr_soft = _dl_tls_get_addr_soft
+ ._dl_tls_get_addr_soft = _dl_tls_get_addr_soft,
+#ifdef HAVE_DL_DISCOVER_OSVERSION
+ ._dl_discover_osversion = _dl_discover_osversion
+#endif
};
/* If we would use strong_alias here the compiler would see a
non-hidden definition. This would undo the effect of the previous