diff options
| author | ptitSeb <seebastien.chev@gmail.com> | 2023-09-28 18:53:01 +0200 |
|---|---|---|
| committer | ptitSeb <seebastien.chev@gmail.com> | 2023-09-28 18:53:01 +0200 |
| commit | cb85a8f5cbe60e5e3d44364d743e8e0abcc74525 (patch) | |
| tree | d9af68f22d33e36d03a27be6ac29f5b7408f0eb0 /src | |
| parent | 23dd80ffd8aebbbf9a7ab91cffe3028a8153eb71 (diff) | |
| download | box64-cb85a8f5cbe60e5e3d44364d743e8e0abcc74525.tar.gz box64-cb85a8f5cbe60e5e3d44364d743e8e0abcc74525.zip | |
Use libdl whenever libc is used (for #984)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapped/wrappedlibc.c | 3 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibdl.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c index b1010939..61819a7f 100644 --- a/src/wrapped/wrappedlibc.c +++ b/src/wrapped/wrappedlibc.c @@ -3412,9 +3412,10 @@ EXPORT char my___libc_single_threaded = 0; "libdl.so.2" , \ "libm.so" #else -#define NEEDED_LIBS 4,\ +#define NEEDED_LIBS 5, \ "ld-linux-x86-64.so.2", \ "libpthread.so.0", \ + "libdl.so.2", \ "libutil.so.1", \ "librt.so.1" #define NEEDED_LIBS_234 6, \ diff --git a/src/wrapped/wrappedlibdl.c b/src/wrapped/wrappedlibdl.c index fcb6d7fc..9ed55135 100644 --- a/src/wrapped/wrappedlibdl.c +++ b/src/wrapped/wrappedlibdl.c @@ -581,9 +581,6 @@ EXPORT int my__dl_find_object(x64emu_t* emu, void* addr, my_dl_find_object_t* re return -1; } -#define CUSTOM_INIT\ - if(!box64_isglibc234) setNeededLibs(lib, 1, "libc.so.6"); - // define all standard library functions #include "wrappedlib_init.h" |