Lab
/
cosmopolitan
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build/test breakage caused by last commit

main
Justine Tunney 2020-10-06 12:13:15 -07:00
parent c45e46f871
commit 680daf1210
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/str/getutf16.ncabi.c
View File

@ -35,7 +35,7 @@ forcealignargpointer unsigned(getutf16)(const char16_t *p, wint_t *wc) {
if (IsUcs2(p[skip])) { if (IsUcs2(p[skip])) {
*wc = p[skip]; *wc = p[skip];
return skip + 1; return skip + 1;
} else if (IsUtf16Cont(p[skip + 1])) { } else if (!IsUtf16Cont(p[skip + 1])) {
*wc = INVALID_CODEPOINT; *wc = INVALID_CODEPOINT;
return -1; return -1;
} else { } else {

2
libc/str/utf16.h
View File

@ -6,7 +6,7 @@
#define UTF16_CONT 0xdc00 /* 0xDC00..0xDBFF */ #define UTF16_CONT 0xdc00 /* 0xDC00..0xDBFF */
#define IsUcs2(wc) (((wc)&UTF16_MASK) != UTF16_MOAR) #define IsUcs2(wc) (((wc)&UTF16_MASK) != UTF16_MOAR)
#define IsUtf16Cont(wc) (((wc)&UTF16_MASK) != UTF16_MOAR) #define IsUtf16Cont(wc) (((wc)&UTF16_MASK) == UTF16_CONT)
#define MergeUtf16(lo, hi) ((((lo)-0xD800) << 10) + ((hi)-0xDC00) + 0x10000) #define MergeUtf16(lo, hi) ((((lo)-0xD800) << 10) + ((hi)-0xDC00) + 0x10000)
#endif /* COSMOPOLITAN_LIBC_STR_UTF16_H_ */ #endif /* COSMOPOLITAN_LIBC_STR_UTF16_H_ */

1
net/http/http.mk
View File

@ -33,6 +33,7 @@ NET_HTTP_A_DIRECTDEPS = \
LIBC_CONV \ LIBC_CONV \
LIBC_FMT \ LIBC_FMT \
LIBC_LOG \ LIBC_LOG \
LIBC_LOG_ASAN \
LIBC_NEXGEN32E \ LIBC_NEXGEN32E \
LIBC_RUNTIME \ LIBC_RUNTIME \
LIBC_SOCK \ LIBC_SOCK \

2
test/libc/fmt/test.mk
View File

@ -26,6 +26,8 @@ TEST_LIBC_FMT_DIRECTDEPS = \
LIBC_MEM \ LIBC_MEM \
LIBC_NEXGEN32E \ LIBC_NEXGEN32E \
LIBC_RUNTIME \ LIBC_RUNTIME \
LIBC_LOG \
LIBC_LOG_ASAN \
LIBC_STDIO \ LIBC_STDIO \
LIBC_STR \ LIBC_STR \
LIBC_STUBS \ LIBC_STUBS \

7
test/libc/runtime/test.mk
View File

@ -35,6 +35,7 @@ TEST_LIBC_RUNTIME_DIRECTDEPS = \
LIBC_RUNTIME \ LIBC_RUNTIME \
LIBC_STDIO \ LIBC_STDIO \
LIBC_LOG \ LIBC_LOG \
LIBC_LOG_ASAN \
LIBC_STR \ LIBC_STR \
LIBC_STUBS \ LIBC_STUBS \
LIBC_SYSV \ LIBC_SYSV \
@ -62,6 +63,12 @@ $(TEST_LIBC_RUNTIME_OBJS): \
DEFAULT_CCFLAGS += \ DEFAULT_CCFLAGS += \
-fno-builtin -fno-builtin
ifeq (,$(MODE))
$(TEST_LIBC_RUNTIME_OBJS): \
OVERRIDE_CFLAGS += \
-fsanitize=address
endif
o/$(MODE)/test/libc/runtime/getenv_test.com.runs: \ o/$(MODE)/test/libc/runtime/getenv_test.com.runs: \
o/$(MODE)/test/libc/runtime/getenv_test.com o/$(MODE)/test/libc/runtime/getenv_test.com
@HELLO=THERE build/runit $@ $< @HELLO=THERE build/runit $@ $<

6
third_party/zlib/zlib.mk vendored
View File

@ -57,12 +57,6 @@ o/$(MODE)/third_party/zlib/adler32.o: \
-ffunction-sections \ -ffunction-sections \
-fdata-sections -fdata-sections
ifeq (,$(MODE))
$(THIRD_PARTY_ZLIB_A_OBJS): \
OVERRIDE_CFLAGS += \
-fsanitize=address
endif
THIRD_PARTY_ZLIB_LIBS = $(foreach x,$(THIRD_PARTY_ZLIB_ARTIFACTS),$($(x))) THIRD_PARTY_ZLIB_LIBS = $(foreach x,$(THIRD_PARTY_ZLIB_ARTIFACTS),$($(x)))
THIRD_PARTY_ZLIB_SRCS = $(foreach x,$(THIRD_PARTY_ZLIB_ARTIFACTS),$($(x)_SRCS)) THIRD_PARTY_ZLIB_SRCS = $(foreach x,$(THIRD_PARTY_ZLIB_ARTIFACTS),$($(x)_SRCS))
THIRD_PARTY_ZLIB_HDRS = $(foreach x,$(THIRD_PARTY_ZLIB_ARTIFACTS),$($(x)_HDRS)) THIRD_PARTY_ZLIB_HDRS = $(foreach x,$(THIRD_PARTY_ZLIB_ARTIFACTS),$($(x)_HDRS))

5
tool/tags/tags.mk
View File

@ -70,6 +70,5 @@ o/$(MODE)/tool/tags/%.com.dbg: \
@$(APELINK) @$(APELINK)
.PHONY: o/$(MODE)/tool/tags .PHONY: o/$(MODE)/tool/tags
o/$(MODE)/tool/tags: \ o/$(MODE)/tool/tags:
$(TOOL_TAGS_BINS) \ # TODO: Why isn't tags.h.inc being generated?
$(TOOL_TAGS_CHECKS)