public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/arm/morello/main] cheri: Update the static tls requirement of the libc
@ 2022-11-23 14:49 Szabolcs Nagy
  0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-11-23 14:49 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cf6c44c38c77832c59a04c49dc8e031eb1e220a9

commit cf6c44c38c77832c59a04c49dc8e031eb1e220a9
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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [glibc/arm/morello/main] cheri: Update the static tls requirement of the libc
@ 2022-10-27 13:59 Szabolcs Nagy
  0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-10-27 13:59 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3dcebd639847f641679ae301554d6ad74578ff4e

commit 3dcebd639847f641679ae301554d6ad74578ff4e
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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [glibc/arm/morello/main] cheri: Update the static tls requirement of the libc
@ 2022-10-26 15:20 Szabolcs Nagy
  0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-10-26 15:20 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d31b0d73e33a48d65b71377de2719c5731f729ad

commit d31b0d73e33a48d65b71377de2719c5731f729ad
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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [glibc/arm/morello/main] cheri: Update the static tls requirement of the libc
@ 2022-10-20 17:21 Szabolcs Nagy
  0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-10-20 17:21 UTC (permalink / raw)
  To: glibc-cvs

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-11-23 14:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-23 14:49 [glibc/arm/morello/main] cheri: Update the static tls requirement of the libc Szabolcs Nagy
  -- strict thread matches above, loose matches on Subject: below --
2022-10-27 13:59 Szabolcs Nagy
2022-10-26 15:20 Szabolcs Nagy
2022-10-20 17:21 Szabolcs Nagy

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).