public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: Update the static tls requirement of the libc Date: Thu, 20 Oct 2022 17:21:18 +0000 (GMT) [thread overview] Message-ID: <20221020172118.41D3F384D1BD@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=78412dcc6a173726a3db78c8a0626aec2f1dd42a commit 78412dcc6a173726a3db78c8a0626aec2f1dd42a Author: Szabolcs Nagy <szabolcs.nagy@arm.com> Date: Tue Oct 18 15:10:03 2022 +0100 cheri: Update the static tls requirement of the libc Larger requirement because pointers are bigger. Diff: --- elf/dl-tls.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/elf/dl-tls.c b/elf/dl-tls.c index 093cdddb7e..1b90bf17b3 100644 --- a/elf/dl-tls.c +++ b/elf/dl-tls.c @@ -62,7 +62,11 @@ observed PT_GNU_TLS sizes across all architectures. Some architectures have lower values due to differences in type sizes and link editor capabilities. */ +#ifdef __CHERI_PURE_CAPABILITY__ +#define LIBC_IE_TLS 256 +#else #define LIBC_IE_TLS 144 +#endif /* Size of initial-exec TLS in libraries other than libc.so. This should be large enough to cover runtime libraries of the @@ -87,7 +91,11 @@ tls_static_surplus (int nns, int opt_tls) the computation of dl_tls_static_surplus in _dl_tls_static_surplus_init yields the historic value 1664, for backwards compatibility. */ +#ifdef __CHERI_PURE_CAPABILITY__ +#define LEGACY_TLS 0 +#else #define LEGACY_TLS (1664 - tls_static_surplus (DEFAULT_NNS, OPTIONAL_TLS)) +#endif /* Calculate the size of the static TLS surplus, when the given number of audit modules are loaded. Must be called after the
next reply other threads:[~2022-10-20 17:21 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-20 17:21 Szabolcs Nagy [this message] 2022-10-26 15:20 Szabolcs Nagy 2022-10-27 13:59 Szabolcs Nagy 2022-11-23 14:49 Szabolcs Nagy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221020172118.41D3F384D1BD@sourceware.org \ --to=nsz@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).