Release Cosmopolitan v3.2.4

The P flag breaks backwards compatibility with older binaries. The idea
is to revert this commit after that break has been resolved.

.gitignore

@@ -2,7 +2,7 @@
 
 /o
 /cosmocc
-/.prompt.jtlp
+/.cosmocc
 
 # TODO: Find some way to have Python write to o/
 __pycache__

Makefile

@@ -150,7 +150,7 @@ export MODE
 export SOURCE_DATE_EPOCH
 export TMPDIR
 
-COSMOCC = cosmocc/3.2
+COSMOCC = .cosmocc/3.2
 TOOLCHAIN = $(COSMOCC)/bin/$(ARCH)-linux-cosmo-
 DOWNLOAD := $(shell build/download-cosmocc.sh $(COSMOCC) 3.2 28b48682595f0f46b45ab381118cdffdabc8fcfa29aa54e301fe6ffe35269f5e)
 
@@ -249,7 +249,6 @@ include libc/calls/BUILD.mk			#─┐
 include libc/irq/BUILD.mk			# ├──SYSTEMS RUNTIME
 include third_party/nsync/BUILD.mk		# │  You can issue system calls
 include libc/runtime/BUILD.mk			# │
-include third_party/double-conversion/BUILD.mk	# │
 include libc/crt/BUILD.mk			# │
 include third_party/dlmalloc/BUILD.mk		#─┘
 include libc/mem/BUILD.mk			#─┐
@@ -284,7 +283,10 @@ include third_party/stb/BUILD.mk		# │
 include third_party/mbedtls/BUILD.mk		# │
 include third_party/ncurses/BUILD.mk		# │
 include third_party/readline/BUILD.mk		# │
+include third_party/libunwind/BUILD.mk		# |
+include third_party/libcxxabi/BUILD.mk		# |
 include third_party/libcxx/BUILD.mk		# │
+include third_party/double-conversion/BUILD.mk	# │
 include third_party/pcre/BUILD.mk		# │
 include third_party/less/BUILD.mk		# │
 include net/https/BUILD.mk			# │
@@ -328,7 +330,7 @@ include third_party/python/BUILD.mk
 include tool/build/BUILD.mk
 include tool/curl/BUILD.mk
 include third_party/qemu/BUILD.mk
-include third_party/libunwind/BUILD.mk
+include third_party/libcxxabi/test/BUILD.mk
 include examples/BUILD.mk
 include examples/pyapp/BUILD.mk
 include examples/pylife/BUILD.mk
@@ -441,6 +443,8 @@ COSMOPOLITAN_OBJECTS =			\
 	LIBC_TIME			\
 	THIRD_PARTY_MUSL		\
 	THIRD_PARTY_ZLIB_GZ		\
+	THIRD_PARTY_LIBCXXABI		\
+	THIRD_PARTY_LIBUNWIND		\
 	LIBC_STDIO			\
 	THIRD_PARTY_GDTOA		\
 	THIRD_PARTY_REGEX		\
@@ -510,12 +514,14 @@ COSMOPOLITAN_H_PKGS =			\
 	THIRD_PARTY_GETOPT		\
 	THIRD_PARTY_MUSL		\
 	THIRD_PARTY_ZLIB		\
+	THIRD_PARTY_ZLIB_GZ		\
 	THIRD_PARTY_REGEX
 
 COSMOCC_PKGS =				\
 	$(COSMOPOLITAN_H_PKGS)		\
 	THIRD_PARTY_AARCH64		\
 	THIRD_PARTY_LIBCXX		\
+	THIRD_PARTY_LIBCXXABI		\
 	THIRD_PARTY_INTEL
 
 o/$(MODE)/cosmopolitan.a:		\
@@ -540,18 +546,15 @@ o/cosmopolitan.h: o/cosmopolitan.h.txt					\
 		$(wildcard libc/integral/*)				\
 		$(foreach x,$(COSMOPOLITAN_H_PKGS),$($(x)_HDRS))	\
 		$(foreach x,$(COSMOPOLITAN_H_PKGS),$($(x)_INCS))
-	@$(ECHO) '#ifndef __STRICT_ANSI__' >$@
-	@$(ECHO) '#define _COSMO_SOURCE' >>$@
-	@$(ECHO) '#endif' >>$@
 	@$(COMPILE) -AROLLUP -T$@ build/bootstrap/rollup.com @$< >>$@
 
 o/cosmopolitan.html: private .UNSANDBOXED = 1
 o/cosmopolitan.html:							\
 		o/$(MODE)/third_party/chibicc/chibicc.com.dbg		\
 		$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS)))	\
-		$(SRCS)							\
+		$(filter-out %.cc,$(SRCS))				\
 		$(HDRS)
-	$(file >$(TMPDIR)/$(subst /,_,$@),$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS))))
+	$(file >$(TMPDIR)/$(subst /,_,$@),$(filter-out %.cc,$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS)))))
 	o/$(MODE)/third_party/chibicc/chibicc.com.dbg -J		\
 		-fno-common -include libc/integral/normalize.inc -o $@	\
 		-DCOSMO @$(TMPDIR)/$(subst /,_,$@)

ape/apeinstall.sh

@@ -137,20 +137,13 @@ if [ x"$(uname -s)" = xLinux ]; then
     echo done >&2
   fi
 
-  uname_r="$(uname -r)"
-  if printf '%s\n%s\n' 5.12 "$uname_r" | sort -CV; then
-    FLAGS=FP
-  else
-    FLAGS=F
-  fi
-
   echo >&2
   echo registering APE with binfmt_misc >&2
   echo you may need to edit configs to persist across reboot >&2
-  echo '$SUDO sh -c "echo '"'"':APE:M::MZqFpD::/usr/bin/ape:'"$FLAGS'"' >/proc/sys/fs/binfmt_misc/register"' >&2
-  $SUDO sh -c "echo ':APE:M::MZqFpD::/usr/bin/ape:$FLAGS' >/proc/sys/fs/binfmt_misc/register" || exit
-  echo '$SUDO sh -c "echo '"'"':APE-jart:M::jartsr::/usr/bin/ape:'"$FLAGS'"' >/proc/sys/fs/binfmt_misc/register"' >&2
-  $SUDO sh -c "echo ':APE-jart:M::jartsr::/usr/bin/ape:$FLAGS' >/proc/sys/fs/binfmt_misc/register" || exit
+  echo '$SUDO sh -c "echo '"'"':APE:M::MZqFpD::/usr/bin/ape:'"'"' >/proc/sys/fs/binfmt_misc/register"' >&2
+  $SUDO sh -c "echo ':APE:M::MZqFpD::/usr/bin/ape:' >/proc/sys/fs/binfmt_misc/register" || exit
+  echo '$SUDO sh -c "echo '"'"':APE-jart:M::jartsr::/usr/bin/ape:'"'"' >/proc/sys/fs/binfmt_misc/register"' >&2
+  $SUDO sh -c "echo ':APE-jart:M::jartsr::/usr/bin/ape:' >/proc/sys/fs/binfmt_misc/register" || exit
   echo done >&2
 
   if [ x"$(cat /proc/sys/fs/binfmt_misc/status)" = xdisabled ]; then

build/htags

@@ -66,7 +66,7 @@ set -- --regex-c='/^extern [^(]*(\*const \([^)]*\))(/\1/b' "$@"
 #   struct WorstSoftwareEver;
 set -- --regex-c='/^struct.*;$/uehocruehcroue/b' "$@"
 
-exec $TAGS                                                        \
+build/run $TAGS                                                   \
      -e                                                           \
      --langmap=c:.c.h                                             \
      --exclude=libc/nt/struct/imagefileheader.internal.h          \

build/objdump

@@ -6,14 +6,14 @@ if [ -n "$OBJDUMP" ]; then
 fi
 
 find_objdump() {
-  if [ -x cosmocc/3.2/bin/$1-linux-cosmo-objdump ]; then
-    OBJDUMP=cosmocc/3.2/bin/$1-linux-cosmo-objdump
-  elif [ -x cosmocc/3.2/bin/$1-linux-musl-objdump ]; then
-    OBJDUMP=cosmocc/3.2/bin/$1-linux-musl-objdump
-  elif [ -x "$COSMO/cosmocc/3.2/bin/$1-linux-cosmo-objdump" ]; then
-    OBJDUMP="$COSMO/cosmocc/3.2/bin/$1-linux-cosmo-objdump"
-  elif [ -x "$COSMO/cosmocc/3.2/bin/$1-linux-musl-objdump" ]; then
-    OBJDUMP="$COSMO/cosmocc/3.2/bin/$1-linux-musl-objdump"
+  if [ -x .cosmocc/3.2/bin/$1-linux-cosmo-objdump ]; then
+    OBJDUMP=.cosmocc/3.2/bin/$1-linux-cosmo-objdump
+  elif [ -x .cosmocc/3.2/bin/$1-linux-musl-objdump ]; then
+    OBJDUMP=.cosmocc/3.2/bin/$1-linux-musl-objdump
+  elif [ -x "$COSMO/.cosmocc/3.2/bin/$1-linux-cosmo-objdump" ]; then
+    OBJDUMP="$COSMO/.cosmocc/3.2/bin/$1-linux-cosmo-objdump"
+  elif [ -x "$COSMO/.cosmocc/3.2/bin/$1-linux-musl-objdump" ]; then
+    OBJDUMP="$COSMO/.cosmocc/3.2/bin/$1-linux-musl-objdump"
   else
     echo "error: toolchain not found (try running 'cosmocc --update' or 'make' in the cosmo monorepo)" >&2
     exit 1

build/run

@@ -1,9 +1,8 @@
 #!/bin/sh
-if printf '%s\n' "$*" | grep aarch64 >/dev/null 2>&1; then
-  if [ ! -f o/third_party/qemu/qemu-aarch64 ]; then
-    make -j8 o/third_party/qemu/qemu-aarch64
-  fi
-  exec o/third_party/qemu/qemu-aarch64 "$@"
+UNAMEM=$(uname -m)
+UNAMES=$(uname -s)
+if [ x"$UNAMES" = x"Darwin" ] && [ x"$UNAMEM" = x"arm64" ]; then
+  exec ape "$@"
 else
   exec "$@"
 fi

dsp/scale/gyarados.c

@@ -27,7 +27,7 @@
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
 #include "libc/math.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 #include "libc/testlib/testlib.h"

dsp/tty/sendtitle.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/tty.h"
 #include "libc/mem/arraylist2.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/x/x.h"
 

dsp/tty/ttyraw.c

@@ -25,7 +25,7 @@
 #include "libc/calls/ucontext.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/fileno.h"

examples/greenbean.c

@@ -285,7 +285,7 @@ int main(int argc, char *argv[]) {
   // print all the ips that 0.0.0.0 would bind
   // Cosmo's GetHostIps() API is much easier than ioctl(SIOCGIFCONF)
   uint32_t *hostips;
-  for (hostips = _gc(GetHostIps()), i = 0; hostips[i]; ++i) {
+  for (hostips = gc(GetHostIps()), i = 0; hostips[i]; ++i) {
     kprintf("listening on http://%hhu.%hhu.%hhu.%hhu:%hu\n", hostips[i] >> 24,
             hostips[i] >> 16, hostips[i] >> 8, hostips[i], PORT);
   }
@@ -339,7 +339,7 @@ int main(int argc, char *argv[]) {
   unassert(!pthread_attr_setguardsize(&attr, pagesz));
   unassert(!pthread_attr_setsigmask_np(&attr, &block));
   unassert(!pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, 0));
-  pthread_t *th = _gc(calloc(threads, sizeof(pthread_t)));
+  pthread_t *th = gc(calloc(threads, sizeof(pthread_t)));
   for (i = 0; i < threads; ++i) {
     int rc;
     ++a_workers;

examples/ls.c

@@ -50,7 +50,7 @@ void List(const char *path) {
   if (strcmp(path, ".") == 0) {
     vpath = "";
   } else if (!endswith(path, "/")) {
-    vpath = _gc(xasprintf("%s/", path));
+    vpath = gc(xasprintf("%s/", path));
   } else {
     vpath = path;
   }

examples/stat.c

@@ -80,10 +80,10 @@ void PrintFileMetadata(const char *pathname, struct stat *st) {
          DescribeFileType(st->st_mode), "owner id", st->st_uid, "group id",
          st->st_gid, "flags", st->st_flags, "gen", st->st_gen,
          "device id (if special)", st->st_rdev, "block size", st->st_blksize,
-         "access time", _gc(xiso8601(&st->st_atim)), "modified time",
-         _gc(xiso8601(&st->st_mtim)), "c[omplicated]time",
-         _gc(xiso8601(&st->st_ctim)), "birthtime",
-         _gc(xiso8601(&st->st_birthtim)));
+         "access time", gc(xiso8601(&st->st_atim)), "modified time",
+         gc(xiso8601(&st->st_mtim)), "c[omplicated]time",
+         gc(xiso8601(&st->st_ctim)), "birthtime",
+         gc(xiso8601(&st->st_birthtim)));
 }
 
 int main(int argc, char *argv[]) {

examples/unbourne.c

@@ -128,7 +128,7 @@
 #include "libc/macros.internal.h"
 #include "libc/mem/alg.h"
 #include "libc/mem/alloca.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/paths.h"
 #include "libc/runtime/runtime.h"

libc/calls/getrandom.c

@@ -88,12 +88,14 @@ static ssize_t GetDevUrandom(char *p, size_t n) {
   int fd;
   ssize_t rc;
   BLOCK_SIGNALS;
+  BLOCK_CANCELATION;
   fd = sys_openat(AT_FDCWD, "/dev/urandom", O_RDONLY | O_CLOEXEC, 0);
   if (fd != -1) {
     rc = sys_read(fd, p, n);
   } else {
     rc = -1;
   }
+  ALLOW_CANCELATION;
   ALLOW_SIGNALS;
   return rc;
 }

libc/calls/tmpfd.c

@@ -53,7 +53,7 @@ int _mkstemp(char *, int);
  * On newer Linux only (c. 2013) it's possible to turn the anonymous
  * returned file back into a real file, by doing this:
  *
- *     linkat(AT_FDCWD, _gc(xasprintf("/proc/self/fd/%d", fd)),
+ *     linkat(AT_FDCWD, gc(xasprintf("/proc/self/fd/%d", fd)),
  *            AT_FDCWD, "real.txt", AT_SYMLINK_FOLLOW)
  *
  * On the New Technology, temporary files created by this function

libc/dlopen/dlopen.c

@@ -18,6 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/atomic.h"
+#include "libc/calls/blockcancel.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/struct/stat.h"
@@ -798,6 +799,7 @@ static void *dlopen_silicon(const char *path, int mode) {
 void *cosmo_dlopen(const char *path, int mode) {
   void *res;
   BLOCK_SIGNALS;
+  BLOCK_CANCELATION;
   if (IsWindows()) {
     res = dlopen_nt(path, mode);
   } else if (IsXnuSilicon()) {
@@ -814,6 +816,7 @@ void *cosmo_dlopen(const char *path, int mode) {
   } else {
     res = 0;
   }
+  ALLOW_CANCELATION;
   ALLOW_SIGNALS;
   STRACE("dlopen(%#s, %d) → %p% m", path, mode, res);
   return res;

libc/integral/normalize.inc

@@ -4,7 +4,7 @@
 
 #define __COSMOPOLITAN_MAJOR__ 3
 #define __COSMOPOLITAN_MINOR__ 2
-#define __COSMOPOLITAN_PATCH__ 3
+#define __COSMOPOLITAN_PATCH__ 4
 #define __COSMOPOLITAN__                                                   \
   (100000000 * __COSMOPOLITAN_MAJOR__ + 1000000 * __COSMOPOLITAN_MINOR__ + \
    __COSMOPOLITAN_PATCH__)

libc/intrin/__cxa_pure_virtual.c

@@ -1,28 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2023 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/kprintf.h"
-#include "libc/runtime/runtime.h"
-
-void __cxa_pure_virtual(void) {
-#ifndef NDEBUG
-  kprintf("__cxa_pure_virtual() called\n"
-          "Did you call a virtual method from a destructor?\n");
-#endif
-  abort();
-}

libc/intrin/stracef.greg.c

@@ -16,6 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/dce.h"
+#include "libc/intrin/describebacktrace.internal.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/strace.internal.h"
 #include "libc/runtime/runtime.h"
@@ -27,3 +29,14 @@ dontinstrument void __stracef(const char *fmt, ...) {
   kvprintf(fmt, v);
   va_end(v);
 }
+
+#if IsModeDbg()
+void report_cancellation_point(void) {
+  kprintf("error: cancelable raw system call not annotated in wrapper\n"
+          "choice #1 use BLOCK_CANCELATION / ALLOW_CANCELATION\n"
+          "choice #2 use BEGIN_CANCELATION_POINT / END_CANCELATION_POINT\n"
+          "backtrace: %s\n",
+          DescribeBacktrace(__builtin_frame_address(0)));
+  __builtin_trap();
+}
+#endif

libc/log/libfatal.internal.h

@@ -3,19 +3,19 @@
 #include "libc/macros.internal.h"
 COSMOPOLITAN_C_START_
 
-__funline unsigned long __strlen(const char *s) {
+forceinline unsigned long __strlen(const char *s) {
   unsigned long n = 0;
   while (*s++) ++n;
   return n;
 }
 
-__funline int __strcmp(const char *l, const char *r) {
+forceinline int __strcmp(const char *l, const char *r) {
   size_t i = 0;
   while (l[i] == r[i] && r[i]) ++i;
   return (l[i] & 255) - (r[i] & 255);
 }
 
-__funline char *__stpcpy(char *d, const char *s) {
+forceinline char *__stpcpy(char *d, const char *s) {
   size_t i;
   for (i = 0;; ++i) {
     if (!(d[i] = s[i])) {
@@ -24,7 +24,7 @@ __funline char *__stpcpy(char *d, const char *s) {
   }
 }
 
-__funline void *__repstosb(void *di, char al, size_t cx) {
+forceinline void *__repstosb(void *di, char al, size_t cx) {
 #if defined(__x86__) && defined(__GNUC__) && !defined(__STRICT_ANSI__)
   asm("rep stosb"
       : "=D"(di), "=c"(cx), "=m"(*(char(*)[cx])di)
@@ -40,7 +40,7 @@ __funline void *__repstosb(void *di, char al, size_t cx) {
 #endif
 }
 
-__funline void *__repmovsb(void *di, const void *si, size_t cx) {
+forceinline void *__repmovsb(void *di, const void *si, size_t cx) {
 #if defined(__x86__) && defined(__GNUC__) && !defined(__STRICT_ANSI__)
   asm("rep movsb"
       : "=D"(di), "=S"(si), "=c"(cx), "=m"(*(char(*)[cx])di)
@@ -57,7 +57,7 @@ __funline void *__repmovsb(void *di, const void *si, size_t cx) {
 #endif
 }
 
-__funline void *__mempcpy(void *d, const void *s, size_t n) {
+forceinline void *__mempcpy(void *d, const void *s, size_t n) {
   size_t i;
   for (i = 0; i < n; ++i) {
     ((char *)d)[i] = ((const char *)s)[i];
@@ -66,7 +66,7 @@ __funline void *__mempcpy(void *d, const void *s, size_t n) {
   return (char *)d + n;
 }
 
-__funline char *__uintcpy(char p[hasatleast 21], uint64_t x) {
+forceinline char *__uintcpy(char p[hasatleast 21], uint64_t x) {
   char t;
   size_t i, a, b;
   i = 0;
@@ -85,22 +85,22 @@ __funline char *__uintcpy(char p[hasatleast 21], uint64_t x) {
   return p + i;
 }
 
-__funline char *__intcpy(char p[hasatleast 21], int64_t x) {
+forceinline char *__intcpy(char p[hasatleast 21], int64_t x) {
   if (x < 0) *p++ = '-', x = -(uint64_t)x;
   return __uintcpy(p, x);
 }
 
-__funline char *__fixcpy(char p[hasatleast 17], uint64_t x, uint8_t k) {
+forceinline char *__fixcpy(char p[hasatleast 17], uint64_t x, uint8_t k) {
   while (k > 0) *p++ = "0123456789abcdef"[(x >> (k -= 4)) & 15];
   *p = '\0';
   return p;
 }
 
-__funline char *__hexcpy(char p[hasatleast 17], uint64_t x) {
+forceinline char *__hexcpy(char p[hasatleast 17], uint64_t x) {
   return __fixcpy(p, x, ROUNDUP(x ? (__builtin_clzll(x) ^ 63) + 1 : 1, 4));
 }
 
-__funline const void *__memchr(const void *s, unsigned char c, size_t n) {
+forceinline const void *__memchr(const void *s, unsigned char c, size_t n) {
   size_t i;
   for (i = 0; i < n; ++i) {
     if (((const unsigned char *)s)[i] == c) {
@@ -110,7 +110,7 @@ __funline const void *__memchr(const void *s, unsigned char c, size_t n) {
   return 0;
 }
 
-__funline char *__strstr(const char *haystack, const char *needle) {
+forceinline char *__strstr(const char *haystack, const char *needle) {
   size_t i;
   for (;;) {
     for (i = 0;; ++i) {
@@ -123,8 +123,8 @@ __funline char *__strstr(const char *haystack, const char *needle) {
   return 0;
 }
 
-__funline char16_t *__strstr16(const char16_t *haystack,
-                               const char16_t *needle) {
+forceinline char16_t *__strstr16(const char16_t *haystack,
+                                 const char16_t *needle) {
   size_t i;
   for (;;) {
     for (i = 0;; ++i) {
@@ -137,21 +137,21 @@ __funline char16_t *__strstr16(const char16_t *haystack,
   return 0;
 }
 
-__funline const char *__strchr(const char *s, unsigned char c) {
+forceinline const char *__strchr(const char *s, unsigned char c) {
   for (;; ++s) {
     if ((*s & 255) == c) return s;
     if (!*s) return 0;
   }
 }
 
-__funline unsigned long __atoul(const char *p) {
+forceinline unsigned long __atoul(const char *p) {
   int c;
   unsigned long x = 0;
   while ('0' <= (c = *p++) && c <= '9') x *= 10, x += c - '0';
   return x;
 }
 
-__funline long __atol(const char *p) {
+forceinline long __atol(const char *p) {
   int s = *p;
   unsigned long x;
   if (s == '-' || s == '+') ++p;
@@ -160,7 +160,7 @@ __funline long __atol(const char *p) {
   return x;
 }
 
-__funline void *__memset(void *a, int c, unsigned long n) {
+forceinline void *__memset(void *a, int c, unsigned long n) {
   char *d = a;
   unsigned long i;
   for (i = 0; i < n; ++i) {
@@ -170,7 +170,7 @@ __funline void *__memset(void *a, int c, unsigned long n) {
   return d;
 }
 
-__funline void *__memcpy(void *a, const void *b, unsigned long n) {
+forceinline void *__memcpy(void *a, const void *b, unsigned long n) {
   char *d = a;
   unsigned long i;
   const char *s = b;
@@ -181,7 +181,7 @@ __funline void *__memcpy(void *a, const void *b, unsigned long n) {
   return d;
 }
 
-__funline void *__memmove(void *a, const void *b, unsigned long n) {
+forceinline void *__memmove(void *a, const void *b, unsigned long n) {
   char *d = a;
   unsigned long i;
   const char *s = b;

libc/log/vflogf.c

@@ -95,6 +95,7 @@ void(vflogf)(unsigned level, const char *file, int line, FILE *f,
   flockfile(f);
   strace_enabled(-1);
   BLOCK_SIGNALS;
+  BLOCK_CANCELATION;
 
   // We display TIMESTAMP.MICROS normally. However, when we log multiple
   // times in the same second, we display TIMESTAMP+DELTAMICROS instead.
@@ -136,6 +137,7 @@ void(vflogf)(unsigned level, const char *file, int line, FILE *f,
     _Exit(22);
   }
 
+  ALLOW_CANCELATION;
   ALLOW_SIGNALS;
   strace_enabled(+1);
   funlockfile(f);

libc/mem/gc.c

@@ -39,7 +39,7 @@ static void TeardownGc(void) {
   if (__tls_enabled) {
     t = __get_tls();
     if ((g = t->tib_garbages)) {
-      // exit() currently doesn't use _gclongjmp() like pthread_exit()
+      // exit() currently doesn't use gclongjmp() like pthread_exit()
       // so we need to run the deferred functions manually.
       while (g->i) {
         --g->i;
@@ -88,7 +88,7 @@ static void DeferFunction(struct StackFrame *frame, void *fn, void *arg) {
   frame->addr = (intptr_t)__gc;
 }
 
-// the gnu extension macros for _gc / _defer point here
+// the gnu extension macros for gc / defer point here
 void __defer(void *rbp, void *fn, void *arg) {
   struct StackFrame *f, *frame = rbp;
   f = __builtin_frame_address(0);
@@ -96,48 +96,3 @@ void __defer(void *rbp, void *fn, void *arg) {
   unassert(PointerNotOwnedByParentStackFrame(f, frame, arg));
   DeferFunction(frame, fn, arg);
 }
-
-/**
- * Frees memory when function returns.
- *
- * This garbage collector overwrites the return address on the stack so
- * that the RET instruction calls a trampoline which calls free(). It's
- * loosely analogous to Go's defer keyword rather than a true cycle gc.
- *
- *     const char *s = _gc(strdup("hello"));
- *     puts(s);
- *
- * This macro is equivalent to:
- *
- *      _defer(free, ptr)
- *
- * @warning do not return a gc()'d pointer
- * @warning do not realloc() with gc()'d pointer
- * @warning be careful about static keyword due to impact of inlining
- * @note you should use -fno-omit-frame-pointer
- */
-void *(_gc)(void *thing) {
-  struct StackFrame *frame;
-  frame = __builtin_frame_address(0);
-  DeferFunction(frame->next, _weakfree, thing);
-  return thing;
-}
-
-/**
- * Calls fn(arg) when function returns.
- *
- * This garbage collector overwrites the return address on the stack so
- * that the RET instruction calls a trampoline which calls free(). It's
- * loosely analogous to Go's defer keyword rather than a true cycle gc.
- *
- * @warning do not return a gc()'d pointer
- * @warning do not realloc() with gc()'d pointer
- * @warning be careful about static keyword due to impact of inlining
- * @note you should use -fno-omit-frame-pointer
- */
-void *(_defer)(void *fn, void *arg) {
-  struct StackFrame *frame;
-  frame = __builtin_frame_address(0);
-  DeferFunction(frame->next, fn, arg);
-  return arg;
-}

libc/mem/gc.h

@@ -1,25 +1,23 @@
 #ifndef COSMOPOLITAN_LIBC_MEM_GC_H_
 #define COSMOPOLITAN_LIBC_MEM_GC_H_
+#ifdef _COSMO_SOURCE
 COSMOPOLITAN_C_START_
 
-void *_gc(void *);
-void *_defer(void *, void *);
-void __defer(void *, void *, void *);
-void _gclongjmp(void *, int) dontthrow wontreturn;
-void _gc_free(void *);
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-#define _gc(THING) _defer((void *)_gc_free, (void *)(THING))
-#define _defer(FN, ARG)                           \
-  ({                                              \
-    autotype(ARG) Arg = (ARG);                    \
-    /* prevent weird opts like tail call */       \
-    asm volatile("" : "+g"(Arg) : : "memory");    \
-    __defer(__builtin_frame_address(0), FN, Arg); \
-    asm volatile("" : "+g"(Arg) : : "memory");    \
-    Arg;                                          \
+void _gc_free(void *) libcesque;
+void __defer(void *, void *, void *) libcesque;
+void gclongjmp(void *, int) libcesque wontreturn;
+#define gc(THING)  defer((void *)_gc_free, (void *)(THING))
+#define _gc(THING) defer((void *)_gc_free, (void *)(THING))
+#define defer(FN, ARG)                             \
+  ({                                               \
+    autotype(ARG) Arg = (ARG);                     \
+    /* prevent weird opts like tail call */        \
+    __asm__ volatile("" : "+g"(Arg) : : "memory"); \
+    __defer(__builtin_frame_address(0), FN, Arg);  \
+    __asm__ volatile("" : "+g"(Arg) : : "memory"); \
+    Arg;                                           \
   })
-#endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) */
 
 COSMOPOLITAN_C_END_
+#endif /* _COSMO_SOURCE */
 #endif /* COSMOPOLITAN_LIBC_MEM_GC_H_ */

libc/mem/gc.internal.h

@@ -1,9 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_MEM_GC_INTERNAL_H_
-#define COSMOPOLITAN_LIBC_MEM_GC_INTERNAL_H_
-#include "libc/mem/gc.h"
-
-#define gc(THING)          _gc(THING)
-#define defer(FN, ARG)     _defer(FN, ARG)
-#define gclongjmp(JB, ARG) _gclongjmp(JB, ARG)
-
-#endif /* COSMOPOLITAN_LIBC_MEM_GC_INTERNAL_H_ */

libc/nexgen32e/gclongjmp.S

@@ -30,7 +30,7 @@
 //	@see	examples/ctrlc.c
 //	@noreturn
 	.ftrace1
-_gclongjmp:
+gclongjmp:
 	.ftrace2
 #ifdef __x86_64__
 	push	%rbp
@@ -65,4 +65,4 @@ _gclongjmp:
 #else
 #error "unsupported architecture"
 #endif /* __x86_64__ */
-	.endfn	_gclongjmp,globl
+	.endfn	gclongjmp,globl

libc/nexgen32e/longjmp.S

@@ -23,7 +23,7 @@
 //	@param	rdi points to the jmp_buf
 //	@param	esi is returned by setjmp() invocation (coerced nonzero)
 //	@noreturn
-//	@see	_gclongjmp()
+//	@see	gclongjmp()
 //	@see	siglongjmp()
 	.ftrace1
 longjmp:
@@ -43,13 +43,13 @@ _longjmp:
 	mov	48(%rdi),%r15
 	jmp	*56(%rdi)
 #elif defined(__aarch64__)
-	ldp	x19,x20,[x0,#0]
-	ldp	x21,x22,[x0,#16]
+	ldp	x29,x30,[x0,#0]
+	ldp	x2,x22,[x0,#16]
 	ldp	x23,x24,[x0,#32]
 	ldp	x25,x26,[x0,#48]
 	ldp	x27,x28,[x0,#64]
-	ldp	x29,x30,[x0,#80]
-	ldr	x2,[x0,#104]
+	ldp	x19,x20,[x0,#80]
+	ldr	x21,[x0,#104]
 	mov	sp,x2
 	ldp	d8 ,d9,[x0,#112]
 	ldp	d10,d11,[x0,#128]

libc/nexgen32e/setjmp.S

@@ -25,10 +25,11 @@
 //	@returnstwice
 //	@assume	system five nexgen32e abi conformant
 //	@note	code built w/ microsoft abi compiler can't call this
-//	@see	longjmp(), _gclongjmp()
+//	@see	longjmp(), gclongjmp()
 	.ftrace1
 setjmp:
 	.ftrace2
+_setjmp:
 #ifdef __x86_64__
 	lea	8(%rsp),%rax
 	mov	%rax,(%rdi)
@@ -43,14 +44,14 @@ setjmp:
 	xor	%eax,%eax
 	ret
 #elif defined(__aarch64__)
-	stp	x19,x20,[x0,#0]
-	stp	x21,x22,[x0,#16]
+	mov	x2,sp
+	stp	x29,x30,[x0,#0]
+	stp	x2,x22,[x0,#16]
 	stp	x23,x24,[x0,#32]
 	stp	x25,x26,[x0,#48]
 	stp	x27,x28,[x0,#64]
-	stp	x29,x30,[x0,#80]
-	mov	x2,sp
-	str	x2,[x0,#104]
+	stp	x19,x20,[x0,#80]
+	str	x21,[x0,#104]
 	stp	d8,d9,[x0,#112]
 	stp	d10,d11,[x0,#128]
 	stp	d12,d13,[x0,#144]
@@ -60,5 +61,5 @@ setjmp:
 #else
 #error "unsupported architecture"
 #endif
+	.endfn	_setjmp,globl
 	.endfn	setjmp,globl
-	.alias	setjmp,_setjmp

libc/proc/execve-sysv.c

@@ -58,6 +58,7 @@ static bool IsApeFile(const char *path) {
   } else {
     bool res = false;
     BLOCK_SIGNALS;
+    BLOCK_CANCELATION;
     int fd;
     char buf[8];
     int flags = O_RDONLY | O_NOCTTY | O_NONBLOCK | O_CLOEXEC;
@@ -65,6 +66,7 @@ static bool IsApeFile(const char *path) {
       res = sys_pread(fd, buf, 8, 0, 0) == 8 && IsApeLoadable(buf);
       sys_close(fd);
     }
+    ALLOW_CANCELATION;
     ALLOW_SIGNALS;
     return res;
   }

libc/proc/fexecve.c

@@ -201,14 +201,14 @@ int fexecve(int fd, char *const argv[], char *const envp[]) {
       }
       if (!__isfdkind(fd, kFdZip)) {
         bool memfdReq;
-        BEGIN_CANCELATION_POINT;
         BLOCK_SIGNALS;
+        BLOCK_CANCELATION;
         strace_enabled(-1);
         memfdReq = ((rc = fcntl(fd, F_GETFD)) != -1) && (rc & FD_CLOEXEC) &&
                    IsAPEFd(fd);
         strace_enabled(+1);
+        ALLOW_CANCELATION;
         ALLOW_SIGNALS;
-        END_CANCELATION_POINT;
         if (rc == -1) {
           break;
         } else if (!memfdReq) {
@@ -221,13 +221,13 @@ int fexecve(int fd, char *const argv[], char *const envp[]) {
       }
       int newfd;
       char *path = alloca(PATH_MAX);
-      BEGIN_CANCELATION_POINT;
       BLOCK_SIGNALS;
+      BLOCK_CANCELATION;
       strace_enabled(-1);
       newfd = fd_to_mem_fd(fd, path);
       strace_enabled(+1);
+      ALLOW_CANCELATION;
       ALLOW_SIGNALS;
-      END_CANCELATION_POINT;
       if (newfd == -1) {
         break;
       }
@@ -242,13 +242,13 @@ int fexecve(int fd, char *const argv[], char *const envp[]) {
       if (!savedErr) {
         savedErr = errno;
       }
-      BEGIN_CANCELATION_POINT;
       BLOCK_SIGNALS;
+      BLOCK_CANCELATION;
       strace_enabled(-1);
       close(newfd);
       strace_enabled(+1);
+      ALLOW_CANCELATION;
       ALLOW_SIGNALS;
-      END_CANCELATION_POINT;
     } while (0);
     if (savedErr) {
       errno = savedErr;

libc/runtime/cxaguard.c

@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "libc/atomic.h"
-#include "libc/cxxabi.h"
-#include "libc/intrin/atomic.h"
-#include "libc/limits.h"
-#include "third_party/nsync/futex.internal.h"
-
-// This file contains C++ ABI support functions for one time
-// constructors as defined in the "Run-time ABI for the ARM Architecture"
-// section 4.4.2
-//
-// ARM C++ ABI and Itanium/x86 C++ ABI has different definition for
-// one time construction:
-//
-//    ARM C++ ABI defines the LSB of guard variable should be tested
-//    by compiler-generated code before calling __cxa_guard_acquire et al.
-//
-//    The Itanium/x86 C++ ABI defines the low-order _byte_ should be
-//    tested instead.
-//
-//    Meanwhile, guard variable are 32bit aligned for ARM, and 64bit
-//    aligned for x86.
-//
-// Reference documentation:
-//
-//    section 3.2.3 of ARM IHI 0041C (for ARM)
-//    section 3.3.2 of the Itanium C++ ABI specification v1.83 (for x86).
-//
-// There is no C++ ABI available for other ARCH. But the gcc source
-// shows all other ARCH follow the definition of Itanium/x86 C++ ABI.
-
-// The Itanium/x86 C++ ABI (used by all architectures that aren't ARM32)
-// mandates guard variables are 64-bit aligned, 64-bit values. The least
-// significant byte is tested by the compiler-generated code before it's
-// calling __cxa_guard_acquire.
-union CxaGuardValue {
-  atomic_int state;
-  int64_t aligner;
-};
-
-// Set construction state values according to reference documentation. 0
-// is the initialization value. Arm requires ((*gv & 1) == 1) after
-// __cxa_guard_release, ((*gv & 3) == 0) after __cxa_guard_abort. X86
-// requires first byte not modified by __cxa_guard_acquire, first byte
-// is non-zero after __cxa_guard_release.
-#define CONSTRUCTION_NOT_YET_STARTED         0
-#define CONSTRUCTION_COMPLETE                1
-#define CONSTRUCTION_UNDERWAY_WITHOUT_WAITER 0x100
-#define CONSTRUCTION_UNDERWAY_WITH_WAITER    0x200
-
-int __cxa_guard_acquire(union CxaGuardValue *gv) {
-  int old_value = atomic_load_explicit(&gv->state, memory_order_relaxed);
-  while (true) {
-    if (old_value == CONSTRUCTION_COMPLETE) {
-      // A load_acquire operation is needed before exiting with COMPLETE
-      // state, as we must ensure that all the stores performed by the
-      // construction function are observable on this CPU after we exit.
-      atomic_thread_fence(memory_order_acquire);
-      return 0;
-    } else if (old_value == CONSTRUCTION_NOT_YET_STARTED) {
-      if (!atomic_compare_exchange_weak_explicit(
-              &gv->state, &old_value, CONSTRUCTION_UNDERWAY_WITHOUT_WAITER,
-              memory_order_relaxed, memory_order_relaxed)) {
-        continue;
-      }
-      // The acquire fence may not be needed. But as described in section 3.3.2
-      // of the Itanium C++ ABI specification, it probably has to behave like
-      // the acquisition of a mutex, which needs an acquire fence.
-      atomic_thread_fence(memory_order_acquire);
-      return 1;
-    } else if (old_value == CONSTRUCTION_UNDERWAY_WITHOUT_WAITER) {
-      if (!atomic_compare_exchange_weak_explicit(
-              &gv->state, &old_value, CONSTRUCTION_UNDERWAY_WITH_WAITER,
-              memory_order_relaxed, memory_order_relaxed)) {
-        continue;
-      }
-    }
-    nsync_futex_wait_(&gv->state, CONSTRUCTION_UNDERWAY_WITH_WAITER, 0, 0);
-    old_value = atomic_load_explicit(&gv->state, memory_order_relaxed);
-  }
-}
-
-void __cxa_guard_release(union CxaGuardValue *gv) {
-  // Release fence is used to make all stores performed by the construction
-  // function visible in other threads.
-  int old_value = atomic_exchange_explicit(&gv->state, CONSTRUCTION_COMPLETE,
-                                           memory_order_release);
-  if (old_value == CONSTRUCTION_UNDERWAY_WITH_WAITER) {
-    nsync_futex_wake_(&gv->state, INT_MAX, 0);
-  }
-}
-
-void __cxa_guard_abort(union CxaGuardValue *gv) {
-  // Release fence is used to make all stores performed by the construction
-  // function visible in other threads.
-  int old_value = atomic_exchange_explicit(
-      &gv->state, CONSTRUCTION_NOT_YET_STARTED, memory_order_release);
-  if (old_value == CONSTRUCTION_UNDERWAY_WITH_WAITER) {
-    nsync_futex_wake_(&gv->state, INT_MAX, 0);
-  }
-}

libc/runtime/exit.c

@@ -17,6 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/cxxabi.h"
+#include "libc/intrin/cxaatexit.internal.h"
 #include "libc/intrin/strace.internal.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/internal.h"
@@ -36,13 +37,24 @@
  * @noreturn
  */
 wontreturn void exit(int exitcode) {
-  const uintptr_t *p;
   STRACE("exit(%d)", exitcode);
+
+  // call thread local c++ object destructors
+  if (_weaken(__cxa_thread_finalize)) {
+    _weaken(__cxa_thread_finalize)();
+  }
+
+  // call atexit() and __cxa_atexit() destructors
   if (_weaken(__cxa_finalize)) {
     _weaken(__cxa_finalize)(NULL);
   }
+
+  // call __destructor__ and finiarray destructors
+  const uintptr_t *p;
   for (p = __fini_array_end; p > __fini_array_start;) {
     ((void (*)(void))(*--p))();
   }
+
+  // terminate process
   _Exit(exitcode);
 }

libc/runtime/runtime.h

@@ -136,7 +136,7 @@ long __get_minsigstksz(void) pureconst;
 void __get_main_stack(void **, size_t *, int *);
 long __get_safe_size(long, long);
 char *__get_tmpdir(void);
-__funline int __trace_disabled(int x) {
+forceinline int __trace_disabled(int x) {
   return 0;
 }
 #ifndef FTRACE

libc/runtime/stack.h

@@ -96,7 +96,7 @@ extern char ape_stack_align[] __attribute__((__weak__));
  * since it'll not only ensure stack overflows are detected, it
  * will also trigger the stack to grow down safely.
  */
-__funline void CheckLargeStackAllocation(void *p, ssize_t n) {
+forceinline void CheckLargeStackAllocation(void *p, ssize_t n) {
   for (; n > 0; n -= 4096) {
     ((char *)p)[n - 1] = 0;
   }

libc/runtime/unwind.c

@@ -1,37 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2022 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/runtime/unwind.h"
-
-// temporary stubs for libunwind
-
-uintptr_t _Unwind_GetCFA(struct _Unwind_Context *ctx) {
-  return 0;
-}
-
-uintptr_t _Unwind_GetIP(struct _Unwind_Context *ctx) {
-  return 0;
-}
-
-_Unwind_Reason_Code _Unwind_Backtrace(_Unwind_Trace_Fn fn, void *arg) {
-  return _URC_NORMAL_STOP;
-}
-
-void *_Unwind_FindEnclosingFunction(void *arg) {
-  return NULL;
-}

libc/runtime/unwind.h

@@ -1,40 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_RUNTIME_UNWIND_H_
-#define COSMOPOLITAN_LIBC_RUNTIME_UNWIND_H_
-
-#define UNW_TDEP_CURSOR_LEN 127
-
-COSMOPOLITAN_C_START_
-
-typedef enum {
-  _URC_NO_REASON = 0,
-  _URC_FOREIGN_EXCEPTION_CAUGHT = 1,
-  _URC_FATAL_PHASE2_ERROR = 2,
-  _URC_FATAL_PHASE1_ERROR = 3,
-  _URC_NORMAL_STOP = 4,
-  _URC_END_OF_STACK = 5,
-  _URC_HANDLER_FOUND = 6,
-  _URC_INSTALL_CONTEXT = 7,
-  _URC_CONTINUE_UNWIND = 8
-} _Unwind_Reason_Code;
-
-typedef uint64_t unw_word_t;
-
-typedef struct unw_cursor {
-  unw_word_t opaque[UNW_TDEP_CURSOR_LEN];
-} unw_cursor_t;
-
-struct _Unwind_Context {
-  unw_cursor_t cursor;
-  int end_of_stack;
-};
-
-typedef _Unwind_Reason_Code (*_Unwind_Trace_Fn)(struct _Unwind_Context *,
-                                                void *);
-
-uintptr_t _Unwind_GetCFA(struct _Unwind_Context *);
-uintptr_t _Unwind_GetIP(struct _Unwind_Context *);
-_Unwind_Reason_Code _Unwind_Backtrace(_Unwind_Trace_Fn, void *);
-void *_Unwind_FindEnclosingFunction(void *);
-
-COSMOPOLITAN_C_END_
-#endif /* COSMOPOLITAN_LIBC_RUNTIME_UNWIND_H_ */

libc/stdio/getentropy.c

@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/calls/blockcancel.internal.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/dce.h"
@@ -45,7 +46,9 @@ int getentropy(void *p, size_t n) {
     rc = 0;
   } else {
     BLOCK_SIGNALS;
+    BLOCK_CANCELATION;
     if (__getrandom(p, n, 0) != n) notpossible;
+    ALLOW_CANCELATION;
     ALLOW_SIGNALS;
     rc = 0;
   }

libc/stdio/tmpfile.c

@@ -42,7 +42,7 @@
  * On newer Linux only (c. 2013) it's possible to turn the anonymous
  * returned file back into a real file, by doing this:
  *
- *     linkat(AT_FDCWD, _gc(xasprintf("/proc/self/fd/%d", fileno(f))),
+ *     linkat(AT_FDCWD, gc(xasprintf("/proc/self/fd/%d", fileno(f))),
  *            AT_FDCWD, "real.txt", AT_SYMLINK_FOLLOW)
  *
  * On the New Technology, temporary files created by this function

libc/thread/posixthread.internal.h

@@ -116,11 +116,11 @@ void _pthread_unref(struct PosixThread *);
 void _pthread_unwind(struct PosixThread *);
 void _pthread_zombify(struct PosixThread *);
 
-__funline pureconst struct PosixThread *_pthread_self(void) {
+forceinline pureconst struct PosixThread *_pthread_self(void) {
   return (struct PosixThread *)__get_tls()->tib_pthread;
 }
 
-__funline void _pthread_ref(struct PosixThread *pt) {
+forceinline void _pthread_ref(struct PosixThread *pt) {
   atomic_fetch_add_explicit(&pt->pt_refs, 1, memory_order_relaxed);
 }
 

libc/thread/pthread_cancel.c

@@ -291,7 +291,7 @@ static errno_t _pthread_cancel_everyone(void) {
  * Consider using Cosmopolitan Libc's garbage collector since it will be
  * executed when a thread exits due to a cancelation.
  *
- *     void *p = _gc(malloc(123));
+ *     void *p = gc(malloc(123));
  *     read(0, p, 123);
  *
  * It's possible to put a thread in asynchronous cancelation mode with

libc/thread/pthread_exit.c

@@ -84,8 +84,8 @@ void _pthread_unkey(struct CosmoTib *tib) {
  * the callback function that was supplied to pthread_create(). This may
  * be used if the thread wishes to exit at any other point in the thread
  * lifecycle, in which case this function is responsible for ensuring we
- * invoke _gc(), _defer(), and pthread_cleanup_push() callbacks, as well
- * as pthread_key_create() destructors.
+ * invoke gc(), _defer(), and pthread_cleanup_push() callbacks, and also
+ * pthread_key_create() destructors.
  *
  * If the current thread is an orphaned thread, or is the main thread
  * when no other threads were created, then this will terminated your

libc/thread/tls.h

@@ -65,7 +65,7 @@ void __set_tls(struct CosmoTib *);
  *
  * This can't be used in privileged functions.
  */
-__funline pureconst struct CosmoTib *__get_tls(void) {
+forceinline pureconst struct CosmoTib *__get_tls(void) {
 #ifdef __chibicc__
   return 0;
 #elif __x86_64__

libc/thread/tls2.internal.h

@@ -11,7 +11,7 @@ COSMOPOLITAN_C_START_
  * This should be favored over __get_tls() for .privileged code that
  * can't be self-modified by __enable_tls().
  */
-__funline struct CosmoTib *__get_tls_privileged(void) {
+forceinline struct CosmoTib *__get_tls_privileged(void) {
   char *tib, *lin = (char *)0x30;
   if (IsLinux() || IsFreebsd() || IsNetbsd() || IsOpenbsd() || IsMetal()) {
     if (!__tls_morphed) {
@@ -28,14 +28,14 @@ __funline struct CosmoTib *__get_tls_privileged(void) {
   return (struct CosmoTib *)tib;
 }
 
-__funline struct CosmoTib *__get_tls_win32(void) {
+forceinline struct CosmoTib *__get_tls_win32(void) {
   char *tib, *lin = (char *)0x30;
   asm("mov\t%%gs:(%1),%0" : "=a"(tib) : "r"(lin) : "memory");
   tib = *(char **)(tib + 0x1480 + __tls_index * 8);
   return (struct CosmoTib *)tib;
 }
 
-__funline void __set_tls_win32(void *tls) {
+forceinline void __set_tls_win32(void *tls) {
   asm("mov\t%1,%%gs:%0" : "=m"(*((long *)0x1480 + __tls_index)) : "r"(tls));
 }
 

libc/x/xbasename.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/libgen.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/x/x.h"
 

net/https/chaincertificate.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/log/log.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "net/https/https.h"
 
 bool ChainCertificate(mbedtls_x509_crt *cert, mbedtls_x509_crt *parent) {

net/https/finishcertificate.c

@@ -37,8 +37,8 @@ struct Cert FinishCertificate(struct Cert *ca, mbedtls_x509write_cert *wcert,
   if ((rc = mbedtls_pk_check_pair(&cert->pk, key))) {
     FATALF("generate key (grep -0x%04x)", -rc);
   }
-  LogCertificate(_gc(xasprintf("generated %s certificate",
-                               mbedtls_pk_get_name(&cert->pk))),
-                 cert);
+  LogCertificate(
+      gc(xasprintf("generated %s certificate", mbedtls_pk_get_name(&cert->pk))),
+      cert);
   return (struct Cert){cert, key};
 }

net/turfwar/turfwar.c

@@ -32,7 +32,6 @@
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/atomic.h"
-#include "libc/serialize.h"
 #include "libc/intrin/bsr.h"
 #include "libc/intrin/hilbert.h"
 #include "libc/intrin/kprintf.h"
@@ -49,6 +48,7 @@
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/stack.h"
 #include "libc/runtime/sysconf.h"
+#include "libc/serialize.h"
 #include "libc/sock/sock.h"
 #include "libc/sock/struct/pollfd.h"
 #include "libc/sock/struct/sockaddr.h"
@@ -815,13 +815,13 @@ void *ListenWorker(void *arg) {
 void *HttpWorker(void *arg) {
   struct Client client;
   int id = (intptr_t)arg;
-  char *msgbuf = _gc(xmalloc(MSG_BUF));
+  char *msgbuf = gc(xmalloc(MSG_BUF));
   char *inbuf = NewSafeBuffer(INBUF_SIZE);
   char *outbuf = NewSafeBuffer(OUTBUF_SIZE);
-  struct HttpMessage *msg = _gc(xcalloc(1, sizeof(struct HttpMessage)));
+  struct HttpMessage *msg = gc(xcalloc(1, sizeof(struct HttpMessage)));
 
   BlockSignals();
-  pthread_setname_np(pthread_self(), _gc(xasprintf("HTTP%d", id)));
+  pthread_setname_np(pthread_self(), gc(xasprintf("HTTP%d", id)));
 
   // connection loop
   while (GetClient(&g_clients, &client)) {
@@ -1761,7 +1761,7 @@ void *ClaimWorker(void *arg) {
   long processed;
   sqlite3_stmt *stmt;
   bool warmedup = false;
-  struct Claim *v = _gc(xcalloc(BATCH_MAX, sizeof(struct Claim)));
+  struct Claim *v = gc(xcalloc(BATCH_MAX, sizeof(struct Claim)));
   BlockSignals();
   pthread_setname_np(pthread_self(), "ClaimWorker");
   LOG("%P ClaimWorker started\n");

test/dsp/core/alaw_test.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/core.h"
 #include "libc/macros.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/testlib/ezbench.h"
 #include "libc/testlib/hyperion.h"

test/dsp/core/getintegercoefficients_test.c

@@ -20,7 +20,7 @@
 #include "dsp/core/q.h"
 #include "libc/dce.h"
 #include "libc/macros.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/str/str.h"
 #include "libc/testlib/ezbench.h"
 #include "libc/testlib/testlib.h"

test/dsp/scale/magikarp_test.c

@@ -23,7 +23,7 @@
 #include "libc/fmt/bing.internal.h"
 #include "libc/log/check.h"
 #include "libc/math.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/str/str.h"

test/dsp/scale/scale_test.c

@@ -23,7 +23,7 @@
 #include "dsp/core/half.h"
 #include "libc/fmt/bing.internal.h"
 #include "libc/macros.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"

test/libc/calls/access_test.c

@@ -20,7 +20,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/mem/alloca.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/consts/auxv.h"

test/libc/calls/cachestat_test.c

@@ -25,7 +25,7 @@
 #include "libc/errno.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/macros.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/sysconf.h"
 #include "libc/stdio/rand.h"

test/libc/calls/copy_file_range_test.c

@@ -38,7 +38,7 @@ void SetUpOnce(void) {
 
 void Make(const char *path, int mode) {
   int fd, n = lemur64() & 0xfffff;
-  char *data = _gc(malloc(n));
+  char *data = gc(malloc(n));
   rngset(data, n, lemur64, -1);
   ASSERT_NE(-1, (fd = creat(path, mode)));
   ASSERT_SYS(0, n, write(fd, data, n));
@@ -77,8 +77,8 @@ TEST(copy_file_range, test) {
   size_t n, m;
   Make("foo", 0644);
   Copy("foo", "bar");
-  p = _gc(xslurp("foo", &n));
-  q = _gc(xslurp("bar", &m));
+  p = gc(xslurp("foo", &n));
+  q = gc(xslurp("bar", &m));
   ASSERT_EQ(n, m);
   ASSERT_EQ(0, memcmp(p, q, n));
 }

test/libc/calls/fchdir_test.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/sysv/consts/o.h"
 #include "libc/testlib/testlib.h"
 

test/libc/calls/ftruncate_test.c

@@ -23,7 +23,7 @@
 #include "libc/errno.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/limits.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/nexgen32e/vendor.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"

test/libc/calls/getcwd_test.c

@@ -22,7 +22,7 @@
 #include "libc/fmt/libgen.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/serialize.h"
 #include "libc/str/str.h"
 #include "libc/testlib/testlib.h"

test/libc/calls/getrandom_test.c

@@ -22,7 +22,6 @@
 #include "libc/calls/struct/sigaction.h"
 #include "libc/calls/struct/sigset.h"
 #include "libc/errno.h"
-#include "libc/serialize.h"
 #include "libc/log/check.h"
 #include "libc/macros.internal.h"
 #include "libc/math.h"
@@ -30,6 +29,7 @@
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/runtime/runtime.h"
+#include "libc/serialize.h"
 #include "libc/stdio/lcg.internal.h"
 #include "libc/stdio/rand.h"
 #include "libc/stdio/stdio.h"
@@ -70,7 +70,7 @@ void *TortureWorker(void *arg) {
 TEST(getrandom, test) {
   int i, n = 999;
   double e, w = 7.7;
-  char *buf = _gc(calloc(1, n));
+  char *buf = gc(calloc(1, n));
   ASSERT_SYS(0, 0, getrandom(0, 0, 0));
   ASSERT_SYS(0, n, getrandom(buf, n, 0));
   ASSERT_SYS(EFAULT, -1, getrandom(0, n, 0));
@@ -92,7 +92,7 @@ TEST(getrandom, test2) {
   double e, w = 7.7;
   struct sigaction sa;
   int i, k, m, n = 999;
-  char *buf = _gc(calloc(1, n));
+  char *buf = gc(calloc(1, n));
   sa.sa_flags = 0;
   sa.sa_handler = OnSig;
   sigemptyset(&sa.sa_mask);

test/libc/calls/ioctl_test.c

@@ -20,7 +20,7 @@
 #include "libc/calls/internal.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sock/sock.h"

test/libc/calls/makedirs_test.c

@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/testlib/testlib.h"
 #include "libc/thread/thread.h"

test/libc/calls/mkdir_test.c

@@ -20,7 +20,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/log/check.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"

test/libc/calls/mkntcmdline_test.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/errno.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/proc/ntspawn.h"
 #include "libc/str/str.h"

test/libc/calls/mkntenvblock_test.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/proc/ntspawn.h"
 #include "libc/runtime/runtime.h"
 #include "libc/testlib/testlib.h"

test/libc/calls/mkntpath_test.c

@@ -19,7 +19,7 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/testlib/testlib.h"
 #if SupportsWindows()
 

test/libc/calls/open_test.c

@@ -24,7 +24,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/macros.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"

test/libc/calls/openatemp_test.c

@@ -21,7 +21,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/limits.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/at.h"

test/libc/calls/poll_test.c

@@ -96,7 +96,7 @@ TEST(poll, testNegativeOneFd_isIgnored) {
   EXPECT_SYS(0, 0, poll(fds, ARRAYLEN(fds), 1));
   EXPECT_STREQ("fd:-1 revents:<TODO:kPollNames>\n"
                "fd:3 revents:<TODO:kPollNames>\n",
-               _gc(FormatPollFd(&fds[0])));
+               gc(FormatPollFd(&fds[0])));
   ASSERT_SYS(0, 0, close(3));
 }
 

test/libc/calls/readlinkat_test.c

@@ -23,7 +23,7 @@
 #include "libc/limits.h"
 #include "libc/log/log.h"
 #include "libc/mem/gc.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/runtime/symbols.internal.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/at.h"

test/libc/calls/stackoverflow1_test.c

@@ -23,7 +23,7 @@
 #include "libc/dce.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/limits.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/sysconf.h"

test/libc/calls/stackoverflow2_test.c

@@ -22,7 +22,7 @@
 #include "libc/dce.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/limits.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/sysconf.h"

test/libc/calls/stackoverflow3_test.c

@@ -23,7 +23,7 @@
 #include "libc/calls/ucontext.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/limits.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/sysconf.h"

test/libc/calls/stackoverflow4_test.c

@@ -23,7 +23,7 @@
 #include "libc/calls/ucontext.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/limits.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/sysconf.h"

test/libc/calls/stat_test.c

@@ -25,7 +25,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/limits.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/nt/files.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"

test/libc/calls/writev_test.c

@@ -23,7 +23,7 @@
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/gc.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sock/sock.h"
@@ -55,7 +55,7 @@ TEST(writev, negative_einvalOrEfault) {
 TEST(writev, exceedsIovMax_einval) {
   if (IsWindows()) return;  // it's complicated
   int i, n = IOV_MAX + 1;
-  struct iovec *v = _gc(malloc(sizeof(struct iovec) * n));
+  struct iovec *v = gc(malloc(sizeof(struct iovec) * n));
   for (i = 0; i < n; ++i) {
     v[i].iov_base = "x";
     v[i].iov_len = 1;

test/libc/fmt/stripexts_test.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
 #include "libc/fmt/libgen.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
 

test/libc/fmt/zleb64_test.c

@@ -19,7 +19,7 @@
 #include "libc/fmt/leb128.h"
 #include "libc/limits.h"
 #include "libc/mem/mem.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/testlib/testlib.h"
 
 TEST(zleb64, testZero) {

test/libc/intrin/cosmo_once_test.c

@@ -20,7 +20,7 @@
 #include "libc/cosmo.h"
 #include "libc/dce.h"
 #include "libc/intrin/atomic.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/testlib/testlib.h"
 #include "libc/thread/thread.h"

test/libc/intrin/countbits_test.c

@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/intrin/popcnt.h"
 #include "libc/limits.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 #include "libc/testlib/ezbench.h"

test/libc/intrin/memcmp_test.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/sysconf.h"

test/libc/intrin/memmove_test.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/macros.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/nexgen32e.h"
 #include "libc/runtime/runtime.h"

test/libc/intrin/memset_test.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
 #include "libc/intrin/asan.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/stdio/rand.h"
 #include "libc/str/str.h"

test/libc/intrin/pthread_mutex_lock2_test.c

@@ -21,7 +21,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/timespec.h"
 #include "libc/intrin/atomic.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/testlib/ezbench.h"
 #include "libc/testlib/testlib.h"

test/libc/intrin/pthread_mutex_lock_test.c

@@ -25,7 +25,7 @@
 #include "libc/log/check.h"
 #include "libc/macros.internal.h"
 #include "libc/math.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/internal.h"
 #include "libc/runtime/runtime.h"

test/libc/intrin/strcmp_test.c

@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/dce.h"
 #include "libc/macros.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/cachesize.h"
 #include "libc/nexgen32e/x86feature.h"

test/libc/log/backtrace_test.c

@@ -115,7 +115,7 @@ TEST(ShowCrashReports, testMemoryLeakCrash) {
   }
   close(fds[0]);
   ASSERT_NE(-1, wait(&ws));
-  // tinyprint(2, _gc(IndentLines(output, -1, 0, 4)), "\n", NULL);
+  // tinyprint(2, gc(IndentLines(output, -1, 0, 4)), "\n", NULL);
   EXPECT_EQ(78 << 8, ws);
   ASSERT_TRUE(!!strstr(output, "UNFREED MEMORY"));
   if (IsAsan()) {
@@ -207,7 +207,7 @@ TEST(ShowCrashReports, testDivideByZero) {
   }
   close(fds[0]);
   ASSERT_NE(-1, wait(&ws));
-  // tinyprint(2, _gc(IndentLines(output, -1, 0, 4)), "\n", NULL);
+  // tinyprint(2, gc(IndentLines(output, -1, 0, 4)), "\n", NULL);
   if (IsModeDbg()) {
     EXPECT_EQ(77 << 8, ws);
   } else {
@@ -222,32 +222,32 @@ TEST(ShowCrashReports, testDivideByZero) {
     // UBSAN handled it
   } else {
     // ShowCrashReports() handled it
-    if (!strstr(output, _gc(xasprintf("%d", pid)))) {
+    if (!strstr(output, gc(xasprintf("%d", pid)))) {
       fprintf(stderr, "ERROR: crash report didn't have pid\n%s\n",
-              _gc(IndentLines(output, -1, 0, 4)));
+              gc(IndentLines(output, -1, 0, 4)));
       __die();
     }
     if (!strstr(output, "SIGFPE")) {
       fprintf(stderr, "ERROR: crash report didn't have signal name\n%s\n",
-              _gc(IndentLines(output, -1, 0, 4)));
+              gc(IndentLines(output, -1, 0, 4)));
       __die();
     }
     // XXX: WSL doesn't save and restore x87 registers to ucontext_t
     if (!__iswsl1()) {
       if (!strstr(output, "3.141")) {
         fprintf(stderr, "ERROR: crash report didn't have fpu register\n%s\n",
-                _gc(IndentLines(output, -1, 0, 4)));
+                gc(IndentLines(output, -1, 0, 4)));
         __die();
       }
     }
     if (!strstr(output, "0f0e0d0c0b0a09080706050403020100")) {
       fprintf(stderr, "ERROR: crash report didn't have sse register\n%s\n",
-              _gc(IndentLines(output, -1, 0, 4)));
+              gc(IndentLines(output, -1, 0, 4)));
       __die();
     }
     if (!strstr(output, "3133731337")) {
       fprintf(stderr, "ERROR: crash report didn't have general register\n%s\n",
-              _gc(IndentLines(output, -1, 0, 4)));
+              gc(IndentLines(output, -1, 0, 4)));
       __die();
     }
   }
@@ -332,7 +332,7 @@ TEST(ShowCrashReports, testBssOverrunCrash) {
   }
   close(fds[0]);
   ASSERT_NE(-1, wait(&ws));
-  // tinyprint(2, _gc(IndentLines(output, -1, 0, 4)), "\n", NULL);
+  // tinyprint(2, gc(IndentLines(output, -1, 0, 4)), "\n", NULL);
   EXPECT_EQ(77 << 8, ws);
   /* NULL is stopgap until we can copy symbol tablces into binary */
 #ifdef __FNO_OMIT_FRAME_POINTER__
@@ -407,7 +407,7 @@ TEST(ShowCrashReports, testNpeCrash) {
   }
   close(fds[0]);
   ASSERT_NE(-1, wait(&ws));
-  // tinyprint(2, _gc(IndentLines(output, -1, 0, 4)), "\n", NULL);
+  // tinyprint(2, gc(IndentLines(output, -1, 0, 4)), "\n", NULL);
   EXPECT_EQ(77 << 8, ws);
   /* NULL is stopgap until we can copy symbol tables into binary */
   ASSERT_TRUE(!!strstr(output, "null pointer"));
@@ -451,7 +451,7 @@ TEST(ShowCrashReports, testDataOverrunCrash) {
   }
   close(fds[0]);
   ASSERT_NE(-1, wait(&ws));
-  // tinyprint(2, _gc(IndentLines(output, -1, 0, 4)), "\n", NULL);
+  // tinyprint(2, gc(IndentLines(output, -1, 0, 4)), "\n", NULL);
   EXPECT_EQ(77 << 8, ws);
   /* NULL is stopgap until we can copy symbol tablces into binary */
 #ifdef __FNO_OMIT_FRAME_POINTER__
@@ -499,7 +499,7 @@ TEST(ShowCrashReports, testNpeCrashAfterFinalize) {
   }
   close(fds[0]);
   ASSERT_NE(-1, wait(&ws));
-  // tinyprint(2, _gc(IndentLines(output, -1, 0, 4)), "\n", NULL);
+  // tinyprint(2, gc(IndentLines(output, -1, 0, 4)), "\n", NULL);
   if (IsModeDbg()) {
     EXPECT_EQ(77 << 8, ws);
   } else {
@@ -509,13 +509,13 @@ TEST(ShowCrashReports, testNpeCrashAfterFinalize) {
   /* NULL is stopgap until we can copy symbol tables into binary */
   if (!strstr(output, IsAsan() ? "null pointer" : "Uncaught SIGSEGV (SEGV_")) {
     fprintf(stderr, "ERROR: crash report didn't diagnose the problem\n%s\n",
-            _gc(IndentLines(output, -1, 0, 4)));
+            gc(IndentLines(output, -1, 0, 4)));
     __die();
   }
 #ifdef __FNO_OMIT_FRAME_POINTER__
   if (!OutputHasSymbol(output, "NpeCrash")) {
     fprintf(stderr, "ERROR: crash report didn't have backtrace\n%s\n",
-            _gc(IndentLines(output, -1, 0, 4)));
+            gc(IndentLines(output, -1, 0, 4)));
     __die();
   }
 #endif

test/libc/mem/djbsort_test.c

@@ -54,9 +54,9 @@ void insertionsort(int32_t *a, size_t n) {
 TEST(djbsort, test4) {
   static const int kA[] = {4, 3, 2, 1};
   n = ARRAYLEN(kA);
-  a = memcpy(_gc(malloc(n * 4)), kA, n * 4);
-  b = memcpy(_gc(malloc(n * 4)), kA, n * 4);
-  c = memcpy(_gc(malloc(n * 4)), kA, n * 4);
+  a = memcpy(gc(malloc(n * 4)), kA, n * 4);
+  b = memcpy(gc(malloc(n * 4)), kA, n * 4);
+  c = memcpy(gc(malloc(n * 4)), kA, n * 4);
   insertionsort(a, n);
   djbsort_avx2(b, n);
   djbsort(c, n);
@@ -82,9 +82,9 @@ TEST(djbsort, test64) {
       -1323943608, -1219421355, -582289873,  1062699814,
   };
   n = ARRAYLEN(kA);
-  a = memcpy(_gc(malloc(n * 4)), kA, n * 4);
-  b = memcpy(_gc(malloc(n * 4)), kA, n * 4);
-  c = memcpy(_gc(malloc(n * 4)), kA, n * 4);
+  a = memcpy(gc(malloc(n * 4)), kA, n * 4);
+  b = memcpy(gc(malloc(n * 4)), kA, n * 4);
+  c = memcpy(gc(malloc(n * 4)), kA, n * 4);
   insertionsort(a, n);
   djbsort(c, n);
   ASSERT_EQ(0, memcmp(a, c, n * 4));
@@ -104,7 +104,7 @@ static int CompareInt(const void *a, const void *b) {
 
 BENCH(djbsort, bench) {
   n = 256;
-  a = _gc(memalign(32, n * 4));
+  a = gc(memalign(32, n * 4));
   EZBENCH2("insertionsort[255]", rngset(a, n * 4, _rand64, -1),
            insertionsort(a, n));
   EZBENCH2("djbsort[255]", rngset(a, n * 4, _rand64, -1), djbsort(a, n));

test/libc/mem/malloc_test.c

@@ -26,7 +26,7 @@
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/gc.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/internal.h"
 #include "libc/runtime/memtrack.internal.h"
@@ -210,7 +210,7 @@ void *Worker(void *arg) {
 
 BENCH(malloc, torture) {
   int i, n = __get_cpu_count() * 2;
-  pthread_t *t = _gc(malloc(sizeof(pthread_t) * n));
+  pthread_t *t = gc(malloc(sizeof(pthread_t) * n));
   if (!n) return;
   printf("\nmalloc torture test w/ %d threads and %d iterations\n", n,
          ITERATIONS);

test/libc/mem/qsort_test.c

@@ -19,7 +19,7 @@
 #include "libc/macros.internal.h"
 #include "libc/mem/alg.h"
 #include "libc/mem/gc.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/rand.h"

test/libc/mem/realpath_test.c

@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"

test/libc/nexgen32e/gclongjmp_test.c

@@ -18,9 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/log/log.h"
 #include "libc/mem/gc.h"
-#include "libc/mem/gc.internal.h"
 #include "libc/mem/mem.h"
-#include "libc/nexgen32e/gc.internal.h"
 #include "libc/nexgen32e/nexgen32e.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
@@ -32,7 +30,7 @@
 #ifdef __x86_64__
 // TODO(jart): get gclongjmp() working properly on aarch64
 
-#define GC(x) _defer(Free, x)
+#define GC(x) defer(Free, x)
 
 char *x;
 char *y;
@@ -83,7 +81,7 @@ TEST(gclongjmp, test) {
 
 void crawl(const char *path) {
   if (!strcmp(path, "/") || !strcmp(path, ".")) return;
-  crawl(_gc(xdirname(path)));
+  crawl(gc(xdirname(path)));
 }
 
 void *Worker(void *arg) {
@@ -99,8 +97,8 @@ TEST(gc, torture) {
 }
 
 void crawl2(jmp_buf jb, const char *path) {
-  if (!strcmp(path, "/") || !strcmp(path, ".")) _gclongjmp(jb, 1);
-  crawl2(jb, _gc(xdirname(path)));
+  if (!strcmp(path, "/") || !strcmp(path, ".")) gclongjmp(jb, 1);
+  crawl2(jb, gc(xdirname(path)));
 }
 
 void *Worker2(void *arg) {
@@ -111,7 +109,7 @@ void *Worker2(void *arg) {
   return 0;
 }
 
-TEST(_gclongjmp, torture) {
+TEST(gclongjmp, torture) {
   int i, n = 32;
   pthread_t *t = gc(malloc(sizeof(pthread_t) * n));
   for (i = 0; i < n; ++i) {

test/libc/nexgen32e/lz4decode_test.c

@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/log/check.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/kompressor.h"
 #include "libc/nexgen32e/lz4.h"

test/libc/nexgen32e/memset_test.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/nexgen32e.h"
 #include "libc/testlib/testlib.h"

test/libc/nexgen32e/strsak32_test.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/nexgen32e.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/str/str.h"
 #include "libc/testlib/ezbench.h"
 #include "libc/testlib/hyperion.h"

test/libc/proc/posix_spawn_test.c

@@ -36,7 +36,7 @@
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/limits.h"
 #include "libc/mem/gc.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/proc/proc.internal.h"
 #include "libc/runtime/internal.h"
@@ -245,7 +245,7 @@ void *Torturer(void *arg) {
 
 TEST(posix_spawn, agony) {
   int i, n = 4;
-  pthread_t *t = _gc(malloc(sizeof(pthread_t) * n));
+  pthread_t *t = gc(malloc(sizeof(pthread_t) * n));
   testlib_extract("/zip/echo.com", "echo.com", 0755);
   for (i = 0; i < n; ++i) {
     ASSERT_EQ(0, pthread_create(t + i, 0, Torturer, 0));

test/libc/proc/system_test.c

@@ -21,7 +21,7 @@
 #include "libc/dce.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/mem/gc.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/paths.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
@@ -73,7 +73,7 @@ TEST(system, haveShell) {
 
 TEST(system, echo) {
   ASSERT_EQ(0, system("echo hello >\"hello there.txt\""));
-  EXPECT_STREQ("hello\n", _gc(xslurp("hello there.txt", 0)));
+  EXPECT_STREQ("hello\n", gc(xslurp("hello there.txt", 0)));
 }
 
 TEST(system, exit) {
@@ -83,13 +83,13 @@ TEST(system, exit) {
 TEST(system, testStdoutRedirect) {
   testlib_extract("/zip/echo.com", "echo.com", 0755);
   ASSERT_EQ(0, system("./echo.com hello >hello.txt"));
-  EXPECT_STREQ("hello\n", _gc(xslurp("hello.txt", 0)));
+  EXPECT_STREQ("hello\n", gc(xslurp("hello.txt", 0)));
 }
 
 TEST(system, testStdoutRedirect_withSpacesInFilename) {
   testlib_extract("/zip/echo.com", "echo.com", 0755);
   ASSERT_EQ(0, system("./echo.com hello >\"hello there.txt\""));
-  EXPECT_STREQ("hello\n", _gc(xslurp("hello there.txt", 0)));
+  EXPECT_STREQ("hello\n", gc(xslurp("hello there.txt", 0)));
 }
 
 TEST(system, testStderrRedirect_toStdout) {

test/libc/release/BUILD.mk

@@ -33,8 +33,10 @@ o/$(MODE)/test/libc/release/smoke.o:					\
 		-o $@							\
 		-c							\
 		-Os							\
+		-Werror							\
 		-fno-pie						\
 		-nostdinc						\
+		-D_COSMO_SOURCE						\
 		-Wl,--gc-sections					\
 		-fno-omit-frame-pointer					\
 		-include o/cosmopolitan.h				\
@@ -114,10 +116,12 @@ o/$(MODE)/test/libc/release/smoke-chibicc.o:				\
 		-c							\
 		-Os							\
 		-static							\
+		-Werror							\
 		-fno-pie						\
 		-nostdlib						\
 		-nostdinc						\
 		-mno-red-zone						\
+		-D_COSMO_SOURCE						\
 		-fno-omit-frame-pointer					\
 		-include o/cosmopolitan.h				\
 		$<
@@ -188,9 +192,11 @@ o/$(MODE)/test/libc/release/smokeansi.o:				\
 		-c							\
 		-Os							\
 		-ansi							\
+		-Werror							\
 		-static							\
 		-fno-pie						\
 		-nostdinc						\
+		-D_COSMO_SOURCE						\
 		-Wl,--gc-sections					\
 		-fno-omit-frame-pointer					\
 		-include o/cosmopolitan.h				\

test/libc/release/smoke.c

@@ -6,8 +6,8 @@ int main(int argc, char *argv[]) {
   s = strdup(argv[0]);
   s[0] = 'Z';
   f = fopen("/dev/null", "w");
-  fputs(_gc(xiso8601ts(NULL)), f);
-  fputs(_gc(xasprintf("hello world %d %s\n", argc, s)), f);
+  /* fputs(gc(xiso8601ts(NULL)), f); */
+  fputs(gc(xasprintf("hello world %d %s\n", argc, s)), f);
   fclose(f);
   free(s);
   return 0;

test/libc/release/smokecxx.cc

@@ -1,6 +1,4 @@
 int main() {
-  int rc;
-  FILE *f;
   int *x = new int[32];
   x[0] = 2;
   x[1] = 2;

test/libc/runtime/ftrace_test.c

@@ -35,7 +35,7 @@ TEST(ftrace, test) {
   }
   const char *ftraceasm;
   testlib_extract("/zip/ftraceasm.txt", "ftraceasm.txt", 0755);
-  ftraceasm = _gc(xslurp("ftraceasm.txt", 0));
+  ftraceasm = gc(xslurp("ftraceasm.txt", 0));
 #ifdef __x86_64__
   if (strstr(ftraceasm, "%xmm") ||  //
       strstr(ftraceasm, "%ymm") ||  //

test/libc/runtime/mmap_test.c

@@ -236,15 +236,15 @@ TEST(isheap, nullPtr) {
 }
 
 TEST(isheap, malloc) {
-  ASSERT_TRUE(_isheap(_gc(malloc(1))));
+  ASSERT_TRUE(_isheap(gc(malloc(1))));
 }
 
 /* TEST(isheap, emptyMalloc) { */
-/*   ASSERT_TRUE(_isheap(_gc(malloc(0)))); */
+/*   ASSERT_TRUE(_isheap(gc(malloc(0)))); */
 /* } */
 
 /* TEST(isheap, mallocOffset) { */
-/*   char *p = _gc(malloc(131072)); */
+/*   char *p = gc(malloc(131072)); */
 /*   ASSERT_TRUE(_isheap(p + 100000)); */
 /* } */