|
@@ -602,26 +602,14 @@ diff -ruNp a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
|
|
|
diff -ruNp a/sysdeps/x86_64/nptl/tls.h b/sysdeps/x86_64/nptl/tls.h
|
|
|
--- a/sysdeps/x86_64/nptl/tls.h
|
|
|
+++ b/sysdeps/x86_64/nptl/tls.h
|
|
|
-@@ -28,6 +28,8 @@
|
|
|
+@@ -28,6 +28,7 @@
|
|
|
# include <sysdep.h>
|
|
|
# include <libc-internal.h>
|
|
|
# include <kernel-features.h>
|
|
|
-+# include <shim_tls.h>
|
|
|
+# include <syscalldb.h>
|
|
|
|
|
|
/* Replacement type for __m128 since this file is included by ld.so,
|
|
|
which is compiled with -mno-sse. It must not change the alignment
|
|
|
-@@ -67,6 +69,10 @@ typedef struct
|
|
|
- # else
|
|
|
- int __glibc_reserved1;
|
|
|
- # endif
|
|
|
-+
|
|
|
-+ shim_tcb_t shim_tcb; /* For graphene, we allocate a shim_tcb
|
|
|
-+ in the real tcb. */
|
|
|
-+
|
|
|
- int __glibc_unused1;
|
|
|
- /* Reservation of some values for the TM ABI. */
|
|
|
- void *__private_tm[4];
|
|
|
@@ -138,7 +144,6 @@ typedef struct
|
|
|
# define GET_DTV(descr) \
|
|
|
(((tcbhead_t *) (descr))->dtv)
|