Skip to content

Commit

Permalink
Release Cosmopolitan v3.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
jart committed Jan 9, 2024
1 parent df648fb commit cb19e17
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- conf -*-

/o
/cosmocc
/.cosmocc

# TODO: Find some way to have Python write to o/
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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: \
Expand Down Expand Up @@ -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 /,_,$@)
Expand Down
2 changes: 1 addition & 1 deletion libc/integral/normalize.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
3 changes: 1 addition & 2 deletions third_party/libcxxabi/test/BUILD.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
4 changes: 3 additions & 1 deletion third_party/python/BUILD.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions tool/cosmocc/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# cosmopolitan toolchain packager
#
# tool/cosmocc/package.sh
# cd cosmocc/latest
# cd cosmocc
# zip -ry9 ../cosmocc.zip .
#

Expand All @@ -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}
Expand Down

0 comments on commit cb19e17

Please sign in to comment.