From 1b4575aefaaa43adfed4658f7d66de587f12120e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 30 Jan 2002 00:38:09 +0000 Subject: Update. * sysdeps/ia64/dl-lookupcfg.h (DL_AUTO_FUNCTION_ADDRESS): Add cast to avoid warning (DL_STATIC_FUNCTION_ADDRESS): Likewise. --- elf/dl-lookup.c | 2 +- elf/dl-reloc.c | 6 +++--- elf/rtld.c | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'elf') diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 86b5c0d..ae8df27 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -64,7 +64,7 @@ struct sym_val unsigned long int _dl_num_relocations; # define bump_num_relocation() ++_dl_num_relocations #else -# define bump_num_relocation() 0 +# define bump_num_relocation() ((void) 0) #endif diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 748aa3b..bfab6a2 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -32,7 +32,7 @@ unsigned long int _dl_num_cache_relocations; # define bump_num_cache_relocations() ++_dl_num_cache_relocations #else -# define bump_num_cache_relocations() 0 +# define bump_num_cache_relocations() ((void) 0) #endif @@ -118,7 +118,7 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], (ELFW(ST_BIND) ((*ref)->st_info) != STB_LOCAL \ ? ((__builtin_expect ((*ref) == l->l_lookup_cache.sym, 0) \ && elf_machine_type_class (r_type) == l->l_lookup_cache.type_class) \ - ? (bump_num_cache_relocations, \ + ? (bump_num_cache_relocations (), \ (*ref) = l->l_lookup_cache.ret, \ l->l_lookup_cache.value) \ : ({ lookup_t _lr; \ @@ -138,7 +138,7 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], (ELFW(ST_BIND) ((*ref)->st_info) != STB_LOCAL \ ? ((__builtin_expect ((*ref) == l->l_lookup_cache.sym, 0) \ && elf_machine_type_class (r_type) == l->l_lookup_cache.type_class) \ - ? (bump_num_cache_relocations, \ + ? (bump_num_cache_relocations (), \ (*ref) = l->l_lookup_cache.ret, \ l->l_lookup_cache.value) \ : ({ lookup_t _lr; \ diff --git a/elf/rtld.c b/elf/rtld.c index b3698ad..45b15fd 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -152,7 +152,9 @@ _dl_start (void *arg) { struct link_map bootstrap_map; hp_timing_t start_time; +#if !__GNUC_PREREQ (2, 96) size_t cnt; +#endif /* This #define produces dynamic linking inline functions for bootstrap relocation instead of general-purpose relocation. */ -- cgit v1.1