Merge pull request 'Factory' (#1) from factory into main

943.patch

@@ -1,36 +0,0 @@
-From 50a7de2cb7c4a7f272f7ce7f8f00c7e06550a8c5 Mon Sep 17 00:00:00 2001
-From: Guillaume Gardet <guillaume.gardet@arm.com>
-Date: Thu, 23 Oct 2025 17:27:18 +0200
-Subject: [PATCH] aarch64: support GCS in assembly
-
-Signed-off-by: Guillaume Gardet <guillaume.gardet@arm.com>
----
- src/aarch64/sysv.S | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S
-index 81d33f2ef..ab85ddd46 100644
---- a/src/aarch64/sysv.S
-+++ b/src/aarch64/sysv.S
-@@ -74,6 +74,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
- 	.text
- 	.align 4
- 
-+#if defined(__ARM_FEATURE_GCS_DEFAULT) && __ARM_FEATURE_GCS_DEFAULT == 1
-+#define GNU_PROPERTY_AARCH64_GCS (1<<2)
-+#else
-+#define GNU_PROPERTY_AARCH64_GCS 0 /* No GCS */
-+#endif
-+
- /* ffi_call_SYSV
-    extern void ffi_call_SYSV (void *stack, void *frame,
- 			      void (*fn)(void), void *rvalue,
-@@ -692,7 +698,7 @@ CNAME(ffi_go_closure_SYSV):
- 	.asciz "GNU";
- 	.long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */
- 	.long 4;
--	.long GNU_PROPERTY_AARCH64_BTI | GNU_PROPERTY_AARCH64_POINTER_AUTH;
-+	.long GNU_PROPERTY_AARCH64_BTI | GNU_PROPERTY_AARCH64_POINTER_AUTH | GNU_PROPERTY_AARCH64_GCS;
- 	.long 0;
- 	.popsection;
- #endif

libffi.changes

@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Sun Oct 26 09:18:40 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
-
-- Add upstream patch to fix GCS on aarch64:
-  * 943.patch
-
 -------------------------------------------------------------------
 Thu Sep  4 07:14:03 UTC 2025 - Fridrich Strba <fstrba@suse.com>
 

libffi.spec

@@ -29,8 +29,6 @@ Group:          Development/Languages/C and C++
 URL:            https://sourceware.org/libffi/
 Source:         https://github.com/libffi/libffi/releases/download/v%{version}/libffi-%{version}.tar.gz
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM - https://github.com/libffi/libffi/pull/943
-Patch0:         943.patch
 # for make check
 BuildRequires:  dejagnu
 BuildRequires:  expect