diff options
| author | Florian Weimer <fweimer@redhat.com> | 2020-07-16 17:55:35 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-07-16 17:55:35 +0200 |
| commit | efedd1ed3d211941fc66d14ba245be3552b2616a (patch) | |
| tree | 67e2e7d222933fa2f442ff92019d4ba85eee23a2 /elf | |
| parent | da7d62b50396c8b6d67c1ba800a196e83e2ec469 (diff) | |
| download | glibc-efedd1ed3d211941fc66d14ba245be3552b2616a.tar.gz | |
Linux: Remove rseq support
The kernel ABI is not finalized, and there are now various proposals
to change the size of struct rseq, which would make the glibc ABI
dependent on the version of the kernels used for building glibc.
This is of course not acceptable.
This reverts commit 48699da1c468543ade14777819bd1b4d652709de ("elf:
Support at least 32-byte alignment in static dlopen"), commit
8f4632deb3545b2949cec5454afc3cb21a0024ea ("Linux: rseq registration
tests"), commit 6e29cb3f61ff5432c78a1c84b0d9b123a350ab36 ("Linux: Use
rseq in sched_getcpu if available"), and commit
0c76fc3c2b346dc5401dc055d97d4279632b0fb3 ("Linux: Perform rseq
registration at C startup and thread creation"), resolving the conflicts
introduced by the ARC port and the TLS static surplus changes.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-tls.c | 8 | ||||
| -rw-r--r-- | elf/libc_early_init.c | 5 |
2 files changed, 1 insertions, 12 deletions
diff --git a/elf/dl-tls.c b/elf/dl-tls.c index 772e70d0f6..9a17427047 100644 --- a/elf/dl-tls.c +++ b/elf/dl-tls.c @@ -55,7 +55,7 @@ but come on top when computing the number of namespaces. */ /* Size of initial-exec TLS in libc.so. */ -#define LIBC_IE_TLS 192 +#define LIBC_IE_TLS 160 /* Size of initial-exec TLS in libraries other than libc.so. This should be large enough to cover runtime libraries of the compiler such as libgomp and libraries in libc other than libc.so. */ @@ -190,12 +190,6 @@ void _dl_determine_tlsoffset (void) { size_t max_align = TLS_TCB_ALIGN; - /* libc.so with rseq has TLS with 32-byte alignment. Since TLS is - initialized before audit modules are loaded and slotinfo - information is available, this is not taken into account below in - the audit case. */ - max_align = MAX (max_align, 32U); - size_t freetop = 0; size_t freebottom = 0; diff --git a/elf/libc_early_init.c b/elf/libc_early_init.c index 86da66d5e0..725ab2f811 100644 --- a/elf/libc_early_init.c +++ b/elf/libc_early_init.c @@ -18,7 +18,6 @@ #include <ctype.h> #include <libc-early-init.h> -#include <rseq-internal.h> #include <sys/single_threaded.h> void @@ -27,10 +26,6 @@ __libc_early_init (_Bool initial) /* Initialize ctype data. */ __ctype_init (); - /* Register rseq ABI to the kernel for the main program's libc. */ - if (initial) - rseq_register_current_thread (); - /* Only the outer namespace is marked as single-threaded. */ __libc_single_threaded = initial; } |