From 07b6814a07b3c94bf8b4ba2e2a906175fbf89ffd Mon Sep 17 00:00:00 2001 From: midipix Date: Thu, 31 Jan 2019 19:56:08 +0000 Subject: psxglue.h: update struct __ldso_vtbl (psxscl) to match member names in psxscl. tls: place __copy_tls() and __reset_tls() in designated translation units. --- src/ldso/nt32/dynlink.c | 27 --------------------------- src/ldso/nt64/dynlink.c | 27 --------------------------- 2 files changed, 54 deletions(-) (limited to 'src/ldso') diff --git a/src/ldso/nt32/dynlink.c b/src/ldso/nt32/dynlink.c index 6a4f4df..a585fbb 100644 --- a/src/ldso/nt32/dynlink.c +++ b/src/ldso/nt32/dynlink.c @@ -131,33 +131,6 @@ char * dlerror(void) return __ldso_vtbl->dlerror(); } -void __reset_tls(void) -{ - __ldso_vtbl->reset_tls(); -} - -void *__copy_tls(unsigned char * mem) -{ - /** - * this is always the simple case, since: - * emutls is based on PE named sections; and - * tls allocation and initialization are handled by clone(2) - **/ - - pthread_t td; - uintptr_t addr; - - addr = (uintptr_t)mem; - addr >>= 4; - addr <<= 4; - addr += 16; - - td = (struct __pthread *)addr; - td->dtv = 0; - - return td; -} - weak_alias(__dlsym,dlsym); weak_alias(__dladdr,dladdr); weak_alias(__dlinfo,dlinfo); diff --git a/src/ldso/nt64/dynlink.c b/src/ldso/nt64/dynlink.c index 6a4f4df..a585fbb 100644 --- a/src/ldso/nt64/dynlink.c +++ b/src/ldso/nt64/dynlink.c @@ -131,33 +131,6 @@ char * dlerror(void) return __ldso_vtbl->dlerror(); } -void __reset_tls(void) -{ - __ldso_vtbl->reset_tls(); -} - -void *__copy_tls(unsigned char * mem) -{ - /** - * this is always the simple case, since: - * emutls is based on PE named sections; and - * tls allocation and initialization are handled by clone(2) - **/ - - pthread_t td; - uintptr_t addr; - - addr = (uintptr_t)mem; - addr >>= 4; - addr <<= 4; - addr += 16; - - td = (struct __pthread *)addr; - td->dtv = 0; - - return td; -} - weak_alias(__dlsym,dlsym); weak_alias(__dladdr,dladdr); weak_alias(__dlinfo,dlinfo); -- cgit v1.2.3