diff options
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/dl-cache.c | 8 | ||||
| -rw-r--r-- | sysdeps/generic/dl-librecon.h | 26 |
2 files changed, 32 insertions, 2 deletions
diff --git a/sysdeps/generic/dl-cache.c b/sysdeps/generic/dl-cache.c index 5aa1ea20f3..da7d2e49dd 100644 --- a/sysdeps/generic/dl-cache.c +++ b/sysdeps/generic/dl-cache.c @@ -44,6 +44,10 @@ struct cache_file } libs[0]; }; +/* This is the cache ID we expect. Normally it is 3 for glibc linked + binaries. */ +int _dl_correct_cache_id = 3; + /* Look up NAME in ld.so.cache and return the file name stored there, or null if none is found. */ @@ -92,12 +96,12 @@ _dl_load_cache_lookup (const char *name) ! strcmp (name, ((const char *) &cache->libs[cache->nlibs] + cache->libs[i].key))) { - if ((best == NULL) || (cache->libs[i].flags == 3)) + if ((best == NULL) || (cache->libs[i].flags == _dl_correct_cache_id)) { best = ((const char *) &cache->libs[cache->nlibs] + cache->libs[i].value); - if (cache->libs[i].flags == 3) + if (cache->libs[i].flags == _dl_correct_cache_id) /* We've found an exact match for the shared object and no general `ELF' release. Stop searching. */ break; diff --git a/sysdeps/generic/dl-librecon.h b/sysdeps/generic/dl-librecon.h new file mode 100644 index 0000000000..82bf7135f9 --- /dev/null +++ b/sysdeps/generic/dl-librecon.h @@ -0,0 +1,26 @@ +/* Optional code to distinguish library flavours. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _DL_LIBRECON_H +#define _DL_LIBRECON_H 1 + +/* In the general case we don't do anything. */ + +#endif /* dl-librecon.h */ |