From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 19 Sep 2006 17:07:04 +0000 (+0000)
Subject: * elf/dl-cache.c (HWCAP_CHECK): If _DL_PLATFORMS_COUNT, but
X-Git-Tag: cvs/fedora-glibc-20060919T1816
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33315cedf5da9c1974a0dff0097af074cf8dbb42;p=platform%2Fupstream%2Fglibc.git

* elf/dl-cache.c (HWCAP_CHECK): If _DL_PLATFORMS_COUNT, but

	platform == -1, reject any libs with non-zero _DL_HWCAP_PLATFORM
	bits.
---

diff --git a/ChangeLog b/ChangeLog
index 5520fce..7135922 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf/dl-cache.c (HWCAP_CHECK): If _DL_PLATFORMS_COUNT, but
+	platform == -1, reject any libs with non-zero _DL_HWCAP_PLATFORM
+	bits.
+
 2006-09-19  Ulrich Drepper  <drepper@redhat.com>
 
 	* elf/dl-close.c (_dl_close): If dependency is not unloaded make
diff --git a/elf/dl-cache.c b/elf/dl-cache.c
index 29886e1..fc7d991 100644
--- a/elf/dl-cache.c
+++ b/elf/dl-cache.c
@@ -1,5 +1,5 @@
 /* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
-   Copyright (C) 1996-2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1996-2002, 2003, 2004, 2006 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
@@ -264,7 +264,7 @@ _dl_load_cache_lookup (const char *name)
 #define HWCAP_CHECK \
       if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion))	      \
 	continue;							      \
-      if (_DL_PLATFORMS_COUNT && platform != -1				      \
+      if (_DL_PLATFORMS_COUNT						      \
 	  && (lib->hwcap & _DL_HWCAP_PLATFORM) != 0			      \
 	  && (lib->hwcap & _DL_HWCAP_PLATFORM) != platform)		      \
 	continue;							      \