From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 30 May 2005 20:22:25 +0000 (+0000)
Subject: (DL_SYSDEP_OSCHECK): If GLRO(dl_osversion) has been already set to a value smaller... 
X-Git-Tag: upstream/2.20~9644
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=609b254aa3a0488d45d9d828f9582d0e4c47a2dc;p=platform%2Fupstream%2Flinaro-glibc.git

(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/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h
index befa804..03e1de7 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)   \