aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/s390/dl-tls.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bb3786b69d..50dd9b4af4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-01-07 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
+ * 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 <Andreas.Krebbel@de.ibm.com>
+
* 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 acf282e65c..4801bf8622 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