diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/base.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/base.h deleted file mode 120000 index 94110a729..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/base.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/base.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/ext/for-libelfloader.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/ext/for-libelfloader.h deleted file mode 120000 index 0ce87e8aa..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/ext/for-libelfloader.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/ext/for-libelfloader.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/ext/for-libkqueue.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/ext/for-libkqueue.h deleted file mode 120000 index 588848b47..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/ext/for-libkqueue.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/ext/for-libkqueue.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/ext/for-xtrace.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/ext/for-xtrace.h deleted file mode 120000 index f04cb3d3a..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/ext/for-xtrace.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/ext/for-xtrace.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/ext/futex.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/ext/futex.h deleted file mode 120000 index c87bc59c8..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/ext/futex.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/ext/futex.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/legacy_path b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/legacy_path new file mode 120000 index 000000000..403c0dd6d --- /dev/null +++ b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/legacy_path @@ -0,0 +1 @@ +../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/include/legacy_path/ \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-arm64.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-arm64.h deleted file mode 120000 index d1934d626..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-arm64.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/linux-syscalls/linux-arm64.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-generic.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-generic.h deleted file mode 120000 index d3c27dff5..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-generic.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/linux-syscalls/linux-generic.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-syscalls.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-syscalls.h deleted file mode 120000 index db2bfb586..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-syscalls.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/linux-syscalls/linux.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-x86.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-x86.h deleted file mode 120000 index be7789171..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-x86.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/linux-syscalls/linux-x86.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-x86_64.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-x86_64.h deleted file mode 120000 index 76468f092..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/linux-x86_64.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/linux-syscalls/linux-x86_64.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/mman/duct_mman.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/mman/duct_mman.h deleted file mode 120000 index c9d7fa3eb..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/mman/duct_mman.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/mman/duct_mman.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/signal/sigaltstack.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/signal/sigaltstack.h deleted file mode 120000 index 6c8987acd..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/signal/sigaltstack.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/signal/sigaltstack.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/simple.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/simple.h deleted file mode 120000 index 51c844b73..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/simple.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/simple.h \ No newline at end of file diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/tsd.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/tsd.h deleted file mode 120000 index c8d01cfe0..000000000 --- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/emulation/tsd.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../src/external/xnu/darling/src/libsystem_kernel/emulation/linux/tsd.h \ No newline at end of file -- 2.51.2 From 694ad8754657611382e11f55238d792a2cdea1b3 Mon Sep 17 00:00:00 2001 From: "Thomas A." Date: Sun, 6 Apr 2025 21:24:47 -0700 Subject: [PATCH 2/5] Add Symlink To "dthreads.h" In "darling" Include folder --- .../SDKs/MacOSX.sdk/usr/include/darling/mldr/elfcalls/dthreads.h | 1 + 1 file changed, 1 insertion(+) create mode 120000 Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/mldr/elfcalls/dthreads.h diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/mldr/elfcalls/dthreads.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/mldr/elfcalls/dthreads.h new file mode 120000 index 000000000..0089bebb1 --- /dev/null +++ b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/darling/mldr/elfcalls/dthreads.h @@ -0,0 +1 @@ +../../../../../../../../../../../src/startup/mldr/elfcalls/dthreads.h \ No newline at end of file -- 2.51.2 From 9938bf26f13dfd16c2525a1f252adf37cfbc1dda Mon Sep 17 00:00:00 2001 From: "Thomas A." Date: Sat, 5 Apr 2025 21:28:07 -0700 Subject: [PATCH 3/5] [xtrace] Fix Building --- src/xtrace/bsd_trace.cpp | 2 +- src/xtrace/lock.h | 2 +- src/xtrace/mach_trace.cpp | 2 +- src/xtrace/mig_trace.cpp | 2 +- src/xtrace/posix_spawn_args.cpp | 2 +- src/xtrace/string.cpp | 2 +- src/xtrace/tls.cpp | 6 +++--- src/xtrace/xtracelib.cpp | 4 ++-- src/xtrace/xtracelib.h | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/xtrace/bsd_trace.cpp b/src/xtrace/bsd_trace.cpp index 4c099a5de..d5dd7340e 100644 --- a/src/xtrace/bsd_trace.cpp +++ b/src/xtrace/bsd_trace.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/xtrace/lock.h b/src/xtrace/lock.h index e69e1165b..2597fddfc 100644 --- a/src/xtrace/lock.h +++ b/src/xtrace/lock.h @@ -1,7 +1,7 @@ #ifndef _XTRACE_LOCK_H_ #define _XTRACE_LOCK_H_ -#include +#include #include #include "base.h" diff --git a/src/xtrace/mach_trace.cpp b/src/xtrace/mach_trace.cpp index b00fe5781..74101d273 100644 --- a/src/xtrace/mach_trace.cpp +++ b/src/xtrace/mach_trace.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/xtrace/mig_trace.cpp b/src/xtrace/mig_trace.cpp index a3cfcf4d7..b7e619362 100644 --- a/src/xtrace/mig_trace.cpp +++ b/src/xtrace/mig_trace.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include "xtracelib.h" #include "mach_trace.h" #include "bsd_trace.h" diff --git a/src/xtrace/posix_spawn_args.cpp b/src/xtrace/posix_spawn_args.cpp index e8ea37c44..77711318b 100644 --- a/src/xtrace/posix_spawn_args.cpp +++ b/src/xtrace/posix_spawn_args.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "bsd_trace.h" #include "xtracelib.h" diff --git a/src/xtrace/string.cpp b/src/xtrace/string.cpp index 48c48306a..280749041 100644 --- a/src/xtrace/string.cpp +++ b/src/xtrace/string.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include // // Helper Functions diff --git a/src/xtrace/tls.cpp b/src/xtrace/tls.cpp index 1ccfd97c9..304490717 100644 --- a/src/xtrace/tls.cpp +++ b/src/xtrace/tls.cpp @@ -1,9 +1,9 @@ #include -#include +#include #include "tls.h" #include "memory.h" #include "lock.h" -#include +#include #include #include "xtracelib.h" @@ -30,7 +30,7 @@ struct tls_table { // we have to use a slightly hackier technique: using one of the system's reserved but unused TLS keys; we use one from the range we currently reserve // for Darling. -#include +#include // TODO: also perform TLS cleanup for other threads when doing a fork diff --git a/src/xtrace/xtracelib.cpp b/src/xtrace/xtracelib.cpp index 43a8b582c..1d862efd5 100644 --- a/src/xtrace/xtracelib.cpp +++ b/src/xtrace/xtracelib.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include "xtracelib.h" #include "mig_trace.h" #include "tls.h" @@ -12,7 +12,7 @@ #include "memory.h" #include -#include +#include #include #include diff --git a/src/xtrace/xtracelib.h b/src/xtrace/xtracelib.h index fc3277e61..0ec28f845 100644 --- a/src/xtrace/xtracelib.h +++ b/src/xtrace/xtracelib.h @@ -1,7 +1,7 @@ #ifndef _XTRACELIB_H_ #define _XTRACELIB_H_ #include -#include +#include #include "base.h" #include "string.h" -- 2.51.2 From 99ddf57f02c4053aadb2cdaa6cca8d469c1f215a Mon Sep 17 00:00:00 2001 From: "Thomas A." Date: Sat, 5 Apr 2025 21:28:33 -0700 Subject: [PATCH 4/5] [CoreServices] Fix Building --- src/frameworks/CoreServices/src/CarbonCore/FileManager.cpp | 2 +- src/frameworks/CoreServices/src/FSEvents/FSEventsImpl.m | 2 +- src/frameworks/CoreServices/src/FSEvents/fseventsd.m | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/frameworks/CoreServices/src/CarbonCore/FileManager.cpp b/src/frameworks/CoreServices/src/CarbonCore/FileManager.cpp index 3746cd7ef..bcd7ffa99 100644 --- a/src/frameworks/CoreServices/src/CarbonCore/FileManager.cpp +++ b/src/frameworks/CoreServices/src/CarbonCore/FileManager.cpp @@ -38,7 +38,7 @@ along with Darling. If not, see . #include #include #include -#include +#include #define STUB() // TODO diff --git a/src/frameworks/CoreServices/src/FSEvents/FSEventsImpl.m b/src/frameworks/CoreServices/src/FSEvents/FSEventsImpl.m index b11778690..d7028c003 100644 --- a/src/frameworks/CoreServices/src/FSEvents/FSEventsImpl.m +++ b/src/frameworks/CoreServices/src/FSEvents/FSEventsImpl.m @@ -23,7 +23,7 @@ #include #include #include -#include +#include static dispatch_queue_t g_fsEventsQueue = NULL; diff --git a/src/frameworks/CoreServices/src/FSEvents/fseventsd.m b/src/frameworks/CoreServices/src/FSEvents/fseventsd.m index dc3fd5e6a..6378aaa2b 100644 --- a/src/frameworks/CoreServices/src/FSEvents/fseventsd.m +++ b/src/frameworks/CoreServices/src/FSEvents/fseventsd.m @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include "./linux/fanotify.h" #include #include -- 2.51.2 From 2b8043764d50aea30d7c0b98e074da4eebd02179 Mon Sep 17 00:00:00 2001 From: "Thomas A." Date: Sun, 6 Apr 2025 21:27:32 -0700 Subject: [PATCH 5/5] Update Submodules darling-libkqueue#7 | (Syscall Redesign | Part 1) Relocate Syscall Source & Header To Legacy Path darling-xnu#9 | (Syscall Redesign | Part 1) Relocate Syscall Source & Header To Legacy Path --- src/external/libkqueue | 2 +- src/external/xnu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/external/libkqueue b/src/external/libkqueue index 7e2ade452..6be5b2bee 160000 --- a/src/external/libkqueue +++ b/src/external/libkqueue @@ -1 +1 @@ -Subproject commit 7e2ade452a3fd77cedf99406591ca5231cb3d6c6 +Subproject commit 6be5b2bee446c8540a4bb800928d37490e64e23f diff --git a/src/external/xnu b/src/external/xnu index 814a90cae..71d08ba2b 160000 --- a/src/external/xnu +++ b/src/external/xnu @@ -1 +1 @@ -Subproject commit 814a90cae0b725c65b89dcba2b680d36aceeeec4 +Subproject commit 71d08ba2b8578119676f8b6537fc8c20f7632a1e