diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-10-21 15:38:35 +0100 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-10-26 15:39:59 +0100 |
| commit | 782fb76092163827a34cff6b66ed654a9e5a070e (patch) | |
| tree | 170246c0b3ac9d49b8e4b6bf26a90fdebb26d688 | |
| parent | 8593166279495e005a03dee9886e2b33114c3fa5 (diff) | |
| download | glibc-782fb76092163827a34cff6b66ed654a9e5a070e.tar.gz glibc-782fb76092163827a34cff6b66ed654a9e5a070e.tar.xz glibc-782fb76092163827a34cff6b66ed654a9e5a070e.zip | |
Revert "TODO(relro): cheri: make __attribute_relro a nop"
This reverts commit 347f7e2ac1f34f92bc382afe9e5fe32ebe7cf16c.
| -rw-r--r-- | include/libc-symbols.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 1a7df359fd..f4437ff6ad 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. */ |