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*.

diff --git a/ChangeLog b/ChangeLog
index 32f174dc5c8dbd0ddcccc352639616201218027c..8585e5aec4cf1c6e4f45752fcf2606ec261d34e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-09  Richard Henderson  <rth@twiddle.net>
+
+       * elf/dl-tls.c (update_get_addr): Avoid pointer type mismatch warning.
+
 2012-02-08  Marek Polacek  <polacek@redhat.com>
 
        * libio/libio.h: Remove _G_HAVE_SYS_CDEFS conditional.

diff --git a/elf/dl-tls.c b/elf/dl-tls.c
index 4358616652afb8ecae12397a40cde82707479bae..90f7a6d64762add29643674cee6d2841097b2f23 100644 (file)
--- 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;
 }