diff mbox series

[16/22] aarch64: libgcc: add GCS marking to asm

Message ID	20241023110528.487830-17-yury.khrustalev@arm.com
State	Committed
Commit	d8374290e5780621c5faeffcce3d2899da5d5bef
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C5CA8385842D From: Yury Khrustalev <yury.khrustalev@arm.com> To: gcc-patches@gcc.gnu.org Cc: nsz@gcc.gnu.org, richard.earnshaw@arm.com, matthieu.longo@arm.com, richard.ball@arm.com Subject: [PATCH 16/22] aarch64: libgcc: add GCS marking to asm Date: Wed, 23 Oct 2024 12:05:22 +0100 Message-Id: <20241023110528.487830-17-yury.khrustalev@arm.com> In-Reply-To: <20241023110528.487830-1-yury.khrustalev@arm.com> References: <20241023110528.487830-1-yury.khrustalev@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org
Series	aarch64: Add support for Guarded Control Stack extension \| [00/22] aarch64: Add support for Guarded Control Stack extension [01/22] aarch64: Add -mbranch-protection=gcs option [02/22] aarch64: Add branch-protection target pragma tests [03/22] aarch64: Add support for chkfeat insn [04/22] aarch64: Add __builtin_aarch64_chkfeat [05/22] aarch64: Add __builtin_aarch64_chkfeat tests [06/22] aarch64: Add GCS instructions [07/22] aarch64: Add GCS builtins [08/22] aarch64: Add __builtin_aarch64_gcs* tests [09/22] aarch64: Add GCS support for nonlocal stack save [10/22] aarch64: Add non-local goto and jump tests for GCS [11/22] aarch64: Add ACLE feature macros for GCS [12/22] aarch64: Add test for GCS ACLE defs [13/22] aarch64: Add target pragma tests for gcs [14/22] aarch64: Add GCS support to the unwinder [15/22] aarch64: Emit GNU property NOTE for GCS [16/22] aarch64: libgcc: add GCS marking to asm [17/22] aarch64: libatomic: add GCS marking to asm [18/22] aarch64: libitm: Add GCS support [19/22] aarch64: Introduce indirect_return attribute [20/22] aarch64: Add tests and docs for indirect_return attribute [21/22] aarch64: Fix tests incompatible with GCS [22/22] aarch64: Fix nonlocal goto tests incompatible with GCS

Commit Message

Yury Khrustalev Oct. 23, 2024, 11:05 a.m. UTC

  From: Szabolcs Nagy <szabolcs.nagy@arm.com>

libgcc/ChangeLog:

	* config/aarch64/aarch64-asm.h (FEATURE_1_GCS): Define.
	(GCS_FLAG): Define if GCS is enabled.
	(GNU_PROPERTY): Add GCS_FLAG.
---
 libgcc/config/aarch64/aarch64-asm.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

Comments

Richard Sandiford Oct. 24, 2024, 4:31 p.m. UTC | #1

Yury Khrustalev <yury.khrustalev@arm.com> writes:
> From: Szabolcs Nagy <szabolcs.nagy@arm.com>
>
> libgcc/ChangeLog:
>
> 	* config/aarch64/aarch64-asm.h (FEATURE_1_GCS): Define.
> 	(GCS_FLAG): Define if GCS is enabled.
> 	(GNU_PROPERTY): Add GCS_FLAG.

This might be a daft question, but don't we also want to use the
new build attributes, where supported?  Or is that handled separately?

Same question for the other libraries.

Thanks,
Richard

> ---
>  libgcc/config/aarch64/aarch64-asm.h | 16 ++++++++++++++--
>  1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/libgcc/config/aarch64/aarch64-asm.h b/libgcc/config/aarch64/aarch64-asm.h
> index d8ab91d52f1..f7bd225f7a4 100644
> --- a/libgcc/config/aarch64/aarch64-asm.h
> +++ b/libgcc/config/aarch64/aarch64-asm.h
> @@ -22,6 +22,9 @@
>     see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
>     <http://www.gnu.org/licenses/>.  */
>  
> +#ifndef AARCH64_ASM_H
> +#define AARCH64_ASM_H
> +
>  #include "auto-target.h"
>  
>  #define L(label) .L ## label
> @@ -38,6 +41,7 @@
>  #define FEATURE_1_AND 0xc0000000
>  #define FEATURE_1_BTI 1
>  #define FEATURE_1_PAC 2
> +#define FEATURE_1_GCS 4
>  
>  /* Supported features based on the code generation options.  */
>  #if defined(__ARM_FEATURE_BTI_DEFAULT)
> @@ -58,6 +62,12 @@
>  # define AUTIASP
>  #endif
>  
> +#if __ARM_FEATURE_GCS_DEFAULT
> +# define GCS_FLAG FEATURE_1_GCS
> +#else
> +# define GCS_FLAG 0
> +#endif
> +
>  #ifdef __ELF__
>  #define HIDDEN(name) .hidden name
>  #define SYMBOL_SIZE(name) .size name, .-name
> @@ -88,8 +98,8 @@
>  .previous
>  
>  /* Add GNU property note if built with branch protection.  */
> -# if (BTI_FLAG|PAC_FLAG) != 0
> -GNU_PROPERTY (FEATURE_1_AND, BTI_FLAG|PAC_FLAG)
> +# if (BTI_FLAG|PAC_FLAG|GCS_FLAG) != 0
> +GNU_PROPERTY (FEATURE_1_AND, BTI_FLAG|PAC_FLAG|GCS_FLAG)
>  # endif
>  #endif
>  
> @@ -106,3 +116,5 @@ GNU_PROPERTY (FEATURE_1_AND, BTI_FLAG|PAC_FLAG)
>  #define END(name) \
>    .cfi_endproc;		\
>    SYMBOL_SIZE(name)
> +
> +#endif

Yury Khrustalev Oct. 29, 2024, 1:46 p.m. UTC | #2

On Thu, Oct 24, 2024 at 05:31:58PM +0100, Richard Sandiford wrote:
> Yury Khrustalev <yury.khrustalev@arm.com> writes:
> > From: Szabolcs Nagy <szabolcs.nagy@arm.com>
> >
> > libgcc/ChangeLog:
> >
> > 	* config/aarch64/aarch64-asm.h (FEATURE_1_GCS): Define.
> > 	(GCS_FLAG): Define if GCS is enabled.
> > 	(GNU_PROPERTY): Add GCS_FLAG.
> 
> This might be a daft question, but don't we also want to use the
> new build attributes, where supported?  Or is that handled separately?
> 
> Same question for the other libraries.

The new build attributes will be handled separately as BA support can
be seen as orthogonal to GCS.

Thanks,
Yury

diff mbox series

Patch

diff --git a/libgcc/config/aarch64/aarch64-asm.h b/libgcc/config/aarch64/aarch64-asm.h
index d8ab91d52f1..f7bd225f7a4 100644
--- a/libgcc/config/aarch64/aarch64-asm.h
+++ b/libgcc/config/aarch64/aarch64-asm.h
@@ -22,6 +22,9 @@ 
    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#ifndef AARCH64_ASM_H
+#define AARCH64_ASM_H
+
 #include "auto-target.h"
 
 #define L(label) .L ## label
@@ -38,6 +41,7 @@ 
 #define FEATURE_1_AND 0xc0000000
 #define FEATURE_1_BTI 1
 #define FEATURE_1_PAC 2
+#define FEATURE_1_GCS 4
 
 /* Supported features based on the code generation options.  */
 #if defined(__ARM_FEATURE_BTI_DEFAULT)
@@ -58,6 +62,12 @@ 
 # define AUTIASP
 #endif
 
+#if __ARM_FEATURE_GCS_DEFAULT
+# define GCS_FLAG FEATURE_1_GCS
+#else
+# define GCS_FLAG 0
+#endif
+
 #ifdef __ELF__
 #define HIDDEN(name) .hidden name
 #define SYMBOL_SIZE(name) .size name, .-name
@@ -88,8 +98,8 @@ 
 .previous
 
 /* Add GNU property note if built with branch protection.  */
-# if (BTI_FLAG|PAC_FLAG) != 0
-GNU_PROPERTY (FEATURE_1_AND, BTI_FLAG|PAC_FLAG)
+# if (BTI_FLAG|PAC_FLAG|GCS_FLAG) != 0
+GNU_PROPERTY (FEATURE_1_AND, BTI_FLAG|PAC_FLAG|GCS_FLAG)
 # endif
 #endif
 
@@ -106,3 +116,5 @@  GNU_PROPERTY (FEATURE_1_AND, BTI_FLAG|PAC_FLAG)
 #define END(name) \
   .cfi_endproc;		\
   SYMBOL_SIZE(name)
+
+#endif