From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 4A204383FBBD; Wed, 26 Oct 2022 15:20:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4A204383FBBD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666797640; bh=7rycCVjdE4NNE2fSZJwwRhIXAeUUkK3jaUDBrblo7SI=; h=From:To:Subject:Date:From; b=NKm/KZYN4/ej8birSi959g0eu/V5KeBOpXj4i4G7jgwHEJ6iJG1l8Tj+mJ1/bDE/5 AdTAaeXr6DhhWknsQVVlUqHgNspFlrmx7FeTX5gvB/vlf5/VWMdeoFpoeWSSKzsa4p Cf7QvI8wak4MA9lJIjWrbFbU07hh3kOgg88FxIEc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: Update the static tls requirement of the libc X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: e136e71c3bebb8cae007e0e48b182ae0c3cccf64 X-Git-Newrev: d31b0d73e33a48d65b71377de2719c5731f729ad Message-Id: <20221026152040.4A204383FBBD@sourceware.org> Date: Wed, 26 Oct 2022 15:20:40 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d31b0d73e33a48d65b71377de2719c5731f729ad commit d31b0d73e33a48d65b71377de2719c5731f729ad Author: Szabolcs Nagy 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