]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Revert "TODO(relro): cheri: make __attribute_relro a nop"
authorSzabolcs Nagy <szabolcs.nagy@arm.com>
Fri, 21 Oct 2022 14:38:35 +0000 (15:38 +0100)
committerSzabolcs Nagy <szabolcs.nagy@arm.com>
Wed, 26 Oct 2022 14:39:59 +0000 (15:39 +0100)
This reverts commit 347f7e2ac1f34f92bc382afe9e5fe32ebe7cf16c.

include/libc-symbols.h

index 1a7df359fd4fe85c7d4145c4c2be65fc7ba63ee9..f4437ff6ad770ce79b4beefe08cb9adfa0b6e6da 100644 (file)
@@ -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.  */