Skip to content

Commit

Permalink
Makefile.uk: Condition TCB reserve on Kconfig
Browse files Browse the repository at this point in the history
Previously musl's Makefile would unconditionally reserve a TCB size,
regardless of whether musl was selected for build in Kconfig.
This change makes this reservation 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
  • Loading branch information
andreittr authored and unikraft-bot committed Aug 10, 2023
1 parent 2e6c811 commit 999f13e
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Makefile.uk
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
# Please refer to ./arch/Makefile.rules for more details.
# For this version of Musl the size of "struct pthread" is 200.
################################################################################
ifeq ($(CONFIG_LIBMUSL),y)
$(eval $(call ukarch_tls_tcb_reserve,200))
endif

################################################################################
# On aarch64, newer versions of musl no longer expect a 16-byte reserved block
Expand Down

0 comments on commit 999f13e

Please sign in to comment.