From 7103849f6f323f787c3672380873e9d0276bcdba Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Tue, 14 Nov 2023 01:22:22 +0100 Subject: [PATCH 1/2] capdl-loader-app: comment end of conditional block Signed-off-by: Axel Heider --- capdl-loader-app/src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capdl-loader-app/src/main.c b/capdl-loader-app/src/main.c index e3a5c38..fa61fc0 100644 --- a/capdl-loader-app/src/main.c +++ b/capdl-loader-app/src/main.c @@ -2130,7 +2130,7 @@ static void CONSTRUCTOR(MUSLCSYS_WITH_VSYSCALL_PRIORITY) init_bootinfo(void) /* Allow us to print via seL4_Debug_PutChar. */ platsupport_serial_setup_bootinfo_failsafe(); } -#endif +#endif /* CONFIG_DEBUG_BUILD */ int main(void) { From 249b674e70e54f0bea8caf569735d809a02a2619 Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Wed, 8 Jun 2022 18:52:56 +0200 Subject: [PATCH 2/2] capdl-loader-app: adapt to sel4muslcsys change Signed-off-by: Axel Heider --- capdl-loader-app/src/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/capdl-loader-app/src/main.c b/capdl-loader-app/src/main.c index fa61fc0..5872410 100644 --- a/capdl-loader-app/src/main.c +++ b/capdl-loader-app/src/main.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -2117,15 +2118,14 @@ static void init_system(CDL_Model *spec) * for stdin, stdout, and stderr. The heap pool base address and size is * expected to be page aligned. */ -extern char *morecore_area; -extern size_t morecore_size; static char ALIGN(PAGE_SIZE_4K) debug_libc_morecore_area[PAGE_SIZE_4K]; static void CONSTRUCTOR(MUSLCSYS_WITH_VSYSCALL_PRIORITY) init_bootinfo(void) { /* Init memory area for musl. */ - morecore_area = debug_libc_morecore_area; - morecore_size = sizeof(debug_libc_morecore_area); + sel4muslcsys_setup_morecore_region( + debug_libc_morecore_area, + sizeof(debug_libc_morecore_area)); /* Allow us to print via seL4_Debug_PutChar. */ platsupport_serial_setup_bootinfo_failsafe();