Skip to content

Commit b179742

Browse files
bootstrap::mlibc: enable map DSO segments and file windows
Signed-off-by: Andy-Python-Programmer <[email protected]>
1 parent 8c0964c commit b179742

File tree

1 file changed

+19
-3
lines changed

1 file changed

+19
-3
lines changed

patches/mlibc/mlibc.patch

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
From bf4093ec8e528fb9ebcb248d467784e3ecce47cb Mon Sep 17 00:00:00 2001
1+
From f4c7bb3f8556d4f50fe132109de2dfedfccac293 Mon Sep 17 00:00:00 2001
22
From: Andy-Python-Programmer <[email protected]>
3-
Date: Sat, 18 Feb 2023 14:53:00 +1100
3+
Date: Mon, 20 Feb 2023 18:40:41 +1100
44
Subject: [PATCH] <xxx>
55

66
---
77
.gitignore | 2 +
8+
meson.build | 4 +
89
options/ansi/generic/stdlib-stubs.cpp | 185 ++++++++++++++++++++++++--
910
options/ansi/meson.build | 1 +
1011
options/glibc/generic/execinfo.cpp | 5 +-
@@ -15,7 +16,7 @@ Subject: [PATCH] <xxx>
1516
sysdeps/aero/generic/time.cpp | 24 ++++
1617
sysdeps/aero/include/aero/syscall.h | 10 ++
1718
sysdeps/aero/meson.build | 1 +
18-
11 files changed, 398 insertions(+), 47 deletions(-)
19+
12 files changed, 402 insertions(+), 47 deletions(-)
1920
create mode 100644 sysdeps/aero/generic/time.cpp
2021

2122
diff --git a/.gitignore b/.gitignore
@@ -28,6 +29,21 @@ index fdd60a0..9f811f4 100644
2829
.vscode
2930
+# clangd cache files:
3031
+.cache
32+
diff --git a/meson.build b/meson.build
33+
index 7dc495d..f419404 100644
34+
--- a/meson.build
35+
+++ b/meson.build
36+
@@ -125,6 +125,10 @@ if host_machine.system() == 'linux'
37+
elif host_machine.system() == 'aero'
38+
rtdl_include_dirs += include_directories('sysdeps/aero/include')
39+
libc_include_dirs += include_directories('sysdeps/aero/include')
40+
+
41+
+ internal_conf.set10('MLIBC_MAP_DSO_SEGMENTS', true)
42+
+ internal_conf.set10('MLIBC_MAP_FILE_WINDOWS', true)
43+
+
44+
subdir('sysdeps/aero')
45+
elif host_machine.system() == 'managarm'
46+
# TODO: Adopt the include_directories() commands from the managarm meson.build.
3147
diff --git a/options/ansi/generic/stdlib-stubs.cpp b/options/ansi/generic/stdlib-stubs.cpp
3248
index c0e54fe..6d9cc52 100644
3349
--- a/options/ansi/generic/stdlib-stubs.cpp

0 commit comments

Comments
 (0)