Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-17 01:54:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(pauth): make pauth_helpers linking generic" into integration

Browse source
This commit is contained in:
Manish Pandey 2023-03-21 16:58:34 +01:00 • committed by TrustedFirmware Code Review
commit 0ed75fb78f
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -517,6 +517,13 @@ BL_COMMON_SOURCES += common/bl_common.c \
plat/common/${ARCH}/platform_helpers.S \ plat/common/${ARCH}/platform_helpers.S \
${COMPILER_RT_SRCS} ${COMPILER_RT_SRCS}
# Pointer Authentication sources
ifeq (${ENABLE_PAUTH}, 1)
# arm/common/aarch64/arm_pauth.c contains a sample platform hook to complete the
# Pauth support. As it's not secure, it must be reimplemented for real platforms
BL_COMMON_SOURCES += lib/extensions/pauth/pauth_helpers.S
endif
ifeq ($(notdir $(CC)),armclang) ifeq ($(notdir $(CC)),armclang)
BL_COMMON_SOURCES += lib/${ARCH}/armclang_printf.S BL_COMMON_SOURCES += lib/${ARCH}/armclang_printf.S
endif endif

3
plat/arm/common/arm_common.mk
View file

@ -353,8 +353,7 @@ endif
# Pointer Authentication sources # Pointer Authentication sources
ifeq (${ENABLE_PAUTH}, 1) ifeq (${ENABLE_PAUTH}, 1)
PLAT_BL_COMMON_SOURCES += plat/arm/common/aarch64/arm_pauth.c \ PLAT_BL_COMMON_SOURCES += plat/arm/common/aarch64/arm_pauth.c
lib/extensions/pauth/pauth_helpers.S
endif endif
ifeq (${SPD},spmd) ifeq (${SPD},spmd)

3
plat/qemu/qemu/platform.mk
View file

@ -221,8 +221,7 @@ BL31_SOURCES += ${QEMU_CPU_LIBS} \
# Pointer Authentication sources # Pointer Authentication sources
ifeq (${ENABLE_PAUTH}, 1) ifeq (${ENABLE_PAUTH}, 1)
PLAT_BL_COMMON_SOURCES += plat/arm/common/aarch64/arm_pauth.c \ PLAT_BL_COMMON_SOURCES += plat/arm/common/aarch64/arm_pauth.c
lib/extensions/pauth/pauth_helpers.S
endif endif
ifeq (${SPD},spmd) ifeq (${SPD},spmd)