diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2021-03-25 20:56:45 +0100 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2021-03-25 20:56:45 +0100 |
| commit | 235784b46f47411b73d383c4fb462c3ffac323a4 (patch) | |
| tree | d24269356747e3799f80b59038bebe7c6c1b2c13 /src/wrapped/wrappedldlinux.c | |
| parent | 66af0f810cef61adc8cf4eff2a24132259aae0da (diff) | |
| download | box64-235784b46f47411b73d383c4fb462c3ffac323a4.tar.gz box64-235784b46f47411b73d383c4fb462c3ffac323a4.zip | |
Added wrapped libfontconfig and libfreetype, plus some elfloader/tls bugfix
Diffstat (limited to 'src/wrapped/wrappedldlinux.c')
| -rwxr-xr-x | src/wrapped/wrappedldlinux.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/wrapped/wrappedldlinux.c b/src/wrapped/wrappedldlinux.c index 002a426f..eaea93d8 100755 --- a/src/wrapped/wrappedldlinux.c +++ b/src/wrapped/wrappedldlinux.c @@ -16,8 +16,8 @@ #include "box64context.h" typedef struct my_tls_s { - int i; - uint32_t o; + unsigned long int i; + unsigned long int o; } my_tls_t; EXPORT void* my___tls_get_addr(x64emu_t* emu, void* p) @@ -26,13 +26,6 @@ EXPORT void* my___tls_get_addr(x64emu_t* emu, void* p) return GetDTatOffset(emu->context, t->i, t->o); } -EXPORT void* my____tls_get_addr(x64emu_t* emu) -{ - // the GNU version (with 3 '_') use register for the parameter! - my_tls_t *t = (my_tls_t*)R_RAX; - return GetDTatOffset(emu->context, t->i, t->o); -} - // don't try to load the actual ld-linux (because name is variable), just use box64 itself, as it's linked to ld-linux const char* ldlinuxName = "ld-linux.so.2"; #define LIBNAME ldlinux |