This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 1/2] Avoid pointer type mismatch warning.
- From: Richard Henderson <rth at twiddle dot net>
- To: libc-alpha at sourceware dot org
- Date: Thu, 9 Feb 2012 11:25:00 -0800
- Subject: [PATCH 1/2] 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 deletions(-)
Committed as obvious.
diff --git a/ChangeLog b/ChangeLog
index 32f174d..8585e5a 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 4358616..90f7a6d 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;
}
--
1.7.7.6