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

platform == -1, reject any libs with non-zero _DL_HWCAP_PLATFORM bits.
git-mirror · Sep 19, 2006 · 33315ce · 33315ce
1 parent 1ee2ff2
commit 33315ce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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;							      \