From e9272f03fbdadee8ced8670514ec5f987c47bbd2 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Fri, 9 Sep 2022 19:12:40 -0700 Subject: [PATCH] Make some minor touchups for nightlies --- ape/loader.c | 4 ++-- ape/loader.h | 2 +- libc/log/libfatal.internal.h | 1 + test/libc/release/test.mk | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ape/loader.c b/ape/loader.c index 08a736709..cc0600b25 100644 --- a/ape/loader.c +++ b/ape/loader.c @@ -659,8 +659,8 @@ __attribute__((__noreturn__)) void ApeLoader(long di, long *sp, char dl, } // get syscall function pointer - if (handoff && handoff->syscall) { - syscall = handoff->syscall; + if (handoff && handoff->systemcall) { + syscall = handoff->systemcall; } else { syscall = __syscall_loader; } diff --git a/ape/loader.h b/ape/loader.h index 7080f1370..45a7ae2b1 100644 --- a/ape/loader.h +++ b/ape/loader.h @@ -14,7 +14,7 @@ struct ApeLoader { int os; char *prog; char *page; - void *syscall; + void *systemcall; }; #endif /* COSMOPOLITAN_APE_LOADER_H_ */ diff --git a/libc/log/libfatal.internal.h b/libc/log/libfatal.internal.h index 77a55f4b1..8ff3934ee 100644 --- a/libc/log/libfatal.internal.h +++ b/libc/log/libfatal.internal.h @@ -1,5 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_LOG_LIBFATAL_INTERNAL_H_ #define COSMOPOLITAN_LIBC_LOG_LIBFATAL_INTERNAL_H_ +#include "libc/calls/calls.h" #include "libc/dce.h" #include "libc/macros.internal.h" #include "libc/nt/runtime.h" diff --git a/test/libc/release/test.mk b/test/libc/release/test.mk index 502f01fa2..23c3393e1 100644 --- a/test/libc/release/test.mk +++ b/test/libc/release/test.mk @@ -1,6 +1,7 @@ #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐ #───vi: set et ft=make ts=8 tw=8 fenc=utf-8 :vi───────────────────────┘ +o/$(MODE)/test/libc/release/cosmopolitan.zip: .UNSANDBOXED = 1 o/$(MODE)/test/libc/release/cosmopolitan.zip: \ o/cosmopolitan.h \ o/$(MODE)/ape/public/ape.lds \