Skip to content

Commit 1d413cd

Browse files
mlibc: rename .cc to .cpp for upstreaming the changes :^)
Signed-off-by: Andy-Python-Programmer <[email protected]>
1 parent 1f1e86e commit 1d413cd

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

patches/mlibc/mlibc.patch

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a513b374fb24e1cce54e8cad7137c4d95dd10998 Mon Sep 17 00:00:00 2001
1+
From 4f8a7cd8dd0758d21118191372fc95bf17663e43 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,13 +9,13 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
99
abis/aero/auxv.h | 13 +
1010
meson.build | 4 +
1111
sysdeps/aero/crt-x86_64/crt0.S | 8 +
12-
sysdeps/aero/generic/aero.cc | 292 ++++++++++++++++++++
13-
sysdeps/aero/generic/entry.cc | 34 +++
14-
sysdeps/aero/generic/filesystem.cc | 276 ++++++++++++++++++
12+
sysdeps/aero/generic/aero.cpp | 292 ++++++++++++++++++++
13+
sysdeps/aero/generic/entry.cpp | 34 +++
14+
sysdeps/aero/generic/filesystem.cpp | 276 ++++++++++++++++++
1515
sysdeps/aero/generic/signals.S | 7 +
16-
sysdeps/aero/generic/signals.cc | 49 ++++
17-
sysdeps/aero/generic/sockets.cc | 0
18-
sysdeps/aero/generic/thread.cc | 45 +++
16+
sysdeps/aero/generic/signals.cpp | 49 ++++
17+
sysdeps/aero/generic/sockets.cpp | 0
18+
sysdeps/aero/generic/thread.cpp | 45 +++
1919
sysdeps/aero/generic/thread_entry.S | 8 +
2020
sysdeps/aero/include/abi-bits/abi.h | 1 +
2121
sysdeps/aero/include/abi-bits/auxv.h | 1 +
@@ -48,13 +48,13 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
4848
40 files changed, 1039 insertions(+)
4949
create mode 100644 abis/aero/auxv.h
5050
create mode 100644 sysdeps/aero/crt-x86_64/crt0.S
51-
create mode 100644 sysdeps/aero/generic/aero.cc
52-
create mode 100644 sysdeps/aero/generic/entry.cc
53-
create mode 100644 sysdeps/aero/generic/filesystem.cc
51+
create mode 100644 sysdeps/aero/generic/aero.cpp
52+
create mode 100644 sysdeps/aero/generic/entry.cpp
53+
create mode 100644 sysdeps/aero/generic/filesystem.cpp
5454
create mode 100644 sysdeps/aero/generic/signals.S
55-
create mode 100644 sysdeps/aero/generic/signals.cc
56-
create mode 100644 sysdeps/aero/generic/sockets.cc
57-
create mode 100644 sysdeps/aero/generic/thread.cc
55+
create mode 100644 sysdeps/aero/generic/signals.cpp
56+
create mode 100644 sysdeps/aero/generic/sockets.cpp
57+
create mode 100644 sysdeps/aero/generic/thread.cpp
5858
create mode 100644 sysdeps/aero/generic/thread_entry.S
5959
create mode 120000 sysdeps/aero/include/abi-bits/abi.h
6060
create mode 120000 sysdeps/aero/include/abi-bits/auxv.h
@@ -148,11 +148,11 @@ index 0000000..190b5a0
148148
+ call __mlibc_entry
149149
+
150150
+.size _start, . - _start
151-
diff --git a/sysdeps/aero/generic/aero.cc b/sysdeps/aero/generic/aero.cc
151+
diff --git a/sysdeps/aero/generic/aero.cpp b/sysdeps/aero/generic/aero.cpp
152152
new file mode 100644
153153
index 0000000..7de909f
154154
--- /dev/null
155-
+++ b/sysdeps/aero/generic/aero.cc
155+
+++ b/sysdeps/aero/generic/aero.cpp
156156
@@ -0,0 +1,292 @@
157157
+#include <abi-bits/pid_t.h>
158158
+#include <aero/syscall.h>
@@ -446,11 +446,11 @@ index 0000000..7de909f
446446
+
447447
+#endif
448448
+} // namespace mlibc
449-
diff --git a/sysdeps/aero/generic/entry.cc b/sysdeps/aero/generic/entry.cc
449+
diff --git a/sysdeps/aero/generic/entry.cpp b/sysdeps/aero/generic/entry.cpp
450450
new file mode 100644
451451
index 0000000..b5b9d42
452452
--- /dev/null
453-
+++ b/sysdeps/aero/generic/entry.cc
453+
+++ b/sysdeps/aero/generic/entry.cpp
454454
@@ -0,0 +1,34 @@
455455
+#include <bits/ensure.h>
456456
+#include <mlibc/elf/startup.h>
@@ -486,11 +486,11 @@ index 0000000..b5b9d42
486486
+ main_fn(__mlibc_stack_data.argc, __mlibc_stack_data.argv, environ);
487487
+ exit(result);
488488
+}
489-
diff --git a/sysdeps/aero/generic/filesystem.cc b/sysdeps/aero/generic/filesystem.cc
489+
diff --git a/sysdeps/aero/generic/filesystem.cpp b/sysdeps/aero/generic/filesystem.cpp
490490
new file mode 100644
491491
index 0000000..52a5043
492492
--- /dev/null
493-
+++ b/sysdeps/aero/generic/filesystem.cc
493+
+++ b/sysdeps/aero/generic/filesystem.cpp
494494
@@ -0,0 +1,276 @@
495495
+#include <aero/syscall.h>
496496
+
@@ -781,11 +781,11 @@ index 0000000..9e5d12b
781781
+ mov $39, %rax
782782
+ syscall
783783
+ ud2
784-
diff --git a/sysdeps/aero/generic/signals.cc b/sysdeps/aero/generic/signals.cc
784+
diff --git a/sysdeps/aero/generic/signals.cpp b/sysdeps/aero/generic/signals.cpp
785785
new file mode 100644
786786
index 0000000..3527370
787787
--- /dev/null
788-
+++ b/sysdeps/aero/generic/signals.cc
788+
+++ b/sysdeps/aero/generic/signals.cpp
789789
@@ -0,0 +1,49 @@
790790
+#include <mlibc/ansi-sysdeps.hpp>
791791
+#include <mlibc/debug.hpp>
@@ -837,14 +837,14 @@ index 0000000..3527370
837837
+}
838838
+} // namespace mlibc
839839
\ No newline at end of file
840-
diff --git a/sysdeps/aero/generic/sockets.cc b/sysdeps/aero/generic/sockets.cc
840+
diff --git a/sysdeps/aero/generic/sockets.cpp b/sysdeps/aero/generic/sockets.cpp
841841
new file mode 100644
842842
index 0000000..e69de29
843-
diff --git a/sysdeps/aero/generic/thread.cc b/sysdeps/aero/generic/thread.cc
843+
diff --git a/sysdeps/aero/generic/thread.cpp b/sysdeps/aero/generic/thread.cpp
844844
new file mode 100644
845845
index 0000000..4eef04a
846846
--- /dev/null
847-
+++ b/sysdeps/aero/generic/thread.cc
847+
+++ b/sysdeps/aero/generic/thread.cpp
848848
@@ -0,0 +1,45 @@
849849
+#include <mlibc/all-sysdeps.hpp>
850850
+#include <mlibc/thread-entry.hpp>
@@ -1323,25 +1323,25 @@ index 0000000..ed5d7d3
13231323
+} // namespace mlibc
13241324
diff --git a/sysdeps/aero/meson.build b/sysdeps/aero/meson.build
13251325
new file mode 100644
1326-
index 0000000..5033f0f
1326+
index 0000000..4d9420b
13271327
--- /dev/null
13281328
+++ b/sysdeps/aero/meson.build
13291329
@@ -0,0 +1,67 @@
13301330
+if not static
13311331
+ rtdl_sources += files(
1332-
+ 'generic/aero.cc',
1333-
+ 'generic/filesystem.cc',
1332+
+ 'generic/aero.cpp',
1333+
+ 'generic/filesystem.cpp',
13341334
+ )
13351335
+endif
13361336
+
13371337
+libc_sources += files(
1338-
+ 'generic/aero.cc',
1339-
+ 'generic/entry.cc',
1338+
+ 'generic/aero.cpp',
1339+
+ 'generic/entry.cpp',
13401340
+ 'generic/thread_entry.S',
1341-
+ 'generic/thread.cc',
1342-
+ 'generic/filesystem.cc',
1343-
+ 'generic/sockets.cc',
1344-
+ 'generic/signals.cc',
1341+
+ 'generic/thread.cpp',
1342+
+ 'generic/filesystem.cpp',
1343+
+ 'generic/sockets.cpp',
1344+
+ 'generic/signals.cpp',
13451345
+)
13461346
+
13471347
+if not no_headers

0 commit comments

Comments
 (0)