From 0544e23925edab56a765d67324325938fd4074fc Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 20 Feb 2015 18:52:45 +0100 Subject: ldso: silence warning symbol_addr was set but not used Signed-off-by: Bernhard Reutner-Fischer --- ldso/ldso/dl-debug.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'ldso') diff --git a/ldso/ldso/dl-debug.c b/ldso/ldso/dl-debug.c index 1758bc387..88a48933c 100644 --- a/ldso/ldso/dl-debug.c +++ b/ldso/ldso/dl-debug.c @@ -112,8 +112,6 @@ _dl_debug_lookup (const char *undef_name, struct elf_resolve *undef_map, const ElfW(Sym) *ref, struct symbol_ref *value, int type_class) { #ifdef SHARED - unsigned long symbol_addr; - if (_dl_trace_prelink) { int conflict = 0; @@ -123,17 +121,14 @@ _dl_debug_lookup (const char *undef_name, struct elf_resolve *undef_map, || _dl_trace_prelink_map == _dl_loaded_modules) && undef_map != _dl_loaded_modules) { - symbol_addr = (unsigned long) - _dl_find_hash(undef_name, &undef_map->symbol_scope, - undef_map, type_class, &val); + _dl_find_hash(undef_name, &undef_map->symbol_scope, + undef_map, type_class, &val); if (val.sym != value->sym || val.tpnt != value->tpnt) conflict = 1; } - if (value->sym - && (__builtin_expect (ELF_ST_TYPE(value->sym->st_info) - == STT_TLS, 0))) + if (unlikely(value->sym && ELF_ST_TYPE(value->sym->st_info) == STT_TLS)) type_class = 4; if (conflict -- cgit v1.2.3 From cb5af0bed860aac12b87b2044f6f519deded40f9 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 27 Feb 2015 10:41:30 +0100 Subject: ldso: silence warning In file included from ldso/ldso/ldso.c:87:0: ldso/ldso/dl-startup.c: In function '_dl_start': ldso/ldso/dl-startup.c:184:32: warning: cast from pointer to integer of differennt size [-Wpointer-to-int-cast] auxvt[AT_BASE].a_un.a_val = (Elf32_Addr) &_begin; Signed-off-by: Bernhard Reutner-Fischer --- ldso/ldso/dl-startup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ldso') diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c index 4893409e9..18a39ce2c 100644 --- a/ldso/ldso/dl-startup.c +++ b/ldso/ldso/dl-startup.c @@ -95,8 +95,8 @@ #include "dl-startup.h" #ifdef __LDSO_PRELINK_SUPPORT__ -/* These defined magically in the linker script. */ -extern char _begin[] attribute_hidden; +/* This is defined by the linker script. */ +extern ElfW(Addr) _begin[] attribute_hidden; #endif /* Static declarations */ @@ -181,7 +181,7 @@ DL_START(unsigned long args) */ if (!auxvt[AT_BASE].a_un.a_val) - auxvt[AT_BASE].a_un.a_val = (Elf32_Addr) &_begin; + auxvt[AT_BASE].a_un.a_val = (ElfW(Addr)) &_begin; /* Note: if the dynamic linker itself is prelinked, the load_addr is 0 */ DL_INIT_LOADADDR_BOOT(load_addr, elf_machine_load_address()); #else -- cgit v1.2.3