From cb19e172da4072f531e86bdcc4d401bde311e612 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jtunney@gmail.com>
Date: Mon, 8 Jan 2024 14:23:43 -0800
Subject: [PATCH] Release Cosmopolitan v3.2.4

---
 .gitignore                          | 1 +
 Makefile                            | 6 ++++--
 libc/integral/normalize.inc         | 2 +-
 third_party/libcxxabi/test/BUILD.mk | 3 +--
 third_party/python/BUILD.mk         | 4 +++-
 tool/cosmocc/package.sh             | 4 ++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 84e967f07..4c767cd51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # -*- conf -*-
 
 /o
+/cosmocc
 /.cosmocc
 
 # TODO: Find some way to have Python write to o/
diff --git a/Makefile b/Makefile
index 077efad18..6e6897e26 100644
--- a/Makefile
+++ b/Makefile
@@ -514,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:		\
@@ -550,9 +552,9 @@ 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 /,_,$@)
diff --git a/libc/integral/normalize.inc b/libc/integral/normalize.inc
index 4fc7fca3e..e9cba82d8 100644
--- a/libc/integral/normalize.inc
+++ b/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__)
diff --git a/third_party/libcxxabi/test/BUILD.mk b/third_party/libcxxabi/test/BUILD.mk
index 315838206..8bfd39d40 100644
--- a/third_party/libcxxabi/test/BUILD.mk
+++ b/third_party/libcxxabi/test/BUILD.mk
@@ -39,7 +39,6 @@ THIRD_PARTY_LIBCXXABI_TEST_SRCS =					\
 	third_party/libcxxabi/test/exception_object_alignment.pass.cc	\
 	third_party/libcxxabi/test/exception_object_alignment.2.pass.cc	\
 	third_party/libcxxabi/test/guard_test_basic.pass.cc		\
-	third_party/libcxxabi/test/catch_multi_level_pointer.pass.cc	\
 	third_party/libcxxabi/test/incomplete_type.sh.cc		\
 	third_party/libcxxabi/test/inherited_exception.pass.cc		\
 	third_party/libcxxabi/test/test_aux_runtime.pass.cc		\
@@ -63,9 +62,9 @@ THIRD_PARTY_LIBCXXABI_TEST_SRCS =					\
 	third_party/libcxxabi/test/unwind_05.pass.cc			\
 	third_party/libcxxabi/test/unwind_06.pass.cc
 
-# TODO: Maybe LLVM needs to finish the code that lets us use NSYNC futexes?
 THIRD_PARTY_LIBCXXABI_TEST_SRCS_TOOSLOW_COSMO =				\
 	third_party/libcxxabi/test/guard_threaded_test.pass.cc		\
+	third_party/libcxxabi/test/catch_multi_level_pointer.pass.cc
 
 THIRD_PARTY_LIBCXXABI_TEST_SRCS_FAILING_GCC =				\
 	third_party/libcxxabi/test/catch_array_01.pass.cc		\
diff --git a/third_party/python/BUILD.mk b/third_party/python/BUILD.mk
index bd57293b1..479368dc7 100644
--- a/third_party/python/BUILD.mk
+++ b/third_party/python/BUILD.mk
@@ -1928,7 +1928,6 @@ THIRD_PARTY_PYTHON_PYTEST_PYMAINS =						\
 	third_party/python/Lib/test/test_pprint.py				\
 	third_party/python/Lib/test/test_print.py				\
 	third_party/python/Lib/test/test_thread.py				\
-	third_party/python/Lib/test/test_threadsignals.py			\
 	third_party/python/Lib/test/test_profile.py				\
 	third_party/python/Lib/test/test_property.py				\
 	third_party/python/Lib/test/test_pstats.py				\
@@ -2018,6 +2017,9 @@ THIRD_PARTY_PYTHON_PYTEST_PYMAINS =						\
 # TODO: test_threading passing probably requires more mutexes in libc/calls/
 # TODO: test_sys is potentially flaky now that we have threads
 
+THIRD_PARTY_PYTHON_PYTEST_TOOSLOW =						\
+	third_party/python/Lib/test/test_threadsignals.py
+
 THIRD_PARTY_PYTHON_PYTEST_TODOS =						\
 	third_party/python/Lib/test/test_sys.py					\
 	third_party/python/Lib/test/test_threading.py				\
diff --git a/tool/cosmocc/package.sh b/tool/cosmocc/package.sh
index 42a3a1b9a..5b9ef866e 100755
--- a/tool/cosmocc/package.sh
+++ b/tool/cosmocc/package.sh
@@ -2,7 +2,7 @@
 # cosmopolitan toolchain packager
 #
 #     tool/cosmocc/package.sh
-#     cd cosmocc/latest
+#     cd cosmocc
 #     zip -ry9 ../cosmocc.zip .
 #
 
@@ -15,7 +15,7 @@ mode() {
   esac
 }
 
-OUTDIR=${1:-cosmocc/latest}
+OUTDIR=${1:-cosmocc}
 APELINK=o/$(mode)/tool/build/apelink.com
 AMD64=${2:-x86_64}
 ARM64=${3:-aarch64}