Fix build/test breakage caused by last commit
parent
c45e46f871
commit
680daf1210
|
@ -35,7 +35,7 @@ forcealignargpointer unsigned(getutf16)(const char16_t *p, wint_t *wc) {
|
|||
if (IsUcs2(p[skip])) {
|
||||
*wc = p[skip];
|
||||
return skip + 1;
|
||||
} else if (IsUtf16Cont(p[skip + 1])) {
|
||||
} else if (!IsUtf16Cont(p[skip + 1])) {
|
||||
*wc = INVALID_CODEPOINT;
|
||||
return -1;
|
||||
} else {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#define UTF16_CONT 0xdc00 /* 0xDC00..0xDBFF */
|
||||
|
||||
#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)
|
||||
|
||||
#endif /* COSMOPOLITAN_LIBC_STR_UTF16_H_ */
|
||||
|
|
|
@ -33,6 +33,7 @@ NET_HTTP_A_DIRECTDEPS = \
|
|||
LIBC_CONV \
|
||||
LIBC_FMT \
|
||||
LIBC_LOG \
|
||||
LIBC_LOG_ASAN \
|
||||
LIBC_NEXGEN32E \
|
||||
LIBC_RUNTIME \
|
||||
LIBC_SOCK \
|
||||
|
|
|
@ -26,6 +26,8 @@ TEST_LIBC_FMT_DIRECTDEPS = \
|
|||
LIBC_MEM \
|
||||
LIBC_NEXGEN32E \
|
||||
LIBC_RUNTIME \
|
||||
LIBC_LOG \
|
||||
LIBC_LOG_ASAN \
|
||||
LIBC_STDIO \
|
||||
LIBC_STR \
|
||||
LIBC_STUBS \
|
||||
|
|
|
@ -35,6 +35,7 @@ TEST_LIBC_RUNTIME_DIRECTDEPS = \
|
|||
LIBC_RUNTIME \
|
||||
LIBC_STDIO \
|
||||
LIBC_LOG \
|
||||
LIBC_LOG_ASAN \
|
||||
LIBC_STR \
|
||||
LIBC_STUBS \
|
||||
LIBC_SYSV \
|
||||
|
@ -62,6 +63,12 @@ $(TEST_LIBC_RUNTIME_OBJS): \
|
|||
DEFAULT_CCFLAGS += \
|
||||
-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
|
||||
@HELLO=THERE build/runit $@ $<
|
||||
|
|
|
@ -57,12 +57,6 @@ o/$(MODE)/third_party/zlib/adler32.o: \
|
|||
-ffunction-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_SRCS = $(foreach x,$(THIRD_PARTY_ZLIB_ARTIFACTS),$($(x)_SRCS))
|
||||
THIRD_PARTY_ZLIB_HDRS = $(foreach x,$(THIRD_PARTY_ZLIB_ARTIFACTS),$($(x)_HDRS))
|
||||
|
|
|
@ -70,6 +70,5 @@ o/$(MODE)/tool/tags/%.com.dbg: \
|
|||
@$(APELINK)
|
||||
|
||||
.PHONY: o/$(MODE)/tool/tags
|
||||
o/$(MODE)/tool/tags: \
|
||||
$(TOOL_TAGS_BINS) \
|
||||
$(TOOL_TAGS_CHECKS)
|
||||
o/$(MODE)/tool/tags:
|
||||
# TODO: Why isn't tags.h.inc being generated?
|
||||
|
|
Loading…
Reference in New Issue