From: Jakub Jelinek Date: Mon, 30 May 2005 09:42:34 +0000 (+0000) Subject: * sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): If X-Git-Tag: cvs/fedora-glibc-2_3_5-10~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aaf3c46d4c8bd6c5333af21247135e911e12f0d;p=thirdparty%2Fglibc.git * sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): If GLRO(dl_osversion) has been already set to a value smaller than _dl_discover_osversion (), don't overwrite it here. --- diff --git a/ChangeLog b/ChangeLog index e1023bf0acd..6188d1cd315 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-05-30 Jakub Jelinek + + * sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): If + GLRO(dl_osversion) has been already set to a value smaller than + _dl_discover_osversion (), don't overwrite it here. + 2005-05-23 Roland McGrath * sysdeps/arm, sysdeps/unix/arm, sysdeps/unix/sysv/linux/arm: diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h index befa804cb1f..03e1de716ca 100644 --- a/sysdeps/unix/sysv/linux/dl-osinfo.h +++ b/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -145,7 +145,9 @@ _dl_discover_osversion (void) int version = _dl_discover_osversion (); \ if (__builtin_expect (version >= 0, 1)) \ { \ - GLRO(dl_osversion) = version; \ + if (__builtin_expect (GLRO(dl_osversion) == 0, 1) \ + || GLRO(dl_osversion) > version) \ + GLRO(dl_osversion) = version; \ \ /* Now we can test with the required version. */ \ if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION) \