Skip to content

Commit 1145cc8

Browse files
bootstrap: bump mlibc
Signed-off-by: Andy-Python-Programmer <[email protected]>
1 parent b4d7ac6 commit 1145cc8

File tree

2 files changed

+9
-23
lines changed

2 files changed

+9
-23
lines changed

bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ sources:
4545

4646
- name: mlibc
4747
subdir: 'bundled'
48-
url: 'https://github.com/managarm/mlibc/archive/afd11daf4565943f8265b2c1ed2a9116e7a4ba4f.tar.gz'
48+
url: 'https://github.com/managarm/mlibc/archive/a569f1edddad6017177118713b3d42858305a4d0.tar.gz'
4949
format: 'tar.gz'
50-
extract_path: 'mlibc-afd11daf4565943f8265b2c1ed2a9116e7a4ba4f'
50+
extract_path: 'mlibc-a569f1edddad6017177118713b3d42858305a4d0'
5151
patch-path-strip: 1
5252
version: '12.rolling'
5353

patches/mlibc/mlibc.patch

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From bf83f6680b24350322a80e8dd6c043cf9293c814 Mon Sep 17 00:00:00 2001
1+
From cf2c1a37c21f6125d37ba426bb0470e994e33677 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,7 +9,6 @@ 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 +-
1312
options/rtdl/generic/linker.cpp | 5 +-
1413
options/rtdl/generic/main.cpp | 11 +-
1514
sysdeps/aero/crt-x86_64/crt0.S | 8 +
@@ -51,7 +50,7 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
5150
sysdeps/aero/meson.build | 67 +++++
5251
sysdeps/dripos/generic/generic.cpp | 3 +
5352
sysdeps/lemon/generic/signals.S | 7 +
54-
46 files changed, 1019 insertions(+), 11 deletions(-)
53+
45 files changed, 1018 insertions(+), 10 deletions(-)
5554
create mode 100644 abis/aero/auxv.h
5655
create mode 100644 sysdeps/aero/crt-x86_64/crt0.S
5756
create mode 100644 sysdeps/aero/generic/aero.cc
@@ -155,21 +154,8 @@ index 347c659..8e97b26 100644
155154
sigset_t set;
156155
sigemptyset(&set);
157156
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-
}
171157
diff --git a/options/rtdl/generic/linker.cpp b/options/rtdl/generic/linker.cpp
172-
index 1720d4f..81e4d7e 100644
158+
index 9620645..ffa60a7 100644
173159
--- a/options/rtdl/generic/linker.cpp
174160
+++ b/options/rtdl/generic/linker.cpp
175161
@@ -367,9 +367,8 @@ void ObjectRepository::_fetchFromFile(SharedObject *object, int fd) {
@@ -565,7 +551,7 @@ index 0000000..265ab56
565551
+}
566552
diff --git a/sysdeps/aero/generic/filesystem.cc b/sysdeps/aero/generic/filesystem.cc
567553
new file mode 100644
568-
index 0000000..6518ec2
554+
index 0000000..a294337
569555
--- /dev/null
570556
+++ b/sysdeps/aero/generic/filesystem.cc
571557
@@ -0,0 +1,262 @@
@@ -812,9 +798,9 @@ index 0000000..6518ec2
812798
+ int nfds,
813799
+ fd_set* readfds,
814800
+ fd_set* writefds,
815-
+ fd_set *exceptfds,
816-
+ const struct timespec* timeout,
817-
+ const sigset_t* sigmask,
801+
+ fd_set *exceptfds,
802+
+ const struct timespec* timeout,
803+
+ const sigset_t* sigmask,
818804
+ int *num_events) {
819805
+ *num_events = 10;
820806
+ return 0;

0 commit comments

Comments
 (0)