From 3de35e196cfcf6163547db92b668837786687866 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Sat, 10 Sep 2022 19:57:50 -0700 Subject: [PATCH] Fix the build --- libc/calls/{nanos.h => nanos.internal.h} | 0 libc/calls/semaphore.internal.h | 1 + libc/nexgen32e/bsr.h | 2 +- libc/thread/thread.mk | 8 +++++++- 4 files changed, 9 insertions(+), 2 deletions(-) rename libc/calls/{nanos.h => nanos.internal.h} (100%) diff --git a/libc/calls/nanos.h b/libc/calls/nanos.internal.h similarity index 100% rename from libc/calls/nanos.h rename to libc/calls/nanos.internal.h diff --git a/libc/calls/semaphore.internal.h b/libc/calls/semaphore.internal.h index d4c595ae9..71e7d6602 100644 --- a/libc/calls/semaphore.internal.h +++ b/libc/calls/semaphore.internal.h @@ -1,5 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_SEMAPHORE_H_ #define COSMOPOLITAN_LIBC_CALLS_SEMAPHORE_H_ +#include "libc/calls/struct/timespec.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ diff --git a/libc/nexgen32e/bsr.h b/libc/nexgen32e/bsr.h index 7a4179bdd..c35b731b9 100644 --- a/libc/nexgen32e/bsr.h +++ b/libc/nexgen32e/bsr.h @@ -6,9 +6,9 @@ COSMOPOLITAN_C_START_ int bsr(int) pureconst; int bsrl(long) pureconst; int bsrll(long long) pureconst; -int bsr128(uint128_t) pureconst; #if defined(__GNUC__) && defined(__x86_64__) && !defined(__STRICT_ANSI__) +int bsr128(uint128_t) pureconst; #define bsr(u) \ ({ \ unsigned BiTs; \ diff --git a/libc/thread/thread.mk b/libc/thread/thread.mk index 3e4e2ca44..024af185a 100644 --- a/libc/thread/thread.mk +++ b/libc/thread/thread.mk @@ -7,7 +7,6 @@ LIBC_THREAD_ARTIFACTS += LIBC_THREAD_A LIBC_THREAD = $(LIBC_THREAD_A_DEPS) $(LIBC_THREAD_A) LIBC_THREAD_A = o/$(MODE)/libc/thread/thread.a LIBC_THREAD_A_FILES := $(wildcard libc/thread/*) -LIBC_THREAD_A_HDRS = $(filter %.h,$(LIBC_THREAD_A_FILES)) LIBC_THREAD_A_SRCS_S = $(filter %.S,$(LIBC_THREAD_A_FILES)) LIBC_THREAD_A_SRCS_C = $(filter %.c,$(LIBC_THREAD_A_FILES)) @@ -15,6 +14,13 @@ LIBC_THREAD_A_SRCS = \ $(LIBC_THREAD_A_SRCS_S) \ $(LIBC_THREAD_A_SRCS_C) +LIBC_THREAD_A_HDRS = \ + libc/thread/spawn.h \ + libc/thread/thread.h \ + libc/thread/thread2.h \ + libc/thread/tls.h \ + libc/thread/tls2.h + LIBC_THREAD_A_OBJS = \ $(LIBC_THREAD_A_SRCS_S:%.S=o/$(MODE)/%.o) \ $(LIBC_THREAD_A_SRCS_C:%.c=o/$(MODE)/%.o)