From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 98DC1385E037; Wed, 26 Oct 2022 14:50:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 98DC1385E037 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666795809; bh=YafG2OetbsFDajcsOEcGuVmINmm7EJdUkBngrvSZ5Ys=; h=From:To:Subject:Date:From; b=BbKnbJb9uz0jQx9HwQqKS2uztphGPpjU2DblOWszY992kffwaG9g4NIicDotriuPb 1La16GHmOTXzhMuRiAvgXPhOEpRR0JOg+oE7db8SltjD08Gq/GxyzF7aacKem1PudQ vR5hqu9CYJdMG7lItlGTvvwz4hYWrZWjyXLWyTr8= 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] Revert "TODO(relro): cheri: make __attribute_relro a nop" X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 8593166279495e005a03dee9886e2b33114c3fa5 X-Git-Newrev: 782fb76092163827a34cff6b66ed654a9e5a070e Message-Id: <20221026145009.98DC1385E037@sourceware.org> Date: Wed, 26 Oct 2022 14:50:09 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=782fb76092163827a34cff6b66ed654a9e5a070e commit 782fb76092163827a34cff6b66ed654a9e5a070e Author: Szabolcs Nagy Date: Fri Oct 21 15:38:35 2022 +0100 Revert "TODO(relro): cheri: make __attribute_relro a nop" This reverts commit 347f7e2ac1f34f92bc382afe9e5fe32ebe7cf16c. Diff: --- include/libc-symbols.h | 6 +----- 1 file changed, 1 insertion(+), 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. */