From 57b957eb048c9b6aad52490ebe70d20a7c2b6caa Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Thu, 9 Feb 2012 11:20:27 -0800 Subject: [PATCH] Avoid pointer type mismatch warning. update_get_addr returns a link_map*, but the return expression was of type char*. Fix by relying on gcc's void* arithmetic extension and auto-conversion from void*. --- ChangeLog | 4 ++++ elf/dl-tls.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 32f174dc5c..8585e5aec4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-02-09 Richard Henderson + + * elf/dl-tls.c (update_get_addr): Avoid pointer type mismatch warning. + 2012-02-08 Marek Polacek * libio/libio.h: Remove _G_HAVE_SYS_CDEFS conditional. diff --git a/elf/dl-tls.c b/elf/dl-tls.c index 4358616652..90f7a6d647 100644 --- a/elf/dl-tls.c +++ b/elf/dl-tls.c @@ -756,7 +756,7 @@ update_get_addr (GET_ADDR_ARGS) if (__builtin_expect (p == TLS_DTV_UNALLOCATED, 0)) return tls_get_addr_tail (GET_ADDR_PARAM, dtv, the_map); - return (char *) p + GET_ADDR_OFFSET; + return (void *) p + GET_ADDR_OFFSET; } -- 2.43.5