diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-07-22 19:47:46 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-07-22 19:47:46 +0200 |
| commit | 796663cadddb9299970746b6c67a9f9b9afdcf3e (patch) | |
| tree | f9121c88eb51a79a5b160b84c30b3c8f8e9a5345 /elf/dl-support.c | |
| parent | 4a6836e3d3aff38d677de7226e40c8d516541d68 (diff) | |
| parent | 47e5dcdf349a1aea5c8997104ef785412f0d34fa (diff) | |
Merge commit 'refs/top-bases/t/pagesize' into t/pagesize
Conflicts:
elf/rtld.c
Diffstat (limited to 'elf/dl-support.c')
| -rw-r--r-- | elf/dl-support.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/elf/dl-support.c b/elf/dl-support.c index e7008078f5..644f3d4622 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -1,5 +1,5 @@ /* Support for dynamic linking code in static libc. - Copyright (C) 1996-2008,2009,2010,2011 Free Software Foundation, Inc. + Copyright (C) 1996-2012 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 @@ -107,6 +107,8 @@ void (*_dl_init_static_tls) (struct link_map *) = &_dl_nothread_init_static_tls; size_t _dl_pagesize = /* EXEC_PAGESIZE */ 4096; +int _dl_inhibit_cache; + unsigned int _dl_osversion; /* All known directories in sorted order. */ @@ -123,6 +125,7 @@ int _dl_debug_fd = STDERR_FILENO; int _dl_correct_cache_id = _DL_CACHE_DEFAULT_ID; +ElfW(auxv_t) *_dl_auxv; ElfW(Phdr) *_dl_phdr; size_t _dl_phnum; uint64_t _dl_hwcap __attribute__ ((nocommon)); @@ -185,6 +188,7 @@ _dl_aux_init (ElfW(auxv_t) *av) uid_t uid = 0; gid_t gid = 0; + _dl_auxv = av; for (; av->a_type != AT_NULL; ++av) switch (av->a_type) { |