about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/s390/nptl/tls.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c261caf22..424f7312c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-02  Marcin Koƛcielnicki  <koriakin@0x04.net>
+
+	* sysdeps/s390/nptl/tls.h (struct tcbhead_t): Add __private_ss field.
+
 2016-01-13  Carlos O'Donell  <carlos@redhat.com>
 
 	* benchtests/Makefile (PYTHON): Define.
diff --git a/sysdeps/s390/nptl/tls.h b/sysdeps/s390/nptl/tls.h
index bc86931d81..e4c3ec7830 100644
--- a/sysdeps/s390/nptl/tls.h
+++ b/sysdeps/s390/nptl/tls.h
@@ -53,7 +53,11 @@ typedef struct
   int gscope_flag;
 #ifndef __ASSUME_PRIVATE_FUTEX
   int private_futex;
+#else
+  int __glibc_reserved1;
 #endif
+  /* GCC split stack support.  */
+  void *__private_ss;
 } tcbhead_t;
 
 # ifndef __s390x__