Fix link order in cosmopolitan.a
It turned out that the linker was doing the wrong with the amalgamation library concerning weak stubs. A regression test has been added and new binaries have been uploaded to https://justine.lol/cosmopolitan/ Ideally this should be fixed by building a tool that turns multiple .a files into a single .a file with deduplication. As a workaround for now the cosmopolitan.a build is restructured to not include LIBC_STUBS which meant technical debt needed to be paid off where non-stub interfaces were moved to LIBC_INTRIN and LIBC_NEXGEN32E. Thank @PerfectProductions in #31 for the report!
This commit is contained in:
@@ -20,7 +20,6 @@ TOOL_VIZ_LIB_A_SRCS = \
|
||||
$(TOOL_VIZ_LIB_A_SRCS_C)
|
||||
|
||||
TOOL_VIZ_LIB_A_OBJS = \
|
||||
$(TOOL_VIZ_LIB_A_SRCS:%=o/$(MODE)/%.zip.o) \
|
||||
$(TOOL_VIZ_LIB_A_SRCS_S:%.S=o/$(MODE)/%.o) \
|
||||
$(TOOL_VIZ_LIB_A_SRCS_C:%.c=o/$(MODE)/%.o)
|
||||
|
||||
@@ -46,8 +45,8 @@ TOOL_VIZ_LIB_A_DIRECTDEPS = \
|
||||
LIBC_TINYMATH \
|
||||
LIBC_UNICODE \
|
||||
LIBC_X \
|
||||
THIRD_PARTY_GDTOA \
|
||||
THIRD_PARTY_DLMALLOC
|
||||
THIRD_PARTY_DLMALLOC \
|
||||
THIRD_PARTY_GDTOA
|
||||
|
||||
TOOL_VIZ_LIB_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(TOOL_VIZ_LIB_A_DIRECTDEPS),$($(x))))
|
||||
|
||||
@@ -6,7 +6,6 @@ PKGS += TOOL_VIZ
|
||||
TOOL_VIZ_SRCS := $(wildcard tool/viz/*.c)
|
||||
|
||||
TOOL_VIZ_OBJS = \
|
||||
$(TOOL_VIZ_SRCS:%=o/$(MODE)/%.zip.o) \
|
||||
$(TOOL_VIZ_SRCS:%.c=o/$(MODE)/%.o)
|
||||
|
||||
TOOL_VIZ_COMS = \
|
||||
@@ -26,6 +25,7 @@ TOOL_VIZ_DIRECTDEPS = \
|
||||
LIBC_CALLS_HEFTY \
|
||||
LIBC_DNS \
|
||||
LIBC_FMT \
|
||||
LIBC_INTRIN \
|
||||
LIBC_LOG \
|
||||
LIBC_MEM \
|
||||
LIBC_NEXGEN32E \
|
||||
@@ -52,9 +52,9 @@ TOOL_VIZ_DIRECTDEPS = \
|
||||
THIRD_PARTY_GETOPT \
|
||||
THIRD_PARTY_STB \
|
||||
THIRD_PARTY_XED \
|
||||
THIRD_PARTY_ZLIB \
|
||||
TOOL_DECODE_LIB \
|
||||
TOOL_VIZ_LIB \
|
||||
THIRD_PARTY_ZLIB
|
||||
TOOL_VIZ_LIB
|
||||
|
||||
TOOL_VIZ_DEPS := \
|
||||
$(call uniq,$(foreach x,$(TOOL_VIZ_DIRECTDEPS),$($(x))))
|
||||
|
||||
Reference in New Issue
Block a user