diff options
| author | ptitSeb <seebastien.chev@gmail.com> | 2023-09-02 14:34:46 +0200 |
|---|---|---|
| committer | ptitSeb <seebastien.chev@gmail.com> | 2023-09-02 14:34:46 +0200 |
| commit | 57d497c801a35f346a8fa804586048400a55acda (patch) | |
| tree | 0b1273942ba8f106cdcae2030afb85771c0931bd /src | |
| parent | eac105fe9e9e4b0d6280fa0cbccc8b3e0918433e (diff) | |
| download | box64-57d497c801a35f346a8fa804586048400a55acda.tar.gz box64-57d497c801a35f346a8fa804586048400a55acda.zip | |
[ANDROID] And yet another attempt to fix the build, patience limit almost reached
Diffstat (limited to 'src')
| -rw-r--r-- | src/dynarec/dynarec.c | 11 | ||||
| -rw-r--r-- | src/elfs/elfloader.c | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/dynarec/dynarec.c b/src/dynarec/dynarec.c index 9416352d..b832b1e5 100644 --- a/src/dynarec/dynarec.c +++ b/src/dynarec/dynarec.c @@ -103,11 +103,7 @@ void DynaCall(x64emu_t* emu, uintptr_t addr) void DynaRun(x64emu_t* emu) { // prepare setjump for signal handling - #ifdef ANDROID - JUMPBUFF jmpbuf = {0}; - #else JUMPBUFF jmpbuf[1] = {0}; - #endif int skip = 0; JUMPBUFF *old_jmpbuf = emu->jmpbuf; emu->flags.jmpbuf_ready = 0; @@ -116,7 +112,12 @@ void DynaRun(x64emu_t* emu) if(!emu->jmpbuf || (emu->flags.need_jmpbuf && emu->jmpbuf!=jmpbuf)) { emu->jmpbuf = jmpbuf; emu->flags.jmpbuf_ready = 1; - if((skip=sigsetjmp(emu->jmpbuf, 1))) { + #ifdef ANDROID + if((skip=sigsetjmp(*(JUMPBUFF*)emu->jmpbuf, 1))) + #else + if((skip=sigsetjmp(emu->jmpbuf, 1))) + #endif + { printf_log(LOG_DEBUG, "Setjmp DynaRun, fs=0x%x\n", emu->segs[_FS]); #ifdef DYNAREC if(box64_dynarec_test) { diff --git a/src/elfs/elfloader.c b/src/elfs/elfloader.c index 6b28ea10..eb571325 100644 --- a/src/elfs/elfloader.c +++ b/src/elfs/elfloader.c @@ -1060,6 +1060,10 @@ uintptr_t GetLastByte(elfheader_t* h) return (uintptr_t)h->memory/* + h->delta*/ + h->memsz; } +#ifndef STB_GNU_UNIQUE +#define STB_GNU_UNIQUE 10 +#endif + void checkHookedSymbols(elfheader_t* h); // in mallochook.c void AddSymbols(lib_t *maplib, kh_mapsymbols_t* mapsymbols, kh_mapsymbols_t* weaksymbols, kh_mapsymbols_t* localsymbols, elfheader_t* h) { |