From e43f5af7ce8bc242313ec65d93a50100f36cfebb Mon Sep 17 00:00:00 2001 From: midipix Date: Mon, 15 Feb 2016 13:38:38 -0500 Subject: rename __libc_entry_point _dlstart, match musl's dynamic loader entry routine. --- arch/nt32/src/_dlstart.c | 10 ++++++++++ arch/nt32/src/libc_entry_point.c | 10 ---------- arch/nt64/src/_dlstart.c | 10 ++++++++++ arch/nt64/src/libc_entry_point.c | 10 ---------- musl.lzy | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 arch/nt32/src/_dlstart.c delete mode 100644 arch/nt32/src/libc_entry_point.c create mode 100644 arch/nt64/src/_dlstart.c delete mode 100644 arch/nt64/src/libc_entry_point.c diff --git a/arch/nt32/src/_dlstart.c b/arch/nt32/src/_dlstart.c new file mode 100644 index 0000000..2cfbcbf --- /dev/null +++ b/arch/nt32/src/_dlstart.c @@ -0,0 +1,10 @@ +typedef unsigned int uint32_t; + +int dlstart( + void * hinstance, + uint32_t reason, + void * reserved) +{ + return 1; +} + diff --git a/arch/nt32/src/libc_entry_point.c b/arch/nt32/src/libc_entry_point.c deleted file mode 100644 index 0929cc4..0000000 --- a/arch/nt32/src/libc_entry_point.c +++ /dev/null @@ -1,10 +0,0 @@ -typedef unsigned int uint32_t; - -int __libc_entry_point( - void * hinstance, - uint32_t reason, - void * reserved) -{ - return 1; -} - diff --git a/arch/nt64/src/_dlstart.c b/arch/nt64/src/_dlstart.c new file mode 100644 index 0000000..40498da --- /dev/null +++ b/arch/nt64/src/_dlstart.c @@ -0,0 +1,10 @@ +typedef unsigned int uint32_t; + +int _dlstart( + void * hinstance, + uint32_t reason, + void * reserved) +{ + return 1; +} + diff --git a/arch/nt64/src/libc_entry_point.c b/arch/nt64/src/libc_entry_point.c deleted file mode 100644 index 0929cc4..0000000 --- a/arch/nt64/src/libc_entry_point.c +++ /dev/null @@ -1,10 +0,0 @@ -typedef unsigned int uint32_t; - -int __libc_entry_point( - void * hinstance, - uint32_t reason, - void * reserved) -{ - return 1; -} - diff --git a/musl.lzy b/musl.lzy index 5ab977e..4f42b77 100644 --- a/musl.lzy +++ b/musl.lzy @@ -22,7 +22,7 @@ lz_project_definitions() musl_cflags_shared="-fPIC" if [ "$lz_pecoff_winnt"x = yesx ]; then - pe_excluded_symbols="__libc_entry_point" + pe_excluded_symbols="_dlstart" pe_excluded_symbols="$pe_excluded_symbols,__syscall_vtbl" pe_excluded_symbols="$pe_excluded_symbols,__ldso_vtbl" pe_excluded_symbols="$pe_excluded_symbols,__psx_vtbl" @@ -31,7 +31,7 @@ lz_project_definitions() pe_excluded_symbols="$pe_excluded_symbols,__vm_lock_impl" pe_excluded_symbols="$pe_excluded_symbols,__vm_unlock_impl" - musl_libc_so_ldflags="-shared -e "$lz_default_underscore"__libc_entry_point \ + musl_libc_so_ldflags="-shared -e _dlstart \ -Bsymbolic-functions \ --subsystem windows \ --output-def $lz_build_dir/lib/libc.so.def \ -- cgit v1.2.3