Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

aarch64: enable PAC/BTI #15

Open
wants to merge 1 commit into
base: master-with-github-ci
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions src/libmpg123/aarch64_defs.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/* SPDX-License-Identifier: LGPL-2.1
*
* aarch64_defs.h: Support macros for the aarch64 architectural features
*/

#ifndef SRC_LIBMPG123_AARCH64_DEFS_H_
#define SRC_LIBMPG123_AARCH64_DEFS_H_

/*
* Guard this header so arm assembly files can just include it without the need
* to if-def each instance.
*/
#ifdef __aarch64__

/*
* References:
* - https://developer.arm.com/documentation/101028/0012/5--Feature-test-macros
* - https://github.com/ARM-software/abi-aa/blob/main/aaelf64/aaelf64.rst
*/

#if defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT == 1
#define GNU_PROPERTY_AARCH64_BTI 1 /* bit 0 GNU Notes is for BTI support */
#else
#define GNU_PROPERTY_AARCH64_BTI 0
#endif

#if defined(__ARM_FEATURE_PAC_DEFAULT)
#define GNU_PROPERTY_AARCH64_POINTER_AUTH 2 /* bit 1 GNU Notes is for PAC support */
#else
#define GNU_PROPERTY_AARCH64_POINTER_AUTH 0
#endif

/* Add the BTI support to GNU Notes section */
#if defined(__ASSEMBLER__) && defined(__ELF__)
#if GNU_PROPERTY_AARCH64_BTI != 0 || GNU_PROPERTY_AARCH64_POINTER_AUTH != 0
.pushsection .note.gnu.property, "a"; /* Start a new allocatable section */
.balign 8; /* align it on a byte boundry */
.long 4; /* size of "GNU\0" */
.long 0x10; /* size of descriptor */
.long 0x5; /* NT_GNU_PROPERTY_TYPE_0 */
.asciz "GNU";
.long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */
.long 4; /* Four bytes of data */
.long (GNU_PROPERTY_AARCH64_BTI|GNU_PROPERTY_AARCH64_POINTER_AUTH); /* BTI or PAC is enabled */
.long 0; /* padding for 8 byte alignment */
.popsection; /* end the section */
#endif /* GNU Notes additions */
#endif /* if __ASSEMBLER__ and __ELF__ */

#endif /* __arch64__ */

#endif /* SRC_LIBMPG123_AARCH64_DEFS_H_ */
1 change: 1 addition & 0 deletions src/libmpg123/check_neon.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
initially written by Taihei Momma
*/

#include "aarch64_defs.h"
#include "mangle.h"

#ifndef __aarch64__
Expand Down
1 change: 1 addition & 0 deletions src/libmpg123/dct36_neon64.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
initially written by Taihei Monma
*/

#include "aarch64_defs.h"
#include "mangle.h"

#ifndef __APPLE__
Expand Down
1 change: 1 addition & 0 deletions src/libmpg123/dct64_neon64_float.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
initially written by Taihei Monma
*/

#include "aarch64_defs.h"
#include "mangle.h"

#ifndef __APPLE__
Expand Down
1 change: 1 addition & 0 deletions src/libmpg123/synth_neon64_accurate.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
initially written by Taihei Monma
*/

#include "aarch64_defs.h"
#include "mangle.h"

#ifndef __APPLE__
Expand Down
1 change: 1 addition & 0 deletions src/libmpg123/synth_neon64_float.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
initially written by Taihei Monma
*/

#include "aarch64_defs.h"
#include "mangle.h"

#ifndef __APPLE__
Expand Down
1 change: 1 addition & 0 deletions src/libmpg123/synth_neon64_s32.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
initially written by Taihei Monma
*/

#include "aarch64_defs.h"
#include "mangle.h"

#ifndef __APPLE__
Expand Down
1 change: 1 addition & 0 deletions src/libmpg123/synth_stereo_neon64_accurate.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
initially written by Taihei Monma
*/

#include "aarch64_defs.h"
#include "mangle.h"

#ifndef __APPLE__
Expand Down
1 change: 1 addition & 0 deletions src/libmpg123/synth_stereo_neon64_float.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
initially written by Taihei Monma
*/

#include "aarch64_defs.h"
#include "mangle.h"

#ifndef __APPLE__
Expand Down
1 change: 1 addition & 0 deletions src/libmpg123/synth_stereo_neon64_s32.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
initially written by Taihei Monma
*/

#include "aarch64_defs.h"
#include "mangle.h"

#ifndef __APPLE__
Expand Down