diff --git a/libc/integral/normalize.inc b/libc/integral/normalize.inc index ea2cd4328cc..de1e3a5b713 100644 --- a/libc/integral/normalize.inc +++ b/libc/integral/normalize.inc @@ -4,7 +4,7 @@ #define __COSMOPOLITAN_MAJOR__ 3 #define __COSMOPOLITAN_MINOR__ 5 -#define __COSMOPOLITAN_PATCH__ 5 +#define __COSMOPOLITAN_PATCH__ 6 #define __COSMOPOLITAN__ \ (100000000 * __COSMOPOLITAN_MAJOR__ + 1000000 * __COSMOPOLITAN_MINOR__ + \ __COSMOPOLITAN_PATCH__) diff --git a/libc/intrin/mmap.c b/libc/intrin/mmap.c index 72ebda76653..4f6e905569e 100644 --- a/libc/intrin/mmap.c +++ b/libc/intrin/mmap.c @@ -146,9 +146,7 @@ static int __muntrack(char *addr, size_t size, int pagesz, __maps.count -= 1; __maps_check(); } else if (IsWindows()) { - // you can't carve up memory maps on windows. our mmap() makes - // this not a problem (for non-enormous memory maps) by making - // independent mappings for each 64 kb granule, under the hood + // you can't carve up memory maps on windows ;_; rc = einval(); } else if (addr <= map_addr) { // shave off lefthand side of mapping diff --git a/test/libc/calls/sigaltstack_test.c b/test/libc/calls/sigaltstack_test.c index 7efdc7cbd10..c2ed85c42c9 100644 --- a/test/libc/calls/sigaltstack_test.c +++ b/test/libc/calls/sigaltstack_test.c @@ -32,9 +32,8 @@ TEST(sigaltstack, badFlag) { TEST(sigaltstack, disable) { struct sigaltstack ss; + EXPECT_SYS(0, 0, sigaltstack(0, &ss)); ss.ss_flags = SS_DISABLE; - ss.ss_size = 0; - ss.ss_sp = 0; EXPECT_SYS(0, 0, sigaltstack(&ss, 0)); EXPECT_SYS(0, 0, sigaltstack(0, &ss)); EXPECT_EQ(SS_DISABLE, ss.ss_flags); diff --git a/test/libc/intrin/munmap_test.c b/test/libc/intrin/munmap_test.c index 716c717ee07..a664ef520a4 100644 --- a/test/libc/intrin/munmap_test.c +++ b/test/libc/intrin/munmap_test.c @@ -183,7 +183,9 @@ TEST(munmap, tinyFile_preciseUnmapSize) { // clang-format off TEST(munmap, tinyFile_mapThriceUnmapOnce) { - char *p = __maps_randaddr(); + char *p; + ASSERT_NE(MAP_FAILED, (p = mmap(0, gransz*4, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0))); + ASSERT_SYS(0, 0, munmap(p, gransz*4)); ASSERT_SYS(0, 3, open("doge", O_RDWR | O_CREAT | O_TRUNC, 0644)); ASSERT_SYS (0, 5, write(3, "hello", 5)); ASSERT_EQ(p+gransz*0, mmap(p+gransz*0, gransz, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0));