tor

commit 1a6a8e4da9d75a1af0935707630393cc9aee3102
parent 6b0fccc3ae6561d2d20ace872b2b7e64f2b5294d
Author: David Goulet <dgoulet@torproject.org>
Date:   Tue, 11 Nov 2025 14:14:03 -0500

Merge branch 'maint-0.4.8'

Diffstat:
M
changes/gcc-fcf
 | 
1
+
M
configure.ac
 | 
2
++

2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/changes/gcc-fcf b/changes/gcc-fcf
@@ -1,3 +1,4 @@
   o Minor feature (compiler flag):
     - Add -fcf-protection=full if supported by the compiler. Fixes 41139.
+    - Add -mbranch-protection=standard for arm64.
 
diff --git a/configure.ac b/configure.ac
@@ -1504,6 +1504,8 @@ TOR_CHECK_CFLAGS(-fasynchronous-unwind-tables)
 # intended to protect against such threats as Return-oriented Programming
 # (ROP), and similarly call/jmp-oriented programming (COP/JOP).
 TOR_CHECK_CFLAGS(-fcf-protection=full)
+# The equivalent for arm64 (#41139)
+TOR_CHECK_CFLAGS(-mbranch-protection=standard)
 
 dnl ============================================================
 dnl Check for libseccomp