Skip to content

Commit 3374cbb

Browse files
committed
Release Cosmopolitan v3.5.6
1 parent 2018cac commit 3374cbb

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

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__ 5
7-
#define __COSMOPOLITAN_PATCH__ 5
7+
#define __COSMOPOLITAN_PATCH__ 6
88
#define __COSMOPOLITAN__ \
99
(100000000 * __COSMOPOLITAN_MAJOR__ + 1000000 * __COSMOPOLITAN_MINOR__ + \
1010
__COSMOPOLITAN_PATCH__)

libc/intrin/mmap.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,7 @@ static int __muntrack(char *addr, size_t size, int pagesz,
146146
__maps.count -= 1;
147147
__maps_check();
148148
} else if (IsWindows()) {
149-
// you can't carve up memory maps on windows. our mmap() makes
150-
// this not a problem (for non-enormous memory maps) by making
151-
// independent mappings for each 64 kb granule, under the hood
149+
// you can't carve up memory maps on windows ;_;
152150
rc = einval();
153151
} else if (addr <= map_addr) {
154152
// shave off lefthand side of mapping

test/libc/calls/sigaltstack_test.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ TEST(sigaltstack, badFlag) {
3232

3333
TEST(sigaltstack, disable) {
3434
struct sigaltstack ss;
35+
EXPECT_SYS(0, 0, sigaltstack(0, &ss));
3536
ss.ss_flags = SS_DISABLE;
36-
ss.ss_size = 0;
37-
ss.ss_sp = 0;
3837
EXPECT_SYS(0, 0, sigaltstack(&ss, 0));
3938
EXPECT_SYS(0, 0, sigaltstack(0, &ss));
4039
EXPECT_EQ(SS_DISABLE, ss.ss_flags);

test/libc/intrin/munmap_test.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,9 @@ TEST(munmap, tinyFile_preciseUnmapSize) {
183183

184184
// clang-format off
185185
TEST(munmap, tinyFile_mapThriceUnmapOnce) {
186-
char *p = __maps_randaddr();
186+
char *p;
187+
ASSERT_NE(MAP_FAILED, (p = mmap(0, gransz*4, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)));
188+
ASSERT_SYS(0, 0, munmap(p, gransz*4));
187189
ASSERT_SYS(0, 3, open("doge", O_RDWR | O_CREAT | O_TRUNC, 0644));
188190
ASSERT_SYS (0, 5, write(3, "hello", 5));
189191
ASSERT_EQ(p+gransz*0, mmap(p+gransz*0, gransz, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0));

0 commit comments

Comments
 (0)