2005-12-14 08:43:25 +00:00
|
|
|
/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
|
2017-01-01 00:14:16 +00:00
|
|
|
Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
2005-12-14 08:43:25 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 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
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
2005-12-14 08:43:25 +00:00
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <ldsodefs.h>
|
|
|
|
#include <sys/mman.h>
|
|
|
|
#include <dl-cache.h>
|
|
|
|
#include <dl-procinfo.h>
|
2013-05-01 15:46:34 +00:00
|
|
|
#include <stdint.h>
|
2012-03-20 23:00:23 +00:00
|
|
|
#include <_itoa.h>
|
2005-12-14 08:43:25 +00:00
|
|
|
|
|
|
|
#ifndef _DL_PLATFORMS_COUNT
|
|
|
|
# define _DL_PLATFORMS_COUNT 0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* This is the starting address and the size of the mmap()ed file. */
|
|
|
|
static struct cache_file *cache;
|
|
|
|
static struct cache_file_new *cache_new;
|
|
|
|
static size_t cachesize;
|
|
|
|
|
|
|
|
/* 1 if cache_data + PTR points into the cache. */
|
|
|
|
#define _dl_cache_verify_ptr(ptr) (ptr < cache_data_size)
|
|
|
|
|
|
|
|
#define SEARCH_CACHE(cache) \
|
|
|
|
/* We use binary search since the table is sorted in the cache file. \
|
|
|
|
The first matching entry in the table is returned. \
|
|
|
|
It is important to use the same algorithm as used while generating \
|
|
|
|
the cache file. */ \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
left = 0; \
|
|
|
|
right = cache->nlibs - 1; \
|
|
|
|
\
|
|
|
|
while (left <= right) \
|
|
|
|
{ \
|
|
|
|
__typeof__ (cache->libs[0].key) key; \
|
|
|
|
\
|
|
|
|
middle = (left + right) / 2; \
|
|
|
|
\
|
|
|
|
key = cache->libs[middle].key; \
|
|
|
|
\
|
|
|
|
/* Make sure string table indices are not bogus before using \
|
|
|
|
them. */ \
|
|
|
|
if (! _dl_cache_verify_ptr (key)) \
|
|
|
|
{ \
|
|
|
|
cmpres = 1; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
/* Actually compare the entry with the key. */ \
|
|
|
|
cmpres = _dl_cache_libcmp (name, cache_data + key); \
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (cmpres == 0)) \
|
2005-12-14 08:43:25 +00:00
|
|
|
{ \
|
|
|
|
/* Found it. LEFT now marks the last entry for which we \
|
|
|
|
know the name is correct. */ \
|
|
|
|
left = middle; \
|
|
|
|
\
|
|
|
|
/* There might be entries with this name before the one we \
|
|
|
|
found. So we have to find the beginning. */ \
|
|
|
|
while (middle > 0) \
|
|
|
|
{ \
|
|
|
|
__typeof__ (cache->libs[0].key) key; \
|
|
|
|
\
|
|
|
|
key = cache->libs[middle - 1].key; \
|
|
|
|
/* Make sure string table indices are not bogus before \
|
|
|
|
using them. */ \
|
|
|
|
if (! _dl_cache_verify_ptr (key) \
|
|
|
|
/* Actually compare the entry. */ \
|
|
|
|
|| _dl_cache_libcmp (name, cache_data + key) != 0) \
|
|
|
|
break; \
|
|
|
|
--middle; \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
int flags; \
|
|
|
|
__typeof__ (cache->libs[0]) *lib = &cache->libs[middle]; \
|
|
|
|
\
|
|
|
|
/* Only perform the name test if necessary. */ \
|
|
|
|
if (middle > left \
|
|
|
|
/* We haven't seen this string so far. Test whether the \
|
|
|
|
index is ok and whether the name matches. Otherwise \
|
|
|
|
we are done. */ \
|
|
|
|
&& (! _dl_cache_verify_ptr (lib->key) \
|
|
|
|
|| (_dl_cache_libcmp (name, cache_data + lib->key) \
|
|
|
|
!= 0))) \
|
|
|
|
break; \
|
|
|
|
\
|
|
|
|
flags = lib->flags; \
|
|
|
|
if (_dl_cache_check_flags (flags) \
|
|
|
|
&& _dl_cache_verify_ptr (lib->value)) \
|
|
|
|
{ \
|
|
|
|
if (best == NULL || flags == GLRO(dl_correct_cache_id)) \
|
|
|
|
{ \
|
|
|
|
HWCAP_CHECK; \
|
|
|
|
best = cache_data + lib->value; \
|
|
|
|
\
|
|
|
|
if (flags == GLRO(dl_correct_cache_id)) \
|
|
|
|
/* We've found an exact match for the shared \
|
|
|
|
object and no general `ELF' release. Stop \
|
|
|
|
searching. */ \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
while (++middle <= right); \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
if (cmpres < 0) \
|
|
|
|
left = middle + 1; \
|
|
|
|
else \
|
|
|
|
right = middle - 1; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
internal_function
|
|
|
|
_dl_cache_libcmp (const char *p1, const char *p2)
|
|
|
|
{
|
|
|
|
while (*p1 != '\0')
|
|
|
|
{
|
|
|
|
if (*p1 >= '0' && *p1 <= '9')
|
|
|
|
{
|
|
|
|
if (*p2 >= '0' && *p2 <= '9')
|
|
|
|
{
|
|
|
|
/* Must compare this numerically. */
|
|
|
|
int val1;
|
|
|
|
int val2;
|
|
|
|
|
|
|
|
val1 = *p1++ - '0';
|
|
|
|
val2 = *p2++ - '0';
|
|
|
|
while (*p1 >= '0' && *p1 <= '9')
|
|
|
|
val1 = val1 * 10 + *p1++ - '0';
|
|
|
|
while (*p2 >= '0' && *p2 <= '9')
|
|
|
|
val2 = val2 * 10 + *p2++ - '0';
|
|
|
|
if (val1 != val2)
|
|
|
|
return val1 - val2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else if (*p2 >= '0' && *p2 <= '9')
|
|
|
|
return -1;
|
|
|
|
else if (*p1 != *p2)
|
|
|
|
return *p1 - *p2;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
++p1;
|
|
|
|
++p2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return *p1 - *p2;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-02-07 18:53:46 +00:00
|
|
|
/* Look up NAME in ld.so.cache and return the file name stored there, or null
|
|
|
|
if none is found. The cache is loaded if it was not already. If loading
|
2015-01-21 06:51:10 +00:00
|
|
|
the cache previously failed there will be no more attempts to load it.
|
|
|
|
The caller is responsible for freeing the returned string. The ld.so.cache
|
|
|
|
may be unmapped at any time by a completing recursive dlopen and
|
|
|
|
this function must take care that it does not return references to
|
|
|
|
any data in the mapping. */
|
|
|
|
char *
|
2005-12-14 08:43:25 +00:00
|
|
|
internal_function
|
|
|
|
_dl_load_cache_lookup (const char *name)
|
|
|
|
{
|
|
|
|
int left, right, middle;
|
|
|
|
int cmpres;
|
|
|
|
const char *cache_data;
|
|
|
|
uint32_t cache_data_size;
|
|
|
|
const char *best;
|
|
|
|
|
|
|
|
/* Print a message if the loading of libs is traced. */
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS))
|
2005-12-14 08:43:25 +00:00
|
|
|
_dl_debug_printf (" search cache=%s\n", LD_SO_CACHE);
|
|
|
|
|
|
|
|
if (cache == NULL)
|
|
|
|
{
|
|
|
|
/* Read the contents of the file. */
|
|
|
|
void *file = _dl_sysdep_read_whole_file (LD_SO_CACHE, &cachesize,
|
|
|
|
PROT_READ);
|
|
|
|
|
|
|
|
/* We can handle three different cache file formats here:
|
|
|
|
- the old libc5/glibc2.0/2.1 format
|
|
|
|
- the old format with the new format in it
|
|
|
|
- only the new format
|
|
|
|
The following checks if the cache contains any of these formats. */
|
|
|
|
if (file != MAP_FAILED && cachesize > sizeof *cache
|
|
|
|
&& memcmp (file, CACHEMAGIC, sizeof CACHEMAGIC - 1) == 0)
|
|
|
|
{
|
|
|
|
size_t offset;
|
|
|
|
/* Looks ok. */
|
|
|
|
cache = file;
|
|
|
|
|
|
|
|
/* Check for new version. */
|
|
|
|
offset = ALIGN_CACHE (sizeof (struct cache_file)
|
|
|
|
+ cache->nlibs * sizeof (struct file_entry));
|
|
|
|
|
|
|
|
cache_new = (struct cache_file_new *) ((void *) cache + offset);
|
|
|
|
if (cachesize < (offset + sizeof (struct cache_file_new))
|
|
|
|
|| memcmp (cache_new->magic, CACHEMAGIC_VERSION_NEW,
|
|
|
|
sizeof CACHEMAGIC_VERSION_NEW - 1) != 0)
|
|
|
|
cache_new = (void *) -1;
|
|
|
|
}
|
|
|
|
else if (file != MAP_FAILED && cachesize > sizeof *cache_new
|
|
|
|
&& memcmp (file, CACHEMAGIC_VERSION_NEW,
|
|
|
|
sizeof CACHEMAGIC_VERSION_NEW - 1) == 0)
|
|
|
|
{
|
|
|
|
cache_new = file;
|
|
|
|
cache = file;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (file != MAP_FAILED)
|
|
|
|
__munmap (file, cachesize);
|
|
|
|
cache = (void *) -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert (cache != NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cache == (void *) -1)
|
|
|
|
/* Previously looked for the cache file and didn't find it. */
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
best = NULL;
|
|
|
|
|
|
|
|
if (cache_new != (void *) -1)
|
|
|
|
{
|
|
|
|
uint64_t platform;
|
|
|
|
|
|
|
|
/* This is where the strings start. */
|
|
|
|
cache_data = (const char *) cache_new;
|
|
|
|
|
|
|
|
/* Now we can compute how large the string table is. */
|
|
|
|
cache_data_size = (const char *) cache + cachesize - cache_data;
|
|
|
|
|
|
|
|
platform = _dl_string_platform (GLRO(dl_platform));
|
|
|
|
if (platform != (uint64_t) -1)
|
|
|
|
platform = 1ULL << platform;
|
|
|
|
|
[BZ #2510, BZ #2830, BZ #3137, BZ #3313, BZ #3426, BZ #3465, BZ #3480, BZ #3483, BZ #3493, BZ #3514, BZ #3515, BZ #3664, BZ #3673, BZ #3674]
2007-01-11 Jakub Jelinek <jakub@redhat.com>
* sysdeps/i386/soft-fp/sfp-machine.h: Remove.
* sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise.
2007-01-10 Ulrich Drepper <drepper@redhat.com>
* io/fts.c: Make sure fts_cur is always valid after return from
fts_read.
Patch by Miloslav Trmac <mitr@redhat.com>.
2006-10-27 Richard Sandiford <richard@codesourcery.com>
* elf/elf.h (R_MIPS_GLOB_DAT): Define.
(R_MIPS_NUM): Bump by 1.
2007-01-03 Jakub Jelinek <jakub@redhat.com>
* posix/execvp.c: Include alloca.h.
(allocate_scripts_argv): Renamed to...
(scripts_argv): ... this. Don't allocate buffer here nor count
arguments.
(execvp): Use alloca if possible.
* posix/Makefile: Add rules to build and run tst-vfork3 test.
* posix/tst-vfork3.c: New test.
* stdlib/Makefile (tst-strtod3-ENV): Define.
2007-01-02 Ulrich Drepper <drepper@redhat.com>
* posix/getconf.c: Update copyright year.
* nss/getent.c: Likewise.
* iconv/iconvconfig.c: Likewise.
* iconv/iconv_prog.c: Likewise.
* elf/ldconfig.c: Likewise.
* catgets/gencat.c: Likewise.
* csu/version.c: Likewise.
* elf/ldd.bash.in: Likewise.
* elf/sprof.c (print_version): Likewise.
* locale/programs/locale.c: Likewise.
* locale/programs/localedef.c: Likewise.
* nscd/nscd.c (print_version): Likewise.
* debug/xtrace.sh: Likewise.
* malloc/memusage.sh: Likewise.
* malloc/mtrace.pl: Likewise.
* debug/catchsegv.sh: Likewise.
2006-12-24 Ulrich Drepper <drepper@redhat.com>
* malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment
attempts.
2006-12-23 Ulrich Drepper <drepper@redhat.com>
* posix/wordexp.c: Remove some unnecessary tests.
2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp>
* sysdeps/unix/sysv/linux/sh/bits/shm.h: New file.
* nss/getXXbyYY_r.c: Include atomic.h.
(INTERNAL (REENTRANT_NAME)): Write startp after start_fct,
add atomic_write_barrier () in between.
2006-11-28 Jakub Jelinek <jakub@redhat.com>
* elf/dl-support.c: Include dl-procinfo.h.
* sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4,
PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS,
PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X):
Define.
(_dl_string_platform): Use PPC_PLATFORM_* macros instead of
hardcoded constants.
* sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use
PPC_PLATFORM_* macros for array designators.
2006-11-11 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap
names to the beginning.
(_dl_powerpc_platforms): Add "power6x".
* sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease.
(HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP.
(_DL_PLATFORMS_COUNT): Increase.
(_dl_string_platform): Handle power6x case.
* sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP,
PPC_FEATURE_POWER6_EXT): Define.
(PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment.
[-2^31 .. 2^31) range.
* sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME.
* sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags):
Handle relatime mount option.
2006-12-13 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include
kernel-features.h.
2006-12-11 Ulrich Drepper <drepper@redhat.com>
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand
separators also if no non-zero digits found.
* stdlib/Makefile (tests): Add tst-strtod3.
[BZ #3664]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize
empty parsed strings.
* stdlib/Makefile (tests): Add tst-strtod2.
* stdlib/tst-strtod2.c: New file.
[BZ #3673]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit
computation.
* stdlib/Makefile (tests): Add tst-atof2.
* stdlib/tst-atof2.c: New file.
[BZ #3674]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value
correctly if removing trailing zero of hex-float.
* stdlib/Makefile (tests): Add tst-atof1.
* stdlib/tst-atof1.c: New file.
* misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest.
Start searching for next comma at p rather than rest.
* misc/Makefile (tests): Add tst-mntent2.
* misc/tst-mntent2.c: New test.
2006-12-08 Ulrich Drepper <drepper@redhat.com>
* malloc/memusage.c: Handle realloc with new size of zero and
non-NULL pointer correctly.
(me): Really write first record twice.
(struct entry): Make format bi-arch safe.
(dest): Write out more realloc statistics.
* malloc/memusagestat.c (struct entry): Make format bi-arch safe.
2006-12-05 Jakub Jelinek <jakub@redhat.com>
* nis/nis_subr.c (nis_getnames): Revert last change.
2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/sys/io.h: Removed.
2006-11-30 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/i386/i686/memcmp.S: Use jump table as the base of
jump table entries.
2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com>
* sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost
`clone' function to ensure proper unwinding stop of gdb.
* sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise.
2006-12-01 Ulrich Drepper <drepper@redhat.com>
* nscd/nscd.init: Remove obsolete and commented-out -S option
handling.
2006-11-23 Jakub Jelinek <jakub@redhat.com>
[BZ #3514]
* manual/string.texi (strncmp): Fix pastos from wcscmp description.
[BZ #3515]
* manual/string.texi (strtok): Remove duplicate paragraph.
2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with
libgcc not supporting `rflags' unwinding (register # >= 17).
2006-11-30 Jakub Jelinek <jakub@redhat.com>
* sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc
succeeded.
2006-11-29 Daniel Jacobowitz <dan@codesourcery.com>
Jakub Jelinek <jakub@redhat.com>
Jan Kratochvil <jan.kratochvil@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct
unwind information.
* sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for
'restore_rt' even in the 'signal' directory.
* sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list.
malloc crashed. Don't allocate memory unnecessarily in each
loop.
2006-10-21 Jakub Jelinek <jakub@redhat.com>
* resolv/mapv4v6addr.h (map_v4v6_address): Fix last change.
2006-11-20 Ulrich Drepper <drepper@redhat.com>
* resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit.
2006-11-18 Bruno Haible <bruno@clisp.org>
* sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke
__sysconf only after having tried to call getgroups32.
2006-11-19 Ulrich Drepper <drepper@redhat.com>
* nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style
addresses for IPv4 queries if they can be mapped.
2006-11-16 Jakub Jelinek <jakub@redhat.com>
* sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text.
* sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise.
(signmask): Add .size directive.
(othermask): Add .type directive.
2006-11-14 Ulrich Drepper <drepper@redhat.com>
* po/nl.po: Update from translation team.
* timezone/zdump.c: Redo fix for BZ #3137.
2006-11-14 Jakub Jelinek <jakub@redhat.com>
* nss/nss_files/files-alias.c (get_next_alias): Set line back
to first_unused after parsing :include: file.
* timezone/africa: Update from tzdata2006o.
* timezone/antarctica: Likewise.
* timezone/asia: Likewise.
* timezone/australasia: Likewise.
* timezone/backward: Likewise.
* timezone/europe: Likewise.
* timezone/iso3166.tab: Likewise.
* timezone/northamerica: Likewise.
* timezone/southamerica: Likewise.
* timezone/zone.tab: Likewise.
* time/tzfile.c (__tzfile_read): Extend to handle new file format
on machines with 64-bit time_t.
* timezone/checktab.awk: Update from tzcode2006o.
* timezone/ialloc.c: Likewise.
* timezone/private.h: Likewise.
* timezone/scheck.c: Likewise.
* timezone/tzfile.h: Likewise.
* timezone/tzselect.ksh: Likewise.
* timezone/zdump.c: Likewise.
* timezone/zic.c: Likewise.
[BZ #3483]
* elf/ldconfig.c (main): Call setlocale and textdomain.
Patch mostly by Benno Schulenberg <bensberg@justemail.net>.
[BZ #3480]
* manual/argp.texi: Fix typos.
* manual/charset.texi: Likewise.
* manual/errno.texi: Likewise.
* manual/filesys.texi: Likewise.
* manual/lang.texi: Likewise.
* manual/maint.texi: Likewise.
* manual/memory.texi: Likewise.
* manual/message.texi: Likewise.
* manual/resource.texi: Likewise.
* manual/search.texi: Likewise.
* manual/signal.texi: Likewise.
* manual/startup.texi: Likewise.
* manual/stdio.texi: Likewise.
* manual/sysinfo.texi: Likewise.
* manual/syslog.texi: Likewise.
* manual/time.texi: Likewise.
Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
[BZ #3465]
* sunrpc/clnt_raw.c: Minimal message improvements.
* sunrpc/pm_getmaps.c: Likewise.
* nis/nss_nisplus/nisplus-publickey.c: Likewise.
* nis/nis_print_group_entry.c: Likewise.
* locale/programs/repertoire.c: Likewise.
* locale/programs/charmap.c: Likewise.
* malloc/memusage.sh: Likewise.
* elf/dl-deps.c: Likewise.
* locale/programs/ld-collate.c: Likewise.
* libio/vswprintf.c: Likewise.
* malloc/memusagestat.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/rpc_main.c: Likewise.
* nscd/cache.c: Likewise.
* locale/programs/repertoire.c: Unify output messages.
* locale/programs/charmap.c: Likewise.
* locale/programs/ld-ctype.c: Likewise.
* locale/programs/ld-monetary.c: Likewise.
* locale/programs/ld-numeric.c: Likewise.
* locale/programs/ld-time.c: Likewise.
* elf/ldconfig.c: Likewise.
* nscd/selinux.c: Likewise.
* elf/cache.c: Likewise.
Patch mostly by Benno Schulenberg <bensberg@justemail.net>.
2006-11-10 Jakub Jelinek <jakub@redhat.com>
* string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization
if N is one bigger than return value.
* string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1
and l1 last arguments, if buf is defined, verify the return value
equals to strlen (buf) and verify no byte beyond passed length
is modified.
2006-11-10 Ulrich Drepper <drepper@redhat.com>
* po/sv.po: Update from translation team.
* sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev):
Use __new_sys_siglist instead of _sys_siglist_internal as
second macro argument.
(_old_sys_siglist): Use declare_symbol_alias macro instead of
strong_alias.
2006-11-09 Ulrich Drepper <drepper@redhat.com>
[BZ #3493]
* posix/unistd.h (sysconf): Remove const attribute.
* sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for
temporary or deprecated addresses.
Patch by Sridhar Samudrala <sri@us.ibm.com>.
* string/Makefile (tests): Add tst-strxfrm2.
* string/tst-strxfrm2.c: New file.
2006-10-09 Jakub Jelinek <jakub@redhat.com>
* elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0
rather than r->r_brk.
* string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal
optimization even if needed > n.
2006-11-07 Jakub Jelinek <jakub@redhat.com>
* include/libc-symbols.h (declare_symbol): Rename to...
(declare_symbol_alias): ... this. Add ORIGINAL argument, imply
strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes
.size directive.
* sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias
changes.
* sysdeps/gnu/siglist.c: Likewise.
2006-11-03 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/powerpc/fpu/bits/mathinline.h
[__LIBC_INTERNAL_MATH_INLINES]: Moved to ...
* sysdeps/powerpc/fpu/math_private.h: ...here. New file.
2006-11-05 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word):
Update handling of cache descriptor 0x49 for new models.
* sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word):
Likewise.
2006-11-02 Ulrich Drepper <drepper@redhat.com>
* configure.in: Work around ld --help change and avoid -z relro
test completely if the architecture doesn't care about security.
2006-11-01 Ulrich Drepper <drepper@redhat.com>
* po/sv.po: Update from translation team.
2006-10-31 Ulrich Drepper <drepper@redhat.com>
* stdlib/atexit.c (atexit): Don't mark as hidden when used to
generate compatibility version.
2006-10-29 Ulrich Drepper <drepper@redhat.com>
* configure.in: Relax -z relro requirement a bit.
* po/sv.po: Update from translation team.
2006-10-29 Jakub Jelinek <jakub@redhat.com>
* elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P.
* elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise.
* elf/dl-close.c (_dl_close_worker): Likewise.
* elf/dl-open.c (_dl_open_worker): Likewise.
* sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define.
* configure.in: Require assembler support for visibility, compiler
support for visibility and aliases, linker support for various -z
options.
* Makeconfig: Remove conditional code which now is unnecessary.
* config.h.in: Likewise.
* config.make.in: Likewise.
* dlfcn/Makefile: Likewise.
* elf/Makefile: Likewise.
* elf/dl-load.c: Likewise.
* elf/rtld.c: Likewise.
* include/libc-symbols.h: Likewise.
* include/stdio.h: Likewise.
* io/Makefile: Likewise.
* io/fstat.c: Likewise.
* io/fstat64.c: Likewise.
* io/fstatat.c: Likewise.
* io/fstatat64.c: Likewise.
* io/lstat.c: Likewise.
* io/lstat64.c: Likewise.
* io/mknod.c: Likewise.
* io/mknodat.c: Likewise.
* io/stat.c: Likewise.
* io/stat64.c: Likewise.
* libio/stdio.c: Likewise.
* nscd/Makefile: Likewise.
* stdlib/Makefile: Likewise.
* stdlib/atexit.c: Likewise.
* sysdeps/generic/ldsodefs.h: Likewise.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/i386/sysdep.h: Likewise.
* sysdeps/i386/i686/memcmp.S: Likewise.
* sysdeps/powerpc/powerpc32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise.
* Makerules: USE_TLS support is now default.
* tls.make.c: Likewise.
* csu/Versions: Likewise.
* csu/libc-start.c: Likewise.
* csu/libc-tls.c: Likewise.
* csu/version.c: Likewise.
* dlfcn/dlinfo.c: Likewise.
* elf/dl-addr.c: Likewise.
* elf/dl-cache.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-iteratephdr.c: Likewise.
* elf/dl-load.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-reloc.c: Likewise.
* elf/dl-support.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-sysdep.c: Likewise.
* elf/dl-tls.c: Likewise.
* elf/ldconfig.c: Likewise.
* elf/rtld.c: Likewise.
* elf/tst-tls-dlinfo.c: Likewise.
* elf/tst-tls1.c: Likewise.
* elf/tst-tls10.h: Likewise.
* elf/tst-tls14.c: Likewise.
* elf/tst-tls2.c: Likewise.
* elf/tst-tls3.c: Likewise.
* elf/tst-tls4.c: Likewise.
* elf/tst-tls5.c: Likewise.
* elf/tst-tls6.c: Likewise.
* elf/tst-tls7.c: Likewise.
* elf/tst-tls8.c: Likewise.
* elf/tst-tls9.c: Likewise.
* elf/tst-tlsmod1.c: Likewise.
* elf/tst-tlsmod13.c: Likewise.
* elf/tst-tlsmod13a.c: Likewise.
* elf/tst-tlsmod14a.c: Likewise.
* elf/tst-tlsmod2.c: Likewise.
* elf/tst-tlsmod3.c: Likewise.
* elf/tst-tlsmod4.c: Likewise.
* elf/tst-tlsmod5.c: Likewise.
* elf/tst-tlsmod6.c: Likewise.
* include/errno.h: Likewise.
* include/link.h: Likewise.
* include/tls.h: Likewise.
* locale/global-locale.c: Likewise.
* locale/localeinfo.h: Likewise.
* malloc/arena.c: Likewise.
* malloc/hooks.c: Likewise.
* malloc/malloc.c: Likewise.
* resolv/Versions: Likewise.
* sysdeps/alpha/dl-machine.h: Likewise.
* sysdeps/alpha/libc-tls.c: Likewise.
* sysdeps/generic/ldsodefs.h: Likewise.
* sysdeps/generic/tls.h: Likewise.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/ia64/dl-machine.h: Likewise.
* sysdeps/ia64/libc-tls.c: Likewise.
* sysdeps/mach/hurd/fork.c: Likewise.
* sysdeps/mach/hurd/i386/tls.h: Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.c: Likwise.
* sysdeps/powerpc/powerpc32/dl-machine.h: Likewise.
* sysdeps/powerpc/powerpc64/dl-machine.h: Likewise.
* sysdeps/s390/libc-tls.c: Likewise.
* sysdeps/s390/s390-32/dl-machine.h: Likewise.
* sysdeps/s390/s390-64/dl-machine.h: Likewise.
* sysdeps/sh/dl-machine.h: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h: Likewise.
* sysdeps/sparc/sparc64/dl-machine.h: Likewise.
* sysdeps/x86_64/dl-machine.h: Likewise.
[BZ #3426]
* stdlib/stdlib.h: Adjust comment for canonicalize_file_name to
reality.
2006-10-27 Jakub Jelinek <jakub@redhat.com>
* elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope
argument.
(_dl_lookup_symbol_x): Adjust caller.
* sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove
_ns_global_scope.
* elf/rtld.c (dl_main): Don't initialize _ns_global_scope.
* elf/dl-libc.c: Revert l_scope name changes.
* elf/dl-load.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/rtld.c: Likewise.
* elf/dl-close.c (_dl_close): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P,
always use __rtld_mrlock_{change,done}. Always free old scope list
here if not l_scope_mem.
* elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name
change. Never free scope list here. Just __rtld_mrlock_lock before
the lookup and __rtld_mrlock_unlock it after the lookup.
* elf/dl-sym.c: Likewise.
* include/link.h (struct r_scoperec): Remove.
(struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem
with l_scope_mem and l_scoperec_lock with l_scope_lock.
2006-10-25 Ulrich Drepper <drepper@redhat.com>
* sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION.
2006-10-18 Ulrich Drepper <drepper@redhat.com>
* configure.in: Disable building profile libraries by default.
2006-10-18 Ulrich Drepper <drepper@redhat.com>
* elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to
_dl_lookup_symbol_x code.
2006-10-17 Jakub Jelinek <jakub@redhat.com>
* elf/dl-runtime.c: Include sysdep-cancel.h.
(_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and
scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_*
instead of catomic_* macros.
* elf/dl-sym.c: Include sysdep-cancel.h.
(do_sym): Use __rtld_mrlock_* and scoperec->nusers only
if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros.
* elf/dl-close.c: Include sysdep-cancel.h.
(_dl_close): Use __rtld_mrlock_* and scoperec->nusers only
if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros.
* elf/dl-open.c: Include sysdep-cancel.h.
(dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only
if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros.
2006-10-17 Jakub Jelinek <jakub@redhat.com>
[BZ #3313]
* malloc/malloc.c (malloc_consolidate): Set maxfb to address of last
fastbin rather than end of fastbin array.
2006-10-18 Ulrich Drepper <drepper@redhat.com>
* sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct
body macro.
* sysdeps/x86_64/bits/atomic.h
(__arch_c_compare_and_exchange_val_64_acq): Add missing casts.
(catomic_decrement): Use correct body macro.
2006-10-17 Jakub Jelinek <jakub@redhat.com>
* include/atomic.h: Add a unique prefix to all local variables
in macros.
* csu/tst-atomic.c (do_test): Test also catomic_* macros.
2006-10-14 Ulrich Drepper <drepper@redhat.com>
* resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated.
[BZ #3313]
* malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to
determine highest fast bin to consolidate, always look into all of
them.
(do_check_malloc_state): Only require for empty bins for large
sizes in main arena.
* libio/stdio.h: Add more __wur attributes.
2006-11-12 Andreas Jaeger <aj@suse.de>
[BZ #2510]
* manual/search.texi (Hash Search Function): Clarify.
(Array Search Function): Clarify.
2006-11-12 Joseph Myers <joseph@codesourcery.com>
[BZ #2830]
* math/atest-exp.c (main): Cast hex value to mp_limb_t before
shifting.
* math/atest-exp2.c (read_mpn_hex): Likewise.
* math/atest-sincos.c (main): Likewise.
* sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait.
* sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait.
* sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for
version GLIBC_2.6.
* Versions.def: Add GLIBC_2.6 for libc.
* sysdeps/i386/i486/bits/atomic.h: Add catomic_* support.
2006-10-11 Jakub Jelinek <jakub@redhat.com>
* malloc/malloc.c (_int_malloc): Remove unused any_larger variable.
* nis/nis_defaults.c (__nis_default_access): Don't call getenv twice.
* nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv.
* sysdeps/generic/unsecvars.h: Add NIS_PATH.
2006-10-11 Ulrich Drepper <drepper@redhat.com>
* include/atomic.c: Define catomic_* operations.
* sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems.
* stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*.
* malloc/memusage.c: Likewise.
* gmon/mcount.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-profile.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-runtime.c: Likewise.
* elf/dl-fptr.c: Likewise.
* resolv/res_libc.c: Likewise.
2006-10-10 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast.
* sysdeps/mach/hurd/futimes.c: Likewise.
* sysdeps/mach/hurd/lutimes.c: Likewise.
2006-10-09 Ulrich Drepper <drepper@redhat.com>
Jakub Jelinek <jakub@redhat.com>
Implement reference counting of scope records.
* elf/dl-close.c (_dl_close): Remove all scopes from removed objects
from the list in objects which remain. Always allocate new scope
record.
* elf/dl-open.c (dl_open_worker): When growing array for scopes,
don't resize, allocate a new one.
* elf/dl-runtime.c: Update reference counters before using a scope
array.
* elf/dl-sym.c: Likewise.
* elf/dl-libc.c: Adjust for l_scope name change.
* elf/dl-load.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/rtld.c: Likewise.
* include/link.h: Include <rtld-lowlevel.h>. Define struct
r_scoperec. Replace r_scope with pointer to r_scoperec structure.
Add l_scoperec_lock.
* sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>.
* sysdeps/generic/rtld-lowlevel.h: New file.
* include/atomic.h: Rename atomic_and to atomic_and_val and
atomic_or to atomic_or_val. Define new macros atomic_and and
atomic_or which do not return values.
* sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or.
Various cleanups.
* sysdeps/i386/i486/bits/atomic.h: Likewise.
* po/sv.po: Update from translation team.
2006-10-07 Ulrich Drepper <drepper@redhat.com>
* Versions.def: Add GLIBC_2.6 to libpthread.
* include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use.
(versioned_symbol): Likewise.
(compat_symbol): Likewise.
* po/tr.po: Update from translation team.
* nis/Banner: Removed. It's been integral part forever and the
author info is incomplete anyway.
* libio/Banner: Likewise.
2006-10-06 Ulrich Drepper <drepper@redhat.com>
* version.h (VERSION): Bump to 2.5.90 for new development tree.
2007-01-11 21:51:07 +00:00
|
|
|
#define _DL_HWCAP_TLS_MASK (1LL << 63)
|
2010-04-06 02:43:05 +00:00
|
|
|
uint64_t hwcap_exclude = ~((GLRO(dl_hwcap) & GLRO(dl_hwcap_mask))
|
|
|
|
| _DL_HWCAP_PLATFORM | _DL_HWCAP_TLS_MASK);
|
|
|
|
|
|
|
|
/* Only accept hwcap if it's for the right platform. */
|
2005-12-14 08:43:25 +00:00
|
|
|
#define HWCAP_CHECK \
|
2010-04-06 02:43:05 +00:00
|
|
|
if (lib->hwcap & hwcap_exclude) \
|
|
|
|
continue; \
|
2005-12-14 08:43:25 +00:00
|
|
|
if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion)) \
|
|
|
|
continue; \
|
2006-09-19 17:07:04 +00:00
|
|
|
if (_DL_PLATFORMS_COUNT \
|
2005-12-14 08:43:25 +00:00
|
|
|
&& (lib->hwcap & _DL_HWCAP_PLATFORM) != 0 \
|
|
|
|
&& (lib->hwcap & _DL_HWCAP_PLATFORM) != platform) \
|
|
|
|
continue
|
|
|
|
SEARCH_CACHE (cache_new);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* This is where the strings start. */
|
|
|
|
cache_data = (const char *) &cache->libs[cache->nlibs];
|
|
|
|
|
|
|
|
/* Now we can compute how large the string table is. */
|
|
|
|
cache_data_size = (const char *) cache + cachesize - cache_data;
|
|
|
|
|
|
|
|
#undef HWCAP_CHECK
|
|
|
|
#define HWCAP_CHECK do {} while (0)
|
|
|
|
SEARCH_CACHE (cache);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Print our result if wanted. */
|
|
|
|
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0)
|
|
|
|
&& best != NULL)
|
|
|
|
_dl_debug_printf (" trying file=%s\n", best);
|
|
|
|
|
2015-01-21 06:51:10 +00:00
|
|
|
if (best == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* The double copy is *required* since malloc may be interposed
|
|
|
|
and call dlopen itself whose completion would unmap the data
|
|
|
|
we are accessing. Therefore we must make the copy of the
|
|
|
|
mapping data without using malloc. */
|
|
|
|
char *temp;
|
|
|
|
temp = alloca (strlen (best) + 1);
|
|
|
|
strcpy (temp, best);
|
|
|
|
return strdup (temp);
|
2005-12-14 08:43:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef MAP_COPY
|
|
|
|
/* If the system does not support MAP_COPY we cannot leave the file open
|
|
|
|
all the time since this would create problems when the file is replaced.
|
|
|
|
Therefore we provide this function to close the file and open it again
|
|
|
|
once needed. */
|
|
|
|
void
|
|
|
|
_dl_unload_cache (void)
|
|
|
|
{
|
|
|
|
if (cache != NULL && cache != (struct cache_file *) -1)
|
|
|
|
{
|
|
|
|
__munmap (cache, cachesize);
|
|
|
|
cache = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|