From: Marcin Kościelnicki <koriakin@0x04.net>
Date: Thu, 14 Jan 2016 15:48:55 +0000 (+0100)
Subject: Add __private_ss to s390 struct tcbhead.
X-Git-Tag: glibc-2.23~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4b5177ca83ca97c562a7138923dafe0cb92d1a0;p=thirdparty%2Fglibc.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 2c261caf22f..424f7312c51 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 bc86931d814..e4c3ec78302 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__