From b902a8a1767c4005becfcbfd51997125a1f92968 Mon Sep 17 00:00:00 2001 From: kib Date: Tue, 25 Jan 2011 21:04:55 +0000 Subject: Fix get_program_var_addr() when type of the resolved symbol is functional. Use make_function_pointer then, otherwise ia64 is broken. Reported and tested by: marcel --- libexec/rtld-elf/rtld.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libexec') diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index a39a90c..8acbdc5 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2800,7 +2800,12 @@ get_program_var_addr(const char *name, RtldLockState *lockstate) donelist_init(&donelist); if (symlook_global(&req, &donelist) != 0) return (NULL); - return ((const void **)(req.defobj_out->relocbase + req.sym_out->st_value)); + if (ELF_ST_TYPE(req.sym_out->st_info) == STT_FUNC) + return ((const void **)make_function_pointer(req.sym_out, + req.defobj_out)); + else + return ((const void **)(req.defobj_out->relocbase + + req.sym_out->st_value)); } /* -- cgit v1.1