AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-12 16:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid pointer type mismatch warning.

Browse Source 
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*.
This commit is contained in:
Richard Henderson 2012-02-09 11:20:27 -08:00
parent e216c0121a
commit 57b957eb04
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> 2012-02-08 Marek Polacek <polacek@redhat.com>
* libio/libio.h: Remove _G_HAVE_SYS_CDEFS conditional. * libio/libio.h: Remove _G_HAVE_SYS_CDEFS conditional.

2
elf/dl-tls.c
View File

@ -756,7 +756,7 @@ update_get_addr (GET_ADDR_ARGS)
if (__builtin_expect (p == TLS_DTV_UNALLOCATED, 0)) if (__builtin_expect (p == TLS_DTV_UNALLOCATED, 0))
return tls_get_addr_tail (GET_ADDR_PARAM, dtv, the_map); return tls_get_addr_tail (GET_ADDR_PARAM, dtv, the_map);
return (char *) p + GET_ADDR_OFFSET; return (void *) p + GET_ADDR_OFFSET;
} }