1
- From 5e87b2932145620154c27710ca15391d2b2dfb97 Mon Sep 17 00:00:00 2001
1
+ From 6053d1c75a94a6bb398857af8f2cd5e298a27fa8 Mon Sep 17 00:00:00 2001
2
2
From: unknown <andypythonappdeveloper@gmail.com>
3
3
Date: Sun, 6 Jun 2021 16:37:54 +1000
4
4
Subject: [PATCH] targets: add aero target port
@@ -8,7 +8,7 @@ Signed-off-by: Andy-Python-Programmer <andypythonappdeveloper@gmail.com>
8
8
.gitignore | 1 +
9
9
abis/aero/auxv.h | 13 ++
10
10
meson.build | 4 +
11
- options/rtdl/generic/main.cpp | 8 +-
11
+ options/rtdl/generic/main.cpp | 11 +-
12
12
sysdeps/aero/crt-x86_64/crt0.S | 8 ++
13
13
sysdeps/aero/generic/aero.cc | 127 +++++++++++++++++
14
14
sysdeps/aero/generic/entry.cc | 32 +++++
@@ -44,7 +44,7 @@ Signed-off-by: Andy-Python-Programmer <andypythonappdeveloper@gmail.com>
44
44
sysdeps/aero/include/aero/syscall.h | 148 ++++++++++++++++++++
45
45
sysdeps/aero/include/mlibc/thread-entry.hpp | 10 ++
46
46
sysdeps/aero/meson.build | 60 ++++++++
47
- 39 files changed, 572 insertions(+), 5 deletions(-)
47
+ 39 files changed, 573 insertions(+), 7 deletions(-)
48
48
create mode 100644 abis/aero/auxv.h
49
49
create mode 100644 sysdeps/aero/crt-x86_64/crt0.S
50
50
create mode 100644 sysdeps/aero/generic/aero.cc
@@ -127,7 +127,7 @@ index 55e9070..8b3f4ba 100644
127
127
# TODO: Adopt the include_directories() commands from the managarm meson.build.
128
128
rtdl_include_dirs += include_directories('sysdeps/managarm/include')
129
129
diff --git a/options/rtdl/generic/main.cpp b/options/rtdl/generic/main.cpp
130
- index 1521779..b974215 100644
130
+ index 1521779..5d145bf 100644
131
131
--- a/options/rtdl/generic/main.cpp
132
132
+++ b/options/rtdl/generic/main.cpp
133
133
@@ -118,9 +118,10 @@ extern "C" [[gnu::alias("dl_debug_state"), gnu::visibility("default")]] void _dl
@@ -163,6 +163,16 @@ index 1521779..b974215 100644
163
163
mlibc::infoLogger() << "ldso: Executable PHDRs are at " << phdr_pointer
164
164
<< frg::endlog;
165
165
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
+ }
166
176
diff --git a/sysdeps/aero/crt-x86_64/crt0.S b/sysdeps/aero/crt-x86_64/crt0.S
167
177
new file mode 100644
168
178
index 0000000..190b5a0
0 commit comments