mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 12:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

mlibc: use patch while not upstream

Browse Source
This commit is contained in:
monkuous
2025-11-16 19:18:57 +01:00
parent ebc810a4d8
commit c3364fc6b8
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/mlibc/jinx-working-patch.patch
+12 -1
View File
@@ -551,9 +551,20 @@ index 5c57cf8..cb2d97f 100644
void tdestroy(void *root, void (*free_node)(void *)) {
diff --git mlibc-clean/options/rtld/generic/main.cpp mlibc-workdir/options/rtld/generic/main.cpp
index b2db152..e6438fe 100644
index b2db152..244ad4b 100644
--- mlibc-clean/options/rtld/generic/main.cpp
+++ mlibc-workdir/options/rtld/generic/main.cpp
@@ -636,8 +636,8 @@ void *__dlapi_open(const char *file, int flags, void *returnAddress) {
// In order to know which RUNPATH / RPATH to process, we must find the calling object.
SharedObject *origin = initialRepository->findCaller(returnAddress);
if (!origin) {
- mlibc::panicLogger() << "rtld: unable to determine calling object of dlopen "
- << "(ra = " << returnAddress << ")" << frg::endlog;
+ // When we can't find the origin, assume it's the main executable (copies glibc behavior)
+ origin = executableSO;
}
objectResult = initialRepository->requestObjectWithName(file, origin, newScope, !isGlobal, rts);
@@ -681,6 +681,9 @@ void *__dlapi_open(const char *file, int flags, void *returnAddress) {
}
}