[FFmpeg-cvslog] aarch64: Only emit the PAC/BTI note section when targeting ELF

Martin Storsjö git at videolan.org
Tue Mar 15 00:45:13 EET 2022


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Mar  9 15:11:45 2022 +0200| [c3fea6d83be43198060f2dc577fd642290966537] | committer: Martin Storsjö

aarch64: Only emit the PAC/BTI note section when targeting ELF

This avoids build errors if such features are enabled while targeting
another binary format. (Using such features on other platforms
might require some other form of signaling/setup though, but
the ELF specific .note section isn't applicable at least.)

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3fea6d83be43198060f2dc577fd642290966537
---

 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 b817eaab22..a7782415d7 100644
--- a/libavutil/aarch64/asm.S
+++ b/libavutil/aarch64/asm.S
@@ -141,7 +141,7 @@
 #endif
 
 
-#if (GNU_PROPERTY_AARCH64_BTI != 0 || GNU_PROPERTY_AARCH64_PAC != 0)
+#if (GNU_PROPERTY_AARCH64_BTI != 0 || GNU_PROPERTY_AARCH64_PAC != 0) && defined(__ELF__)
         .pushsection .note.gnu.property, "a"
         .balign 8
         .long 4



More information about the ffmpeg-cvslog mailing list