From: Andrei Tatar <andrei@unikraft.io>
Date: Wed, 19 Jul 2023 07:57:14 +0000 (+0200)
Subject: Condition AARCH64 TCB unreservation on Kconfig
X-Git-Tag: RELEASE-0.14.0~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1721b8389b9163acfc37ac8e94ae7bfd10618a87;p=unikraft%2Flibs%2Fmusl.git

Condition AARCH64 TCB unreservation on Kconfig

Previously musl would unconditionally call
`aarch64_no_reserved_tcb_overlap` when building under aarch64.
This change makes this call happen only when musl is selected.

Signed-off-by: Andrei Tatar <andrei@unikraft.io>
Reviewed-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Reviewed-by: Eduard Vintilă <eduard.vintila47@gmail.com>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #54
---

diff --git a/Makefile.uk b/Makefile.uk
index d5b5135..6f0f586 100644
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -45,9 +45,11 @@ endif
 # On aarch64, newer versions of musl no longer expect a 16-byte reserved block
 # at the end of the TCB. See: https://www.openwall.com/lists/musl/2018/06/01/14
 ################################################################################
+ifeq ($(CONFIG_LIBMUSL),y)
 ifeq (arm64,$(CONFIG_UK_ARCH))
 $(eval $(call aarch64_no_reserved_tcb_overlap))
 endif
+endif
 
 ################################################################################
 # Library registration