diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-09-19 17:07:04 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-09-19 17:07:04 +0000 |
| commit | 33315cedf5da9c1974a0dff0097af074cf8dbb42 (patch) | |
| tree | 3fc8770769760c714e7393bd004484a42755fbac | |
| parent | 1ee2ff2053aeaa43987275c3aad5e6e42716f50e (diff) | |
| download | glibc-33315cedf5da9c1974a0dff0097af074cf8dbb42.tar.gz glibc-33315cedf5da9c1974a0dff0097af074cf8dbb42.tar.xz glibc-33315cedf5da9c1974a0dff0097af074cf8dbb42.zip | |
* elf/dl-cache.c (HWCAP_CHECK): If _DL_PLATFORMS_COUNT, but cvs/fedora-glibc-20060919T1847 cvs/fedora-glibc-20060919T1816
platform == -1, reject any libs with non-zero _DL_HWCAP_PLATFORM bits.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/dl-cache.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 5520fce35d..71359229ad 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 29886e194a..fc7d9916c6 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; \ |