diff --git a/third_party/dlmalloc/dlmalloc.c b/third_party/dlmalloc/dlmalloc.c index 7f9f738f8..8af7dcbff 100644 --- a/third_party/dlmalloc/dlmalloc.c +++ b/third_party/dlmalloc/dlmalloc.c @@ -23,7 +23,6 @@ #include "libc/thread/thread.h" #include "libc/thread/tls.h" #include "third_party/dlmalloc/vespene.internal.h" -#include "third_party/nsync/mu.h" // clang-format off #define FOOTERS 0 diff --git a/third_party/dlmalloc/locks.inc b/third_party/dlmalloc/locks.inc index 15313b7b0..801f72346 100644 --- a/third_party/dlmalloc/locks.inc +++ b/third_party/dlmalloc/locks.inc @@ -30,11 +30,7 @@ */ -#ifdef TINY #define MLOCK_T atomic_uint -#else -#define MLOCK_T nsync_mu -#endif static int malloc_wipe(MLOCK_T *lk) { bzero(lk, sizeof(*lk)); @@ -43,23 +39,15 @@ static int malloc_wipe(MLOCK_T *lk) { static int malloc_lock(MLOCK_T *lk) { if (!__threaded) return 0; -#ifdef TINY while (atomic_exchange_explicit(lk, 1, memory_order_acquire)) { pthread_pause_np(); } -#else - nsync_mu_lock(lk); -#endif return 0; } static int malloc_unlock(MLOCK_T *lk) { if (!__threaded) return 0; -#ifdef TINY atomic_store_explicit(lk, 0, memory_order_release); -#else - nsync_mu_unlock(lk); -#endif return 0; } diff --git a/tool/cosmocc/package.sh b/tool/cosmocc/package.sh index 0ce18d5c0..9b1b0bf80 100755 --- a/tool/cosmocc/package.sh +++ b/tool/cosmocc/package.sh @@ -30,6 +30,7 @@ make -j8 m=x86_64 \ o/x86_64/tool/build/fixupobj.com.dbg \ o/x86_64/tool/build/zipcopy.com.dbg \ o/x86_64/tool/build/mkdeps.com.dbg \ + o/x86_64/tool/build/zipobj.com.dbg \ o/x86_64/tool/build/apelink.com.dbg \ o/x86_64/tool/build/pecheck.com.dbg \ o/x86_64/third_party/make/make.com.dbg \ @@ -49,6 +50,7 @@ make -j8 m=aarch64 \ o/aarch64/tool/build/fixupobj.com.dbg \ o/aarch64/tool/build/zipcopy.com.dbg \ o/aarch64/tool/build/mkdeps.com.dbg \ + o/aarch64/tool/build/zipobj.com.dbg \ o/aarch64/tool/build/apelink.com.dbg \ o/aarch64/tool/build/pecheck.com.dbg \ o/aarch64/third_party/make/make.com.dbg \ @@ -114,7 +116,7 @@ cp -af tool/cosmocc/bin/* "$OUTDIR/bin/" cp -f o/x86_64/ape/ape.elf "$OUTDIR/bin/" cp -f o/x86_64/ape/ape.macho "$OUTDIR/bin/" cp -f o/aarch64/ape/ape.elf "$OUTDIR/bin/ape.aarch64" -for x in assimilate march-native mktemper fixupobj zipcopy apelink pecheck mkdeps; do +for x in assimilate march-native mktemper fixupobj zipcopy apelink pecheck mkdeps zipobj; do o//tool/build/apelink.com \ -l o/x86_64/ape/ape.elf \ -l o/aarch64/ape/ape.elf \