[gcc(refs/vendors/ARM/heads/gcs)] aarch64: libatomic: add GCS marking to asm

[gcc(refs/vendors/ARM/heads/gcs)] aarch64: libatomic: add GCS marking to asm

[Szabolcs Nagy]

https://gcc.gnu.org/g:af7a4e5f397dfbb9496d8a6710ea90696ab0e355

commit af7a4e5f397dfbb9496d8a6710ea90696ab0e355
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Fri Dec 22 15:11:25 2023 +0000

    aarch64: libatomic: add GCS marking to asm
    
    libatomic/ChangeLog:
    
            * config/linux/aarch64/atomic_16.S (FEATURE_1_GCS): Define.
            (GCS_FLAG): Define if GCS is enabled.
            (GNU_PROPERTY): Add GCS_FLAG.

Diff:
---
 libatomic/config/linux/aarch64/atomic_16.S | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libatomic/config/linux/aarch64/atomic_16.S b/libatomic/config/linux/aarch64/atomic_16.S
index d4a360a6f781..5b483f8282c0 100644
--- a/libatomic/config/linux/aarch64/atomic_16.S
+++ b/libatomic/config/linux/aarch64/atomic_16.S
@@ -751,6 +751,7 @@ ALIAS (libat_test_and_set_16, LSE2, CORE)
 #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)
@@ -765,6 +766,12 @@ ALIAS (libat_test_and_set_16, LSE2, CORE)
 # define PAC_FLAG 0
 #endif
 
+#if __ARM_FEATURE_GCS_DEFAULT
+# define GCS_FLAG FEATURE_1_GCS
+#else
+# define GCS_FLAG 0
+#endif
+
 /* Add a NT_GNU_PROPERTY_TYPE_0 note.  */
 #define GNU_PROPERTY(type, value)	\
   .section .note.gnu.property, "a";     \
@@ -783,6 +790,6 @@ ALIAS (libat_test_and_set_16, LSE2, CORE)
 
 /* Add GNU property note if built with branch protection.  */
 # if (BTI_FLAG|PAC_FLAG) != 0
-GNU_PROPERTY (FEATURE_1_AND, BTI_FLAG|PAC_FLAG)
+GNU_PROPERTY (FEATURE_1_AND, BTI_FLAG|PAC_FLAG|GCS_FLAG)
 # endif
 #endif

[gcc(refs/vendors/ARM/heads/gcs)] aarch64: libatomic: add GCS marking to asm

[Szabolcs Nagy]

https://gcc.gnu.org/g:78b29b5934193bd7e057aa8196ab8645df092d44

commit 78b29b5934193bd7e057aa8196ab8645df092d44
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Fri Dec 22 15:11:25 2023 +0000

    aarch64: libatomic: add GCS marking to asm
    
    libatomic/ChangeLog:
    
            * config/linux/aarch64/atomic_16.S (FEATURE_1_GCS): Define.
            (GCS_FLAG): Define if GCS is enabled.
            (GNU_PROPERTY): Add GCS_FLAG.

Diff:
---
 libatomic/config/linux/aarch64/atomic_16.S | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/libatomic/config/linux/aarch64/atomic_16.S b/libatomic/config/linux/aarch64/atomic_16.S
index 4e3fa870b03..d6f34eee146 100644
--- a/libatomic/config/linux/aarch64/atomic_16.S
+++ b/libatomic/config/linux/aarch64/atomic_16.S
@@ -790,6 +790,7 @@ ALIAS2 (test_and_set_16)
 #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)
@@ -804,6 +805,12 @@ ALIAS2 (test_and_set_16)
 # define PAC_FLAG 0
 #endif
 
+#if __ARM_FEATURE_GCS_DEFAULT
+# define GCS_FLAG FEATURE_1_GCS
+#else
+# define GCS_FLAG 0
+#endif
+
 /* Add a NT_GNU_PROPERTY_TYPE_0 note.  */
 #define GNU_PROPERTY(type, value)	\
   .section .note.gnu.property, "a";     \
@@ -821,7 +828,7 @@ ALIAS2 (test_and_set_16)
 .section .note.GNU-stack, "", %progbits
 
 /* 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