Skip to content

Commit 023649f

Browse files
mlibc: log exit
Signed-off-by: Andy-Python-Programmer <[email protected]>
1 parent b40ac26 commit 023649f

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

patches/mlibc/mlibc.patch

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5e87b2932145620154c27710ca15391d2b2dfb97 Mon Sep 17 00:00:00 2001
1+
From 6053d1c75a94a6bb398857af8f2cd5e298a27fa8 Mon Sep 17 00:00:00 2001
22
From: unknown <[email protected]>
33
Date: Sun, 6 Jun 2021 16:37:54 +1000
44
Subject: [PATCH] targets: add aero target port
@@ -8,7 +8,7 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
88
.gitignore | 1 +
99
abis/aero/auxv.h | 13 ++
1010
meson.build | 4 +
11-
options/rtdl/generic/main.cpp | 8 +-
11+
options/rtdl/generic/main.cpp | 11 +-
1212
sysdeps/aero/crt-x86_64/crt0.S | 8 ++
1313
sysdeps/aero/generic/aero.cc | 127 +++++++++++++++++
1414
sysdeps/aero/generic/entry.cc | 32 +++++
@@ -44,7 +44,7 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
4444
sysdeps/aero/include/aero/syscall.h | 148 ++++++++++++++++++++
4545
sysdeps/aero/include/mlibc/thread-entry.hpp | 10 ++
4646
sysdeps/aero/meson.build | 60 ++++++++
47-
39 files changed, 572 insertions(+), 5 deletions(-)
47+
39 files changed, 573 insertions(+), 7 deletions(-)
4848
create mode 100644 abis/aero/auxv.h
4949
create mode 100644 sysdeps/aero/crt-x86_64/crt0.S
5050
create mode 100644 sysdeps/aero/generic/aero.cc
@@ -127,7 +127,7 @@ index 55e9070..8b3f4ba 100644
127127
# TODO: Adopt the include_directories() commands from the managarm meson.build.
128128
rtdl_include_dirs += include_directories('sysdeps/managarm/include')
129129
diff --git a/options/rtdl/generic/main.cpp b/options/rtdl/generic/main.cpp
130-
index 1521779..b974215 100644
130+
index 1521779..5d145bf 100644
131131
--- a/options/rtdl/generic/main.cpp
132132
+++ b/options/rtdl/generic/main.cpp
133133
@@ -118,9 +118,10 @@ extern "C" [[gnu::alias("dl_debug_state"), gnu::visibility("default")]] void _dl
@@ -163,6 +163,16 @@ index 1521779..b974215 100644
163163
mlibc::infoLogger() << "ldso: Executable PHDRs are at " << phdr_pointer
164164
<< frg::endlog;
165165

166+
@@ -267,8 +265,7 @@ extern "C" void *interpreterMain(uintptr_t *entry_stack) {
167+
globalDebugInterface.state = 0;
168+
dl_debug_state();
169+
170+
- if(logEntryExit)
171+
- mlibc::infoLogger() << "Leaving ld.so, jump to "
172+
+ mlibc::infoLogger() << "Leaving ld.so, jump to "
173+
<< (void *)executableSO->entry << frg::endlog;
174+
return executableSO->entry;
175+
}
166176
diff --git a/sysdeps/aero/crt-x86_64/crt0.S b/sysdeps/aero/crt-x86_64/crt0.S
167177
new file mode 100644
168178
index 0000000..190b5a0

0 commit comments

Comments
 (0)