From 2f2f115b58269468304d2f26d029eb470fb44b4a Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 1 Nov 2012 23:49:57 -0400 Subject: [PATCH] remove one unnecessary static var from dynamic linker --- src/ldso/dynlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index 25242051..625f80cc 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -102,7 +102,6 @@ static int ldso_fail; static jmp_buf rtld_fail; static pthread_rwlock_t lock; static struct debug debug; -static size_t *auxv; static size_t tls_cnt, tls_offset, tls_align = 4*sizeof(size_t); static pthread_mutex_t init_fini_lock = { ._m_type = PTHREAD_MUTEX_RECURSIVE }; @@ -798,6 +797,7 @@ void *__dynlink(int argc, char **argv) struct dso *const vdso = builtin_dsos+2; char *env_preload=0; size_t vdso_base; + size_t *auxv; /* Find aux vector just past environ[] */ for (i=argc+1; argv[i]; i++) @@ -1071,7 +1071,7 @@ void *dlopen(const char *file, int mode) update_tls_size(); - if (ssp_used) __init_ssp(auxv); + if (ssp_used) __init_ssp(libc.auxv); _dl_debug_state(); orig_tail = tail; -- 2.20.1