about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarcin Koƛcielnicki <koriakin@0x04.net>2016-01-14 16:48:55 +0100
committerStefan Liebler <stli@de.ibm.com>2016-01-14 16:48:55 +0100
commita4b5177ca83ca97c562a7138923dafe0cb92d1a0 (patch)
treeb3b4446feab539a320e57bfdfae3aebd2287c8ed
parent67fc563718f00c690b5be579f7282ee60d7db749 (diff)
downloadglibc-a4b5177ca83ca97c562a7138923dafe0cb92d1a0.tar.gz
glibc-a4b5177ca83ca97c562a7138923dafe0cb92d1a0.tar.xz
glibc-a4b5177ca83ca97c562a7138923dafe0cb92d1a0.zip
Add __private_ss to s390 struct tcbhead.
Preparation for gcc -fsplit-stack support (gcc bug #68191).  The new
field is basically identical to the one on x86.  Its TCB offset needs
to be constant, as it'll be hardcoded in gcc.

ChangeLog:

	* sysdeps/s390/nptl/tls.h (struct tcbhead_t): Add __private_ss field.
-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__