Skip to content

Commit cb19e17

Browse files
committed
Release Cosmopolitan v3.2.4
1 parent df648fb commit cb19e17

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -*- conf -*-
22

33
/o
4+
/cosmocc
45
/.cosmocc
56

67
# TODO: Find some way to have Python write to o/

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,12 +514,14 @@ COSMOPOLITAN_H_PKGS = \
514514
THIRD_PARTY_GETOPT \
515515
THIRD_PARTY_MUSL \
516516
THIRD_PARTY_ZLIB \
517+
THIRD_PARTY_ZLIB_GZ \
517518
THIRD_PARTY_REGEX
518519

519520
COSMOCC_PKGS = \
520521
$(COSMOPOLITAN_H_PKGS) \
521522
THIRD_PARTY_AARCH64 \
522523
THIRD_PARTY_LIBCXX \
524+
THIRD_PARTY_LIBCXXABI \
523525
THIRD_PARTY_INTEL
524526

525527
o/$(MODE)/cosmopolitan.a: \
@@ -550,9 +552,9 @@ o/cosmopolitan.html: private .UNSANDBOXED = 1
550552
o/cosmopolitan.html: \
551553
o/$(MODE)/third_party/chibicc/chibicc.com.dbg \
552554
$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS))) \
553-
$(SRCS) \
555+
$(filter-out %.cc,$(SRCS)) \
554556
$(HDRS)
555-
$(file >$(TMPDIR)/$(subst /,_,$@),$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS))))
557+
$(file >$(TMPDIR)/$(subst /,_,$@),$(filter-out %.cc,$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS)))))
556558
o/$(MODE)/third_party/chibicc/chibicc.com.dbg -J \
557559
-fno-common -include libc/integral/normalize.inc -o $@ \
558560
-DCOSMO @$(TMPDIR)/$(subst /,_,$@)

libc/integral/normalize.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#define __COSMOPOLITAN_MAJOR__ 3
66
#define __COSMOPOLITAN_MINOR__ 2
7-
#define __COSMOPOLITAN_PATCH__ 3
7+
#define __COSMOPOLITAN_PATCH__ 4
88
#define __COSMOPOLITAN__ \
99
(100000000 * __COSMOPOLITAN_MAJOR__ + 1000000 * __COSMOPOLITAN_MINOR__ + \
1010
__COSMOPOLITAN_PATCH__)

third_party/libcxxabi/test/BUILD.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ THIRD_PARTY_LIBCXXABI_TEST_SRCS = \
3939
third_party/libcxxabi/test/exception_object_alignment.pass.cc \
4040
third_party/libcxxabi/test/exception_object_alignment.2.pass.cc \
4141
third_party/libcxxabi/test/guard_test_basic.pass.cc \
42-
third_party/libcxxabi/test/catch_multi_level_pointer.pass.cc \
4342
third_party/libcxxabi/test/incomplete_type.sh.cc \
4443
third_party/libcxxabi/test/inherited_exception.pass.cc \
4544
third_party/libcxxabi/test/test_aux_runtime.pass.cc \
@@ -63,9 +62,9 @@ THIRD_PARTY_LIBCXXABI_TEST_SRCS = \
6362
third_party/libcxxabi/test/unwind_05.pass.cc \
6463
third_party/libcxxabi/test/unwind_06.pass.cc
6564

66-
# TODO: Maybe LLVM needs to finish the code that lets us use NSYNC futexes?
6765
THIRD_PARTY_LIBCXXABI_TEST_SRCS_TOOSLOW_COSMO = \
6866
third_party/libcxxabi/test/guard_threaded_test.pass.cc \
67+
third_party/libcxxabi/test/catch_multi_level_pointer.pass.cc
6968

7069
THIRD_PARTY_LIBCXXABI_TEST_SRCS_FAILING_GCC = \
7170
third_party/libcxxabi/test/catch_array_01.pass.cc \

third_party/python/BUILD.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1928,7 +1928,6 @@ THIRD_PARTY_PYTHON_PYTEST_PYMAINS = \
19281928
third_party/python/Lib/test/test_pprint.py \
19291929
third_party/python/Lib/test/test_print.py \
19301930
third_party/python/Lib/test/test_thread.py \
1931-
third_party/python/Lib/test/test_threadsignals.py \
19321931
third_party/python/Lib/test/test_profile.py \
19331932
third_party/python/Lib/test/test_property.py \
19341933
third_party/python/Lib/test/test_pstats.py \
@@ -2018,6 +2017,9 @@ THIRD_PARTY_PYTHON_PYTEST_PYMAINS = \
20182017
# TODO: test_threading passing probably requires more mutexes in libc/calls/
20192018
# TODO: test_sys is potentially flaky now that we have threads
20202019

2020+
THIRD_PARTY_PYTHON_PYTEST_TOOSLOW = \
2021+
third_party/python/Lib/test/test_threadsignals.py
2022+
20212023
THIRD_PARTY_PYTHON_PYTEST_TODOS = \
20222024
third_party/python/Lib/test/test_sys.py \
20232025
third_party/python/Lib/test/test_threading.py \

tool/cosmocc/package.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# cosmopolitan toolchain packager
33
#
44
# tool/cosmocc/package.sh
5-
# cd cosmocc/latest
5+
# cd cosmocc
66
# zip -ry9 ../cosmocc.zip .
77
#
88

@@ -15,7 +15,7 @@ mode() {
1515
esac
1616
}
1717

18-
OUTDIR=${1:-cosmocc/latest}
18+
OUTDIR=${1:-cosmocc}
1919
APELINK=o/$(mode)/tool/build/apelink.com
2020
AMD64=${2:-x86_64}
2121
ARM64=${3:-aarch64}

0 commit comments

Comments
 (0)