diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-03-08 07:35:10 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-03-08 07:35:10 +0000 |
| commit | 7c22c7ec9a8170f3d1006ddf21d74cd9d2316332 (patch) | |
| tree | fba9543f411d48001c40e81cd32b0ed44c0d5928 /sysdeps/unix/sysv/linux/dl-sysdep.h | |
| parent | 93025f9373f4efde62aab31aa03c4744fd3bed62 (diff) | |
| download | glibc-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 'sysdeps/unix/sysv/linux/dl-sysdep.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-sysdep.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.h b/sysdeps/unix/sysv/linux/dl-sysdep.h index becfc8df3f..0371fe87a1 100644 --- a/sysdeps/unix/sysv/linux/dl-sysdep.h +++ b/sysdeps/unix/sysv/linux/dl-sysdep.h @@ -1,5 +1,5 @@ /* System-specific settings for dynamic linker code. Linux version. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,3 +25,12 @@ we aren't making direct use of it. So enable this across the board. */ #define NEED_DL_SYSINFO_DSO 1 + + +/* The _dl_discover_osversion function is so far only needed in sysconf + to check for kernels later than 2.6.23. */ +#if !defined ASSEMBLER && __LINUX_KERNEL_VERSION < 0x020617 +/* Get version of the OS. */ +extern int _dl_discover_osversion (void) attribute_hidden; +# define HAVE_DL_DISCOVER_OSVERSION 1 +#endif |