summaryrefslogtreecommitdiff
path: root/libc/private/bionic_asm.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2020-09-25 16:08:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-09-25 16:08:14 +0000
commit73ed0c4525121d5ba7c0326f348e780935e6f7cc (patch)
treebdc5493126f1aa7d15269a8e70a074decf6fd30c /libc/private/bionic_asm.h
parent7241ac6c07583211ec2d1230cb530f18775c7858 (diff)
parentf5bdee7fdf15e0c3bf77b215aea073b1beee3c02 (diff)
Merge changes from topic "arm64_branch-protection"
* changes: libc: Add Armv8.3-A PAuth and Armv8.5-A BTI compatibility to *.S Update crtbegin.c and crt*.S to support Armv8.5-A BTI libm: Add Armv8.3-A PAuth and Armv8.5-A BTI support to assembly files libc: Prepare support for Armv8.3-A PAuth and Armv8.5-A BTI in *.S
Diffstat (limited to 'libc/private/bionic_asm.h')
-rw-r--r--libc/private/bionic_asm.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/libc/private/bionic_asm.h b/libc/private/bionic_asm.h
index 6409563f2..6d4f7d52c 100644
--- a/libc/private/bionic_asm.h
+++ b/libc/private/bionic_asm.h
@@ -35,6 +35,7 @@
#define __bionic_asm_custom_entry(f)
#define __bionic_asm_custom_end(f)
#define __bionic_asm_function_type @function
+#define __bionic_asm_custom_note_gnu_section()
#if defined(__aarch64__)
#include <private/bionic_asm_arm64.h>
@@ -83,4 +84,7 @@
.globl alias; \
.equ alias, original
+#define NOTE_GNU_PROPERTY() \
+ __bionic_asm_custom_note_gnu_section()
+
#endif