diff options
| author | Richard Henderson <rth@twiddle.net> | 2012-02-09 11:20:27 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2012-02-09 11:20:27 -0800 |
| commit | 57b957eb048c9b6aad52490ebe70d20a7c2b6caa (patch) | |
| tree | 84ae8bfe917c4422f21f8f61ce421fa512a4e10c | |
| parent | e216c0121a715225802810af4a34daa3ac7b0605 (diff) | |
| download | glibc-57b957eb048c9b6aad52490ebe70d20a7c2b6caa.tar.gz glibc-57b957eb048c9b6aad52490ebe70d20a7c2b6caa.tar.xz glibc-57b957eb048c9b6aad52490ebe70d20a7c2b6caa.zip | |
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*.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | elf/dl-tls.c | 2 |
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; } |