2002-01-29 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/ia64/dl-lookupcfg.h (DL_AUTO_FUNCTION_ADDRESS): Add cast
+ to avoid warning
+ (DL_STATIC_FUNCTION_ADDRESS): Likewise.
+
* elf/dl-lookup.c: Only define or handle _dl_num_relocations for the
SHARED version.
* elf/dl-reloc.c: Likewise for _dl_num_cache_relocations.
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
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
(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; \
(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; \
{
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. */
#define DL_AUTO_FUNCTION_ADDRESS(map, addr) \
({ \
- unsigned long fptr[2]; \
- fptr[0] = (addr); \
+ unsigned long int fptr[2]; \
+ fptr[0] = (unsigned long int) (addr); \
fptr[1] = (map)->l_info[DT_PLTGOT]->d_un.d_ptr; \
(Elf64_Addr) fptr; \
})
#define DL_STATIC_FUNCTION_ADDRESS(map, addr) \
({ \
- static unsigned long fptr[2]; \
- fptr[0] = (addr); \
+ static unsigned long int fptr[2]; \
+ fptr[0] = (unsigned long int) (addr); \
fptr[1] = (map)->l_info[DT_PLTGOT]->d_un.d_ptr; \
(Elf64_Addr) fptr; \
})