From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Fri, 21 Oct 2022 14:38:35 +0000 (+0100)
Subject: Revert "TODO(relro): cheri: make __attribute_relro a nop"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=782fb76092163827a34cff6b66ed654a9e5a070e;p=thirdparty%2Fglibc.git

Revert "TODO(relro): cheri: make __attribute_relro a nop"

This reverts commit 347f7e2ac1f34f92bc382afe9e5fe32ebe7cf16c.
---

diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index 1a7df359fd4..f4437ff6ad7 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -426,12 +426,8 @@ for linking")
 
 #define attribute_tls_model_ie __attribute__ ((tls_model ("initial-exec")))
 
-#if defined __CHERI_PURE_CAPABILITY__
-/* avoid readonly caps at startup when relro has to be writable */
-#define attribute_relro
-#else
 #define attribute_relro __attribute__ ((section (".data.rel.ro")))
-#endif
+
 
 /* Used to disable stack protection in sensitive places, like ifunc
    resolvers and early static TLS init.  */