Delete old wcwidth() implementation

This shaves away 144kb of bss memory from every binary linking printf at the expense of slightly increased binary footprint. Kudos for Byron Lai.
jart · Oct 14, 2023 · a657f3e · a657f3e
1 parent 2db2f40
commit a657f3e
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 814 deletions.
diff --git a/libc/str/kcombiningchars.S b/libc/str/kcombiningchars.S
diff --git a/libc/str/keastasianwidth.S b/libc/str/keastasianwidth.S
diff --git a/libc/str/str.h b/libc/str/str.h
@@ -138,11 +138,6 @@ ssize_t strfmon(char *, size_t, const char *, ...);
 long a64l(const char *);
 char *l64a(long);
 
-char *strntolower(char *, size_t) libcesque;
-char *strtolower(char *) libcesque paramsnonnull();
-char *strntoupper(char *, size_t) libcesque;
-char *strtoupper(char *) libcesque paramsnonnull();
-
 typedef unsigned mbstate_t;
 
 wchar_t *wcsncpy(wchar_t *, const wchar_t *, size_t);

diff --git a/libc/str/str.mk b/libc/str/str.mk
@@ -93,32 +93,6 @@ $(LIBC_STR_A_OBJS): private					\
 			-Wframe-larger-than=4096		\
 			-Walloca-larger-than=4096
 
-o/$(MODE)/libc/str/eastasianwidth.bin:				\
-		libc/str/eastasianwidth.txt			\
-		o/$(MODE)/tool/decode/mkwides.com
-	@$(COMPILE) -AMKWIDES -T$@ o/$(MODE)/tool/decode/mkwides.com -o $@ $<
-o/$(MODE)/libc/str/eastasianwidth.bin.lz4:			\
-		o/$(MODE)/libc/str/eastasianwidth.bin		\
-		o/$(MODE)/third_party/lz4cli/lz4cli.com
-	@$(COMPILE) -ALZ4 -T$@ o/$(MODE)/third_party/lz4cli/lz4cli.com -q -f -9 --content-size $< $@
-o/$(MODE)/libc/str/eastasianwidth.s:				\
-		o/$(MODE)/libc/str/eastasianwidth.bin.lz4	\
-		o/$(MODE)/tool/build/lz4toasm.com
-	@$(COMPILE) -ABIN2ASM -T$@ o/$(MODE)/tool/build/lz4toasm.com -s kEastAsianWidth -o $@ $<
-
-o/$(MODE)/libc/str/combiningchars.bin:				\
-		libc/str/strdata.txt				\
-		o/$(MODE)/tool/decode/mkcombos.com
-	@$(COMPILE) -AMKCOMBOS -T$@ o/$(MODE)/tool/decode/mkcombos.com -o $@ $<
-o/$(MODE)/libc/str/combiningchars.bin.lz4:			\
-		o/$(MODE)/libc/str/combiningchars.bin		\
-		o/$(MODE)/third_party/lz4cli/lz4cli.com
-	@$(COMPILE) -ALZ4 -T$@ o/$(MODE)/third_party/lz4cli/lz4cli.com -q -f -9 --content-size $< $@
-o/$(MODE)/libc/str/combiningchars.s:				\
-		o/$(MODE)/libc/str/combiningchars.bin.lz4	\
-		o/$(MODE)/tool/build/lz4toasm.com
-	@$(COMPILE) -ABIN2ASM -T$@ o/$(MODE)/tool/build/lz4toasm.com -s kCombiningChars -o $@ $<
-
 LIBC_STR_LIBS = $(foreach x,$(LIBC_STR_ARTIFACTS),$($(x)))
 LIBC_STR_SRCS = $(foreach x,$(LIBC_STR_ARTIFACTS),$($(x)_SRCS))
 LIBC_STR_HDRS = $(foreach x,$(LIBC_STR_ARTIFACTS),$($(x)_HDRS))