PR #22665 opened by Martin Storsjö (mstorsjo)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22665
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22665.patch

We currently don't have any cases where this is needed, but include it for 
completeness and clarity.

These macros for BTI were added in 08b4716a9ed277afb4af69b07b751c9bd046aa70.

A later comment in this file, added in 
248986a0db56f833b5fc3b1b96445b841f85220b, referenced the macro 
AARCH64_VALID_JUMP_CALL_TARGET which never was added here before.

Also fix a typo in a URL close by.


From 24321de61eba26a038185c47accde13206f6e256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <[email protected]>
Date: Tue, 31 Mar 2026 13:37:42 +0300
Subject: [PATCH 1/2] aarch64: Fix a URL typo

This was added in 248986a0db56f833b5fc3b1b96445b841f85220b.
---
 libavutil/aarch64/asm.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S
index 00c07058e8..cd2edc56fd 100644
--- a/libavutil/aarch64/asm.S
+++ b/libavutil/aarch64/asm.S
@@ -201,7 +201,7 @@ DISABLE_SME2
  *
  * References:
  * - "ELF for the Arm® 64-bit Architecture"
- *   https: *github.com/ARM-software/abi-aa/blob/master/aaelf64/aaelf64.rst
+ *   https://github.com/ARM-software/abi-aa/blob/master/aaelf64/aaelf64.rst
  * - "Providing protection for complex software"
  *   
https://developer.arm.com/architectures/learn-the-architecture/providing-protection-for-complex-software
  */
-- 
2.52.0


From a70b125554bd70e2de6f50dae888878f20ea41b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <[email protected]>
Date: Tue, 31 Mar 2026 13:34:17 +0300
Subject: [PATCH 2/2] aarch64: Add AARCH64_VALID_JUMP_CALL_TARGET

We currently don't have any cases where this is needed, but include
it for completeness and clarity.

These macros for BTI were added in
08b4716a9ed277afb4af69b07b751c9bd046aa70.

A later comment in this file, added in
248986a0db56f833b5fc3b1b96445b841f85220b, referenced the macro
AARCH64_VALID_JUMP_CALL_TARGET which never was added here before.
---
 libavutil/aarch64/asm.S | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S
index cd2edc56fd..e1f5a29f02 100644
--- a/libavutil/aarch64/asm.S
+++ b/libavutil/aarch64/asm.S
@@ -207,10 +207,12 @@ DISABLE_SME2
  */
 #if defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1)
 #   define GNU_PROPERTY_AARCH64_BTI (1 << 0)   // Has BTI
-#   define AARCH64_VALID_CALL_TARGET hint #34  // BTI 'c'
-#   define AARCH64_VALID_JUMP_TARGET hint #38  // BTI 'j'
+#   define AARCH64_VALID_JUMP_CALL_TARGET hint #38  // BTI 'jc'
+#   define AARCH64_VALID_CALL_TARGET      hint #34  // BTI 'c'
+#   define AARCH64_VALID_JUMP_TARGET      hint #38  // BTI 'j'
 #else
 #   define GNU_PROPERTY_AARCH64_BTI 0          // No BTI
+#   define AARCH64_VALID_JUMP_CALL_TARGET
 #   define AARCH64_VALID_CALL_TARGET
 #   define AARCH64_VALID_JUMP_TARGET
 #endif
-- 
2.52.0

_______________________________________________
ffmpeg-devel mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to