aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--elf/dl-tls.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 32f174dc5c..8585e5aec4 100644
--- 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 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;
}