commit 89ded4c0c16fb7712e0f5595739b121567601188
author Sandrine Bailleux <sandrine.bailleux@arm.com> Wed Aug 23 16:04:10 2023 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Wed Aug 23 16:04:10 2023 +0200
tree 77840e2ea946d5b54d953b10ca8c1cf79946a16c
parent 35d94fdb86b7fb3746189edf68b18601233b2a11
parent 1da28d1437cd572dfd9d42180e4fcdffaa11f867

Merge "refactor(qemu): handle pointer authentication" into integration

plat/qemu/common/common.mk

diff --git a/plat/qemu/common/common.mk b/plat/qemu/common/common.mk
index fca512b..b8b57d2 100644
--- a/plat/qemu/common/common.mk
+++ b/plat/qemu/common/common.mk
@@ -102,4 +102,11 @@
 ifeq (${CTX_INCLUDE_AARCH32_REGS}, 1)
 $(error "This is an AArch64-only port; CTX_INCLUDE_AARCH32_REGS must be disabled")
 endif
+
+# Pointer Authentication sources
+ifeq (${ENABLE_PAUTH}, 1)
+PLAT_BL_COMMON_SOURCES	+=	plat/arm/common/aarch64/arm_pauth.c
+CTX_INCLUDE_PAUTH_REGS	:=	1
+endif
+
 endif

plat/qemu/qemu/platform.mk

diff --git a/plat/qemu/qemu/platform.mk b/plat/qemu/qemu/platform.mk
index d941f81..16e89c1 100644
--- a/plat/qemu/qemu/platform.mk
+++ b/plat/qemu/qemu/platform.mk
@@ -158,12 +158,6 @@
 BL31_SOURCES		+=	plat/qemu/common/qemu_sdei.c
 endif
 
-# Pointer Authentication sources
-ifeq (${ENABLE_PAUTH}, 1)
-PLAT_BL_COMMON_SOURCES	+=	plat/arm/common/aarch64/arm_pauth.c	\
-				lib/extensions/pauth/pauth_helpers.S
-endif
-
 ifeq (${SPD},spmd)
 BL31_SOURCES		+=	plat/common/plat_spmd_manifest.c	\
 				common/uuid.c				\