diff options
Diffstat (limited to 'lib/csu/common/feature_note.S')
| -rw-r--r-- | lib/csu/common/feature_note.S | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/csu/common/feature_note.S b/lib/csu/common/feature_note.S index 0274ce61debc..fb9f6141699e 100644 --- a/lib/csu/common/feature_note.S +++ b/lib/csu/common/feature_note.S @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright 2000 David E. O'Brien, John D. Polstra. * All rights reserved. @@ -26,12 +26,10 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD$"); - #include <sys/elf_common.h> #include "notes.h" - .section .note.tag,"a",%note + .section .note.tag,"aR",%note .p2align 2 .4byte 2f-1f .4byte 4f-3f @@ -40,3 +38,10 @@ __FBSDID("$FreeBSD$"); 2: .p2align 2 3: .4byte 0 4: + + .section .note.GNU-stack,"",%progbits + +#ifdef __aarch64__ +/* This is needed in all objects for BTI to be used in the linked elf file */ +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) +#endif |