clearlinux/graphene
2
0
Fork 0
mirror of https://github.com/clearlinux/graphene.git synced 2026-10-03 23:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[LibOS/Glibc] Remove struct shim_tcb embedded in Glibc TCB

Browse Source 
Previously, struct shim_tcb was embedded in Glibc's TCB but recent
commits to Graphene move shim_tcb to PAL's TCB. Thus, this commit
removes inserting shim_tcb from Glibc patches.
This commit is contained in:
Isaku Yamahata
2019-11-12 22:14:53 -08:00
committed by Dmitrii Kuvaiskii
parent d51f84f547
commit ffbe62254e
3 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibOS/glibc-patches/glibc-2.19.patch
+1 -13
View File
@@ -653,26 +653,14 @@ diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h
index cbb5e9e..9b87e25 100644
--- a/nptl/sysdeps/x86_64/tls.h
+++ b/nptl/sysdeps/x86_64/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 rtld_must_xmm_save;
/* Reservation of some values for the TM ABI. */
void *__private_tm[4];
@@ -154,7 +159,7 @@ typedef struct
_head->self = _thrdescr; \
\
LibOS/glibc-patches/glibc-2.23.patch
+1 -13
View File
@@ -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)
LibOS/glibc-patches/glibc-2.27.patch
+1 -13
View File
@@ -458,26 +458,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
@@ -29,6 +29,8 @@
@@ -29,6 +29,7 @@
# include <libc-pointer-arith.h> /* For cast_to_integer. */
# include <kernel-features.h>
# include <dl-dtv.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
@@ -56,6 +58,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];
@@ -144,7 +149,7 @@ typedef struct
_head->self = _thrdescr; \
\