1
- From 52be7281e3becafe49603ed6bbc01c0ded64d9e1 Mon Sep 17 00:00:00 2001
1
+ From 9ad862a1edb6ce5b86fc4fa49e8ce365af507f47 Mon Sep 17 00:00:00 2001
2
2
From: Andy-Python-Programmer <
[email protected] >
3
- Date: Fri, 8 Jul 2022 12:32:32 +1000
3
+ Date: Sat, 12 Nov 2022 18:58:33 +1100
4
4
Subject: [PATCH] yes
5
5
6
6
Signed-off-by: Andy-Python-Programmer <
[email protected] >
7
7
---
8
- .gitignore | 2 +
9
- options/glibc/generic/execinfo.cpp | 5 +-
10
- options/rtdl/generic/linker.cpp | 2 +-
11
- sysdeps/aero/generic/aero.cpp | 38 +++++++-------
12
- sysdeps/aero/generic/filesystem.cpp | 25 ++++++++--
13
- sysdeps/aero/generic/sockets.cpp | 77 ++++++++++++++++++++++++++++-
14
- sysdeps/aero/generic/time.cpp | 24 +++++++++
15
- sysdeps/aero/include/aero/syscall.h | 6 +++
16
- sysdeps/aero/meson.build | 1 +
17
- 9 files changed, 152 insertions(+), 28 deletions(-)
8
+ .gitignore | 2 +
9
+ options/glibc/generic/execinfo.cpp | 5 +-
10
+ options/posix/generic/termios-stubs.cpp | 5 +-
11
+ options/rtdl/generic/linker.cpp | 2 +-
12
+ sysdeps/aero/generic/aero.cpp | 38 ++++++------
13
+ sysdeps/aero/generic/filesystem.cpp | 25 ++++++--
14
+ sysdeps/aero/generic/sockets.cpp | 77 ++++++++++++++++++++++++-
15
+ sysdeps/aero/generic/time.cpp | 24 ++++++++
16
+ sysdeps/aero/include/aero/syscall.h | 6 ++
17
+ sysdeps/aero/meson.build | 1 +
18
+ 10 files changed, 155 insertions(+), 30 deletions(-)
18
19
create mode 100644 sysdeps/aero/generic/time.cpp
19
20
20
21
diff --git a/.gitignore b/.gitignore
21
- index fdd60a00..9f811f47 100644
22
+ index fdd60a0..9f811f4 100644
22
23
--- a/.gitignore
23
24
+++ b/.gitignore
24
25
@@ -3,3 +3,5 @@ subprojects
@@ -28,7 +29,7 @@ index fdd60a00..9f811f47 100644
28
29
+ # clangd cache files:
29
30
+ .cache
30
31
diff --git a/options/glibc/generic/execinfo.cpp b/options/glibc/generic/execinfo.cpp
31
- index 3474615e..10a2109e 100644
32
+ index 3474615..10a2109 100644
32
33
--- a/options/glibc/generic/execinfo.cpp
33
34
+++ b/options/glibc/generic/execinfo.cpp
34
35
@@ -1,9 +1,10 @@
@@ -44,11 +45,34 @@ index 3474615e..10a2109e 100644
44
45
}
45
46
46
47
char **backtrace_symbols(void *const *, int) {
48
+ diff --git a/options/posix/generic/termios-stubs.cpp b/options/posix/generic/termios-stubs.cpp
49
+ index 3e621ad..583c1f5 100644
50
+ --- a/options/posix/generic/termios-stubs.cpp
51
+ +++ b/options/posix/generic/termios-stubs.cpp
52
+ @@ -5,6 +5,7 @@
53
+
54
+ #include <bits/ensure.h>
55
+ #include <mlibc/posix-sysdeps.hpp>
56
+ + #include <mlibc/debug.hpp>
57
+
58
+ speed_t cfgetispeed(const struct termios *tios) {
59
+ return tios->ibaud;
60
+ @@ -50,8 +51,8 @@ int tcflow(int fd, int action) {
61
+ }
62
+
63
+ int tcflush(int, int) {
64
+ - __ensure(!"Not implemented");
65
+ - __builtin_unreachable();
66
+ + mlibc::infoLogger() << "mlibc::tcflush: is a stub!" << frg::endlog;
67
+ + return 0;
68
+ }
69
+
70
+ int tcgetattr(int fd, struct termios *attr) {
47
71
diff --git a/options/rtdl/generic/linker.cpp b/options/rtdl/generic/linker.cpp
48
- index f51a543f..74f4e96a 100644
72
+ index 2e2d3f1..3ff5fef 100644
49
73
--- a/options/rtdl/generic/linker.cpp
50
74
+++ b/options/rtdl/generic/linker.cpp
51
- @@ -16 ,7 +16 ,7 @@ uintptr_t libraryBase = 0x41000000;
75
+ @@ -18 ,7 +18 ,7 @@ uintptr_t libraryBase = 0x41000000;
52
76
53
77
constexpr bool verbose = false;
54
78
constexpr bool stillSlightlyVerbose = false;
@@ -58,7 +82,7 @@ index f51a543f..74f4e96a 100644
58
82
constexpr bool eagerBinding = true;
59
83
60
84
diff --git a/sysdeps/aero/generic/aero.cpp b/sysdeps/aero/generic/aero.cpp
61
- index 29fb9610..a27da559 100644
85
+ index 29fb961..a27da55 100644
62
86
--- a/sysdeps/aero/generic/aero.cpp
63
87
+++ b/sysdeps/aero/generic/aero.cpp
64
88
@@ -69,22 +69,22 @@ int sys_futex_tid() {
@@ -135,7 +159,7 @@ index 29fb9610..a27da559 100644
135
159
}
136
160
137
161
diff --git a/sysdeps/aero/generic/filesystem.cpp b/sysdeps/aero/generic/filesystem.cpp
138
- index a3e2aca2..4187059e 100644
162
+ index a3e2aca..4187059 100644
139
163
--- a/sysdeps/aero/generic/filesystem.cpp
140
164
+++ b/sysdeps/aero/generic/filesystem.cpp
141
165
@@ -158,11 +158,6 @@ int sys_tcsetattr(int fd, int optional_action, const struct termios *attr) {
@@ -176,7 +200,7 @@ index a3e2aca2..4187059e 100644
176
200
+ }
177
201
} // namespace mlibc
178
202
diff --git a/sysdeps/aero/generic/sockets.cpp b/sysdeps/aero/generic/sockets.cpp
179
- index b6b18fe7..e03c634b 100644
203
+ index b6b18fe..e03c634 100644
180
204
--- a/sysdeps/aero/generic/sockets.cpp
181
205
+++ b/sysdeps/aero/generic/sockets.cpp
182
206
@@ -1,5 +1,6 @@
@@ -276,7 +300,7 @@ index b6b18fe7..e03c634b 100644
276
300
} // namespace mlibc
277
301
diff --git a/sysdeps/aero/generic/time.cpp b/sysdeps/aero/generic/time.cpp
278
302
new file mode 100644
279
- index 00000000..460412d0
303
+ index 0000000..460412d
280
304
--- /dev/null
281
305
+++ b/sysdeps/aero/generic/time.cpp
282
306
@@ -0,0 +1,24 @@
@@ -306,7 +330,7 @@ index 00000000..460412d0
306
330
+ }
307
331
\ No newline at end of file
308
332
diff --git a/sysdeps/aero/include/aero/syscall.h b/sysdeps/aero/include/aero/syscall.h
309
- index 12f8dc61..03001c46 100644
333
+ index 12f8dc6..03001c4 100644
310
334
--- a/sysdeps/aero/include/aero/syscall.h
311
335
+++ b/sysdeps/aero/include/aero/syscall.h
312
336
@@ -64,6 +64,12 @@
@@ -323,7 +347,7 @@ index 12f8dc61..03001c46 100644
323
347
// Invalid syscall used to trigger a log error in the kernel (as a hint)
324
348
// so, that we can implement the syscall in the kernel.
325
349
diff --git a/sysdeps/aero/meson.build b/sysdeps/aero/meson.build
326
- index 14975990..8e30aa3a 100644
350
+ index a807b37..878c216 100644
327
351
--- a/sysdeps/aero/meson.build
328
352
+++ b/sysdeps/aero/meson.build
329
353
@@ -11,6 +11,7 @@ libc_sources += files(
@@ -335,5 +359,5 @@ index 14975990..8e30aa3a 100644
335
359
336
360
if not no_headers
337
361
- -
338
- 2.25 .1
362
+ 2.38 .1
339
363
0 commit comments