From 87ded0c382b835e5d7ca8b5e059a8a044a6c3976 Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Tue, 7 Jan 2014 09:40:39 +0100 Subject: [PATCH] S/390: Remove __tls_get_addr argument cast. --- ChangeLog | 5 +++++ sysdeps/s390/dl-tls.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bb3786b..50dd9b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-01-07 Andreas Krebbel + * sysdeps/s390/dl-tls.h: sysdeps/s390/dl-tls.h: Remove casts for + the first argument and return value of __tls_get_addr_internal. + +2014-01-07 Andreas Krebbel + * sysdeps/s390/s390-32/dl-machine.h: Gate the definition of refsym also with !RTLD_BOOTSTRAP to get rid of unused variable warning. diff --git a/sysdeps/s390/dl-tls.h b/sysdeps/s390/dl-tls.h index acf282e..4801bf8 100644 --- a/sysdeps/s390/dl-tls.h +++ b/sysdeps/s390/dl-tls.h @@ -91,7 +91,7 @@ extern void *__tls_get_addr_internal (tls_index *ti); compiler will take care of setting up r12 only if itself issued the __tls_get_offset call. */ # define __TLS_GET_ADDR(__ti) \ - ({ (void *) __tls_get_addr_internal ((char *) (__ti)) \ + ({ __tls_get_addr_internal (__ti) \ + (unsigned long) __builtin_thread_pointer (); }) #endif -- 2.7.4