]> xenbits.xensource.com Git - unikraft/libs/musl.git/commitdiff
Condition AARCH64 TCB unreservation on Kconfig
authorAndrei Tatar <andrei@unikraft.io>
Wed, 19 Jul 2023 07:57:14 +0000 (09:57 +0200)
committerUnikraft <monkey@unikraft.io>
Thu, 10 Aug 2023 17:31:44 +0000 (17:31 +0000)
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

Makefile.uk

index d5b51351f4b99269c5d1fcc6c7be0f0be11c2fea..6f0f5864fb9734feb316b596e6a39a8185d0bfb2 100644 (file)
@@ -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