From ffc5c7769dff075629e27a351b5c403e50a9f57d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 2 Nov 2010 07:44:35 +0100 Subject: ldso/include/dl-hash.h: suppress compiler warning. no code changes The warning was repeated for every .c file which is including this header: ./ldso/include/dl-hash.h: In function '_dl_find_hash': ./ldso/include/dl-hash.h:150: warning: unused parameter 'tpntp' Signed-off-by: Denys Vlasenko --- ldso/include/dl-hash.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ldso') diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h index 34333f40f..34bed1b4b 100644 --- a/ldso/include/dl-hash.h +++ b/ldso/include/dl-hash.h @@ -139,15 +139,15 @@ extern struct elf_resolve * _dl_add_elf_hash_table(const char * libname, /* Only need extra arg with some configurations */ #if !((defined(USE_TLS) && USE_TLS) || defined __FDPIC__) -# define _dl_lookup_hash(n, r, m, c, t) _dl_lookup_hash(n, r, m, c) +# define _dl_lookup_hash(n, r, m, c, tpntp) _dl_lookup_hash(n, r, m, c) +# define _dl_find_hash(n, r, m, t, tpntp) _dl_find_hash(n, r, m, t) #endif extern char *_dl_lookup_hash(const char *name, struct dyn_elf *rpnt, - struct elf_resolve *mytpnt, int type_class, - struct elf_resolve **tpntp); - + struct elf_resolve *mytpnt, int type_class, + struct elf_resolve **tpntp); static __always_inline char *_dl_find_hash(const char *name, struct dyn_elf *rpnt, - struct elf_resolve *mytpnt, int type_class, - struct elf_resolve **tpntp) + struct elf_resolve *mytpnt, int type_class, + struct elf_resolve **tpntp) { return _dl_lookup_hash(name, rpnt, mytpnt, type_class, tpntp); } -- cgit v1.2.3 From 23fa805150d573a913cad69d34c06f3b2ce54270 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 24 Nov 2010 22:33:01 +0100 Subject: ldso: silence warning about unused tls var if !tls Signed-off-by: Bernhard Reutner-Fischer --- ldso/libdl/libdl.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ldso') diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index 3957e846f..028b9ad05 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -612,7 +612,9 @@ void *dlsym(void *vhandle, const char *name) ElfW(Addr) from; struct dyn_elf *rpnt; void *ret; +#if defined(USE_TLS) && USE_TLS && defined SHARED struct elf_resolve *tls_tpnt = NULL; +#endif /* Nastiness to support underscore prefixes. */ #ifdef __UCLIBC_UNDERSCORES__ char tmp_buf[80]; -- cgit v1.2.3 From a11fcabb4a6a1a384363329ebdb3569a1df246f8 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 24 Nov 2010 23:03:03 +0100 Subject: Revert "ldso: silence warning about unused tls var if !tls" This reverts commit 23fa805150d573a913cad69d34c06f3b2ce54270. Signed-off-by: Bernhard Reutner-Fischer --- ldso/libdl/libdl.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'ldso') diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index 028b9ad05..3957e846f 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -612,9 +612,7 @@ void *dlsym(void *vhandle, const char *name) ElfW(Addr) from; struct dyn_elf *rpnt; void *ret; -#if defined(USE_TLS) && USE_TLS && defined SHARED struct elf_resolve *tls_tpnt = NULL; -#endif /* Nastiness to support underscore prefixes. */ #ifdef __UCLIBC_UNDERSCORES__ char tmp_buf[80]; -- cgit v1.2.3