diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2024-02-26 21:16:06 +0100 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2024-02-26 21:16:06 +0100 |
| commit | cf8ea5953eb684bc28283578d54689c86b7f4577 (patch) | |
| tree | 4a3a273433e20c7543825a3db9212bf22d258dae /src | |
| parent | 65ddcdeabb616d82922acaf2ba30d5e44bad2a3c (diff) | |
| download | box64-cf8ea5953eb684bc28283578d54689c86b7f4577.tar.gz box64-cf8ea5953eb684bc28283578d54689c86b7f4577.zip | |
[ANDROID] Now build, stop complaining
Diffstat (limited to 'src')
| -rw-r--r-- | src/library_list.h | 3 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibc.c | 8 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibpthread.c | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/library_list.h b/src/library_list.h index 97d7f265..ba69fd4e 100644 --- a/src/library_list.h +++ b/src/library_list.h @@ -3,7 +3,6 @@ #endif GO("libc.musl-x86_64.so.1", libcmusl) -GO("libpthread.so.0", libpthread) GO("librt.so.1", librt) GO("libbsd.so.0", libbsd) GO("libEGL.so.1", libegl) @@ -254,6 +253,7 @@ GO("libc.so", libc) GO("libm.so", libm) GO("libbsd.so", libbsd) GO("libdl.so", libdl) +GO("libpthread.so", libpthread) GO("libcups.so", libcups) GO("liblber-2.4.so", lber) GO("libldap_r-2.4.so", ldapr) @@ -355,6 +355,7 @@ GO("libpangocairo-1.0.so", pangocairo) GO("libc.so.6", libc) GO("libm.so.6", libm) GO("libdl.so.2", libdl) +GO("libpthread.so.0", libpthread) GO("libcups.so.2", libcups) GO("liblber-2.4.so.2", lber) GO("libldap_r-2.4.so.2", ldapr) diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c index 64e30c41..77d9ff45 100644 --- a/src/wrapped/wrappedlibc.c +++ b/src/wrapped/wrappedlibc.c @@ -3493,13 +3493,13 @@ EXPORT char my___libc_single_threaded = 0; #ifdef ANDROID #define NEEDED_LIBS_DEF 4,\ - "libpthread.so.0", \ - "libdl.so.2" , \ + "libpthread.so", \ + "libdl.so" , \ "libm.so", \ "libbsd.so" #define NEEDED_LIBS_234 4, \ - "libpthread.so.0", \ - "libdl.so.2" , \ + "libpthread.so", \ + "libdl.so" , \ "libm.so", \ "libbsd.so" #else diff --git a/src/wrapped/wrappedlibpthread.c b/src/wrapped/wrappedlibpthread.c index 9b0184c6..c10492f4 100644 --- a/src/wrapped/wrappedlibpthread.c +++ b/src/wrapped/wrappedlibpthread.c @@ -18,7 +18,12 @@ #include "box64context.h" #include "librarian.h" -const char* libpthreadName = "libpthread.so.0"; +const char* libpthreadName = +#ifdef ANDROID + "libpthread.so"; +#else + "libpthread.so.0"; +#endif #define LIBNAME libpthread //EXPORT int my_pthread_attr_setschedparam(x64emu_t* emu, void* attr, void* param) |