mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-06-28 15:28:30 +00:00
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:
Justine Tunney
parent
04f1d89f84
commit
9f68d6eee9
121 changed files with 302 additions and 381 deletions
|
|
@ -32,10 +32,9 @@ LIBC_NT_A_CHECKS = $(patsubst %,o/$(MODE)/%.ok,$(filter %.h,$(LIBC_NT_A_HDRS)))
|
|||
LIBC_NT_ARTIFACTS += LIBC_NT_KERNEL32_A
|
||||
LIBC_NT_KERNEL32 = $(LIBC_NT_KERNEL32_A_DEPS) $(LIBC_NT_KERNEL32_A)
|
||||
LIBC_NT_KERNEL32_A = o/$(MODE)/libc/nt/kernel32.a
|
||||
LIBC_NT_KERNEL32_A_SRCS := $(wildcard libc/nt/kernel32/*.s)
|
||||
LIBC_NT_KERNEL32_A_SRCS := $(wildcard libc/nt/kernel32/*.s) libc/nt/sysv2nt.s
|
||||
LIBC_NT_KERNEL32_A_OBJS = $(LIBC_NT_KERNEL32_A_SRCS:%.s=o/$(MODE)/%.o)
|
||||
LIBC_NT_KERNEL32_A_CHECKS = $(LIBC_NT_KERNEL32_A).pkg
|
||||
LIBC_NT_KERNEL32_A_DIRECTDEPS = LIBC_STUBS
|
||||
LIBC_NT_KERNEL32_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_NT_KERNEL32_A_DIRECTDEPS),$($(x))))
|
||||
|
||||
|
|
@ -56,7 +55,7 @@ LIBC_NT_ADVAPI32_A = o/$(MODE)/libc/nt/advapi32.a
|
|||
LIBC_NT_ADVAPI32_A_SRCS := $(wildcard libc/nt/advapi32/*.s)
|
||||
LIBC_NT_ADVAPI32_A_OBJS = $(LIBC_NT_ADVAPI32_A_SRCS:%.s=o/$(MODE)/%.o)
|
||||
LIBC_NT_ADVAPI32_A_CHECKS = $(LIBC_NT_ADVAPI32_A).pkg
|
||||
LIBC_NT_ADVAPI32_A_DIRECTDEPS = LIBC_STUBS
|
||||
LIBC_NT_ADVAPI32_A_DIRECTDEPS = LIBC_NT_KERNEL32
|
||||
LIBC_NT_ADVAPI32_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_NT_ADVAPI32_A_DIRECTDEPS),$($(x))))
|
||||
|
||||
|
|
@ -77,7 +76,7 @@ LIBC_NT_COMDLG32_A = o/$(MODE)/libc/nt/comdlg32.a
|
|||
LIBC_NT_COMDLG32_A_SRCS := $(wildcard libc/nt/comdlg32/*.s)
|
||||
LIBC_NT_COMDLG32_A_OBJS = $(LIBC_NT_COMDLG32_A_SRCS:%.s=o/$(MODE)/%.o)
|
||||
LIBC_NT_COMDLG32_A_CHECKS = $(LIBC_NT_COMDLG32_A).pkg
|
||||
LIBC_NT_COMDLG32_A_DIRECTDEPS = LIBC_STUBS
|
||||
LIBC_NT_COMDLG32_A_DIRECTDEPS = LIBC_NT_KERNEL32
|
||||
LIBC_NT_COMDLG32_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_NT_COMDLG32_A_DIRECTDEPS),$($(x))))
|
||||
|
||||
|
|
@ -98,7 +97,7 @@ LIBC_NT_GDI32_A = o/$(MODE)/libc/nt/gdi32.a
|
|||
LIBC_NT_GDI32_A_SRCS := $(wildcard libc/nt/gdi32/*.s)
|
||||
LIBC_NT_GDI32_A_OBJS = $(LIBC_NT_GDI32_A_SRCS:%.s=o/$(MODE)/%.o)
|
||||
LIBC_NT_GDI32_A_CHECKS = $(LIBC_NT_GDI32_A).pkg
|
||||
LIBC_NT_GDI32_A_DIRECTDEPS = LIBC_STUBS
|
||||
LIBC_NT_GDI32_A_DIRECTDEPS = LIBC_NT_KERNEL32
|
||||
LIBC_NT_GDI32_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_NT_GDI32_A_DIRECTDEPS),$($(x))))
|
||||
|
||||
|
|
@ -119,7 +118,7 @@ LIBC_NT_KERNELBASE_A = o/$(MODE)/libc/nt/KernelBase.a
|
|||
LIBC_NT_KERNELBASE_A_SRCS := $(wildcard libc/nt/KernelBase/*.s)
|
||||
LIBC_NT_KERNELBASE_A_OBJS = $(LIBC_NT_KERNELBASE_A_SRCS:%.s=o/$(MODE)/%.o)
|
||||
LIBC_NT_KERNELBASE_A_CHECKS = $(LIBC_NT_KERNELBASE_A).pkg
|
||||
LIBC_NT_KERNELBASE_A_DIRECTDEPS = LIBC_STUBS
|
||||
LIBC_NT_KERNELBASE_A_DIRECTDEPS = LIBC_NT_KERNEL32
|
||||
LIBC_NT_KERNELBASE_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_NT_KERNELBASE_A_DIRECTDEPS),$($(x))))
|
||||
|
||||
|
|
@ -144,7 +143,7 @@ LIBC_NT_NTDLL_A_OBJS = \
|
|||
$(LIBC_NT_NTDLL_A_SRCS_A:%.s=o/$(MODE)/%.o) \
|
||||
$(LIBC_NT_NTDLL_A_SRCS_S:%.S=o/$(MODE)/%.o)
|
||||
LIBC_NT_NTDLL_A_CHECKS = $(LIBC_NT_NTDLL_A).pkg
|
||||
LIBC_NT_NTDLL_A_DIRECTDEPS = LIBC_STUBS LIBC_NT_KERNEL32
|
||||
LIBC_NT_NTDLL_A_DIRECTDEPS = LIBC_NT_KERNEL32
|
||||
LIBC_NT_NTDLL_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_NT_NTDLL_A_DIRECTDEPS),$($(x))))
|
||||
|
||||
|
|
@ -177,7 +176,7 @@ LIBC_NT_NETAPI32_A = o/$(MODE)/libc/nt/netapi32.a
|
|||
LIBC_NT_NETAPI32_A_SRCS := $(wildcard libc/nt/netapi32/*.s)
|
||||
LIBC_NT_NETAPI32_A_OBJS = $(LIBC_NT_NETAPI32_A_SRCS:%.s=o/$(MODE)/%.o)
|
||||
LIBC_NT_NETAPI32_A_CHECKS = $(LIBC_NT_NETAPI32_A).pkg
|
||||
LIBC_NT_NETAPI32_A_DIRECTDEPS = LIBC_STUBS
|
||||
LIBC_NT_NETAPI32_A_DIRECTDEPS = LIBC_NT_KERNEL32
|
||||
LIBC_NT_NETAPI32_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_NT_NETAPI32_A_DIRECTDEPS),$($(x))))
|
||||
|
||||
|
|
@ -198,7 +197,7 @@ LIBC_NT_URL_A = o/$(MODE)/libc/nt/url.a
|
|||
LIBC_NT_URL_A_SRCS := $(wildcard libc/nt/url/*.s)
|
||||
LIBC_NT_URL_A_OBJS = $(LIBC_NT_URL_A_SRCS:%.s=o/$(MODE)/%.o)
|
||||
LIBC_NT_URL_A_CHECKS = $(LIBC_NT_URL_A).pkg
|
||||
LIBC_NT_URL_A_DIRECTDEPS = LIBC_STUBS
|
||||
LIBC_NT_URL_A_DIRECTDEPS = LIBC_NT_KERNEL32
|
||||
LIBC_NT_URL_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_NT_URL_A_DIRECTDEPS),$($(x))))
|
||||
|
||||
|
|
@ -219,7 +218,7 @@ LIBC_NT_USER32_A = o/$(MODE)/libc/nt/user32.a
|
|||
LIBC_NT_USER32_A_SRCS := $(wildcard libc/nt/user32/*.s)
|
||||
LIBC_NT_USER32_A_OBJS = $(LIBC_NT_USER32_A_SRCS:%.s=o/$(MODE)/%.o)
|
||||
LIBC_NT_USER32_A_CHECKS = $(LIBC_NT_USER32_A).pkg
|
||||
LIBC_NT_USER32_A_DIRECTDEPS = LIBC_STUBS
|
||||
LIBC_NT_USER32_A_DIRECTDEPS = LIBC_NT_KERNEL32
|
||||
LIBC_NT_USER32_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_NT_USER32_A_DIRECTDEPS),$($(x))))
|
||||
|
||||
|
|
@ -240,7 +239,7 @@ LIBC_NT_WS2_32_A = o/$(MODE)/libc/nt/ws2_32.a
|
|||
LIBC_NT_WS2_32_A_SRCS := $(wildcard libc/nt/ws2_32/*.s)
|
||||
LIBC_NT_WS2_32_A_OBJS = $(LIBC_NT_WS2_32_A_SRCS:%.s=o/$(MODE)/%.o)
|
||||
LIBC_NT_WS2_32_A_CHECKS = $(LIBC_NT_WS2_32_A).pkg
|
||||
LIBC_NT_WS2_32_A_DIRECTDEPS = LIBC_STUBS
|
||||
LIBC_NT_WS2_32_A_DIRECTDEPS = LIBC_NT_KERNEL32
|
||||
LIBC_NT_WS2_32_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_NT_WS2_32_A_DIRECTDEPS),$($(x))))
|
||||
|
||||
|
|
@ -261,7 +260,7 @@ LIBC_NT_MSWSOCK_A = o/$(MODE)/libc/nt/MsWSock.a
|
|||
LIBC_NT_MSWSOCK_A_SRCS := $(wildcard libc/nt/MsWSock/*.s)
|
||||
LIBC_NT_MSWSOCK_A_OBJS = $(LIBC_NT_MSWSOCK_A_SRCS:%.s=o/$(MODE)/%.o)
|
||||
LIBC_NT_MSWSOCK_A_CHECKS = $(LIBC_NT_MSWSOCK_A).pkg
|
||||
LIBC_NT_MSWSOCK_A_DIRECTDEPS = LIBC_STUBS
|
||||
LIBC_NT_MSWSOCK_A_DIRECTDEPS = LIBC_NT_KERNEL32
|
||||
LIBC_NT_MSWSOCK_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_NT_MSWSOCK_A_DIRECTDEPS),$($(x))))
|
||||
|
||||
|
|
@ -282,7 +281,7 @@ LIBC_NT_SHELL32_A = o/$(MODE)/libc/nt/shell32.a
|
|||
LIBC_NT_SHELL32_A_SRCS := $(wildcard libc/nt/shell32/*.s)
|
||||
LIBC_NT_SHELL32_A_OBJS = $(LIBC_NT_SHELL32_A_SRCS:%.s=o/$(MODE)/%.o)
|
||||
LIBC_NT_SHELL32_A_CHECKS = $(LIBC_NT_SHELL32_A).pkg
|
||||
LIBC_NT_SHELL32_A_DIRECTDEPS = LIBC_STUBS
|
||||
LIBC_NT_SHELL32_A_DIRECTDEPS = LIBC_NT_KERNEL32
|
||||
LIBC_NT_SHELL32_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_NT_SHELL32_A_DIRECTDEPS),$($(x))))
|
||||
$(LIBC_NT_SHELL32_A): \
|
||||
|
|
|
|||
78
libc/nt/sysv2nt.s
Normal file
78
libc/nt/sysv2nt.s
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8 -*-│
|
||||
│vi: set et ft=asm ts=8 tw=8 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2020 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
│ Permission to use, copy, modify, and/or distribute this software for │
|
||||
│ any purpose with or without fee is hereby granted, provided that the │
|
||||
│ above copyright notice and this permission notice appear in all copies. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
||||
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
||||
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
||||
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
||||
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
||||
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
||||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
.section .text.windows,"ax",@progbits
|
||||
|
||||
/ Epilogues for calling functions w/ Microsoft x64 convention.
|
||||
/
|
||||
/ @param %rax is address of windows x64 function to call
|
||||
/ @param %rsi is ignored
|
||||
/ @param %rdx,%rcx,%r8,%r9,stack are params (unlimited)
|
||||
/ @param %xmm0,%xmm1,%xmm2 are double params (limited to 3)
|
||||
/ @return is in %rax, %xmm0, or %st
|
||||
/ @note GCC 4.8+ and Clang can avoid this indirection
|
||||
/ @note thunk that jumps here must setup frame
|
||||
/ @note this is so much faster than __nt2sysv()
|
||||
__sysv2nt14:
|
||||
pushq 72(%rbp)
|
||||
pushq 64(%rbp)
|
||||
.type __sysv2nt14,@function
|
||||
.size __sysv2nt14,.-__sysv2nt14
|
||||
.globl __sysv2nt14
|
||||
.hidden __sysv2nt14
|
||||
__sysv2nt12:
|
||||
pushq 56(%rbp)
|
||||
pushq 48(%rbp)
|
||||
.type __sysv2nt12,@function
|
||||
.size __sysv2nt12,.-__sysv2nt12
|
||||
.globl __sysv2nt12
|
||||
.hidden __sysv2nt12
|
||||
__sysv2nt10:
|
||||
pushq 40(%rbp)
|
||||
pushq 32(%rbp)
|
||||
.type __sysv2nt10,@function
|
||||
.size __sysv2nt10,.-__sysv2nt10
|
||||
.globl __sysv2nt10
|
||||
.hidden __sysv2nt10
|
||||
__sysv2nt8:
|
||||
pushq 24(%rbp)
|
||||
pushq 16(%rbp)
|
||||
.type __sysv2nt8,@function
|
||||
.size __sysv2nt8,.-__sysv2nt8
|
||||
.globl __sysv2nt8
|
||||
.hidden __sysv2nt8
|
||||
__sysv2nt6:
|
||||
push %r9
|
||||
push %r8
|
||||
.type __sysv2nt6,@function
|
||||
.size __sysv2nt6,.-__sysv2nt6
|
||||
.globl __sysv2nt6
|
||||
.hidden __sysv2nt6
|
||||
__sysv2nt:
|
||||
mov %rdx,%r8
|
||||
mov %rcx,%r9
|
||||
mov %rdi,%rcx
|
||||
mov %rsi,%rdx
|
||||
sub $32,%rsp
|
||||
call *%rax
|
||||
leave
|
||||
ret
|
||||
.type __sysv2nt,@function
|
||||
.size __sysv2nt,.-__sysv2nt
|
||||
.globl __sysv2nt
|
||||
.hidden __sysv2nt
|
||||
Loading…
Add table
Add a link
Reference in a new issue