Index: libunwind/src/assembly.h
===================================================================
--- libunwind/src/assembly.h
+++ libunwind/src/assembly.h
@@ -48,6 +48,26 @@
 #define PPC64_OPD2
 #endif
 
+#if defined(__aarch64__) && defined(__ARM_FEATURE_BTI_DEFAULT)
+  .pushsection ".note.gnu.property", "a" SEPARATOR \
+  .balign 8 SEPARATOR \
+  .long 4 SEPARATOR \
+  .long 0x10 SEPARATOR \
+  .long 0x5 SEPARATOR \
+  .asciz "GNU" SEPARATOR \
+  /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */ \
+  .long 0xc0000000 SEPARATOR \
+  .long 4 SEPARATOR \
+  /* GNU_PROPERTY_AARCH64_FEATURE_1_BTI */\
+  /* GNU_PROPERTY_AARCH64_FEATURE_1_PAC */\
+  .long 3 SEPARATOR \
+  .long 0 SEPARATOR \
+  .popsection SEPARATOR
+#define AARCH64_BTI  hint #34 /* bti c */
+#else
+#define AARCH64_BTI
+#endif
+
 #define GLUE2(a, b) a ## b
 #define GLUE(a, b) GLUE2(a, b)
 #define SYMBOL_NAME(name) GLUE(__USER_LABEL_PREFIX__, name)
@@ -144,7 +164,8 @@
   SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR                                  \
   PPC64_OPD1                                                                   \
   SYMBOL_NAME(name):                                                           \
-  PPC64_OPD2
+  PPC64_OPD2                                                                   \
+  AARCH64_BTI
 
 #if defined(__arm__)
 #if !defined(__ARM_ARCH)