Skip to content

Commit 4b716ef

Browse files
mlibc: fix build with latest frigg update
Signed-off-by: Andy-Python-Programmer <[email protected]>
1 parent b06d034 commit 4b716ef

File tree

1 file changed

+21
-7
lines changed

1 file changed

+21
-7
lines changed

patches/mlibc/mlibc.patch

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c89c130a211f4eb58b4a73d9849d183aa0777ebf Mon Sep 17 00:00:00 2001
1+
From 791ffe535a74e6df0809459c5283ac80c46d0d6c 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
@@ -9,6 +9,7 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
99
abis/aero/auxv.h | 13 +
1010
meson.build | 4 +
1111
options/ansi/generic/stdlib-stubs.cpp | 3 +
12+
options/posix/generic/resolv_conf.cpp | 2 +-
1213
options/rtdl/generic/linker.cpp | 5 +-
1314
options/rtdl/generic/main.cpp | 11 +-
1415
sysdeps/aero/crt-x86_64/crt0.S | 8 +
@@ -50,7 +51,7 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
5051
sysdeps/aero/meson.build | 67 +++++
5152
sysdeps/dripos/generic/generic.cpp | 3 +
5253
sysdeps/lemon/generic/signals.S | 7 +
53-
45 files changed, 1021 insertions(+), 10 deletions(-)
54+
46 files changed, 1022 insertions(+), 11 deletions(-)
5455
create mode 100644 abis/aero/auxv.h
5556
create mode 100644 sysdeps/aero/crt-x86_64/crt0.S
5657
create mode 100644 sysdeps/aero/generic/aero.cc
@@ -154,6 +155,19 @@ index 347c659..8e97b26 100644
154155
sigset_t set;
155156
sigemptyset(&set);
156157
sigaddset(&set, SIGABRT);
158+
diff --git a/options/posix/generic/resolv_conf.cpp b/options/posix/generic/resolv_conf.cpp
159+
index bd3fe73..9ffefb5 100644
160+
--- a/options/posix/generic/resolv_conf.cpp
161+
+++ b/options/posix/generic/resolv_conf.cpp
162+
@@ -34,7 +34,7 @@ frg::optional<struct nameserver_data> get_nameserver() {
163+
}
164+
165+
fclose(file);
166+
- if(ret.name == "")
167+
+ if(ret.name.size() == 0)
168+
return frg::null_opt;
169+
return ret;
170+
}
157171
diff --git a/options/rtdl/generic/linker.cpp b/options/rtdl/generic/linker.cpp
158172
index 1720d4f..81e4d7e 100644
159173
--- a/options/rtdl/generic/linker.cpp
@@ -553,7 +567,7 @@ index 0000000..265ab56
553567
+}
554568
diff --git a/sysdeps/aero/generic/filesystem.cc b/sysdeps/aero/generic/filesystem.cc
555569
new file mode 100644
556-
index 0000000..e3551a0
570+
index 0000000..a944402
557571
--- /dev/null
558572
+++ b/sysdeps/aero/generic/filesystem.cc
559573
@@ -0,0 +1,266 @@
@@ -667,10 +681,10 @@ index 0000000..e3551a0
667681
+
668682
+int sys_tcgetattr(int fd, struct termios *attr) {
669683
+ int result;
670-
+
684+
+
671685
+ if (int e = sys_ioctl(fd, TCGETS, (void*)attr, &result); e)
672686
+ return e;
673-
+
687+
+
674688
+ return 0;
675689
+}
676690
+
@@ -1216,8 +1230,8 @@ index 0000000..d3fe862
12161230
+// so, that we can implement the syscall in the kernel.
12171231
+#define UNIMPLEMENTED(FUNCTION_NAME) \
12181232
+ { \
1219-
+ sys_libc_log("Unimplemented syscall: " FUNCTION_NAME); \
1220-
+ sys_exit(1); \
1233+
+ syscall(314, FUNCTION_NAME, strlen(FUNCTION_NAME)); \
1234+
+ __ensure(!"UNIMPLEMENTED function was called"); \
12211235
+ __builtin_unreachable(); \
12221236
+ }
12231237
+

0 commit comments

Comments
 (0)