diff --git a/headers/private/kernel/realtime_sem.h b/headers/private/kernel/posix/realtime_sem.h similarity index 100% rename from headers/private/kernel/realtime_sem.h rename to headers/private/kernel/posix/realtime_sem.h diff --git a/src/system/kernel/Jamfile b/src/system/kernel/Jamfile index af9f2a93cb..7c0f0c13e2 100644 --- a/src/system/kernel/Jamfile +++ b/src/system/kernel/Jamfile @@ -33,7 +33,6 @@ KernelMergeObject kernel_core.o : Notifications.cpp port.cpp real_time_clock.c - realtime_sem.cpp scheduler.cpp sem.cpp shutdown.c @@ -64,16 +63,17 @@ KernelLd linkhack.so : ; KernelLd kernel_$(TARGET_ARCH) : - kernel_core.o - kernel_fs.o - kernel_vm.o kernel_cache.o + kernel_core.o + kernel_debug.o kernel_device_manager.o kernel_disk_device_manager.o - kernel_util.o + kernel_fs.o kernel_messaging.o - kernel_debug.o + kernel_posix.o kernel_slab.o + kernel_util.o + kernel_vm.o lib$(TARGET_ARCH).a kernel_platform_$(TARGET_BOOT_PLATFORM).o @@ -83,8 +83,8 @@ KernelLd kernel_$(TARGET_ARCH) : # kernel parts borrowed from libroot and others kernel_os_main.o kernel_os_arch_$(TARGET_ARCH).o - kernel_posix.o - kernel_posix_arch_$(TARGET_ARCH).o + kernel_lib_posix.o + kernel_lib_posix_arch_$(TARGET_ARCH).o kernel_misc.o $(HAIKU_STATIC_LIBSUPC++) @@ -96,16 +96,17 @@ KernelLd kernel_$(TARGET_ARCH) : ; KernelLd kernel.so : - kernel_core.o - kernel_fs.o - kernel_vm.o kernel_cache.o + kernel_core.o + kernel_debug.o kernel_device_manager.o kernel_disk_device_manager.o - kernel_util.o + kernel_fs.o kernel_messaging.o - kernel_debug.o + kernel_posix.o kernel_slab.o + kernel_util.o + kernel_vm.o lib$(TARGET_ARCH).a kernel_platform_$(TARGET_BOOT_PLATFORM).o @@ -115,8 +116,8 @@ KernelLd kernel.so : # kernel libroot parts kernel_os_main.o kernel_os_arch_$(TARGET_ARCH).o - kernel_posix.o - kernel_posix_arch_$(TARGET_ARCH).o + kernel_lib_posix.o + kernel_lib_posix_arch_$(TARGET_ARCH).o $(HAIKU_STATIC_LIBSUPC++) @@ -153,6 +154,7 @@ SubInclude HAIKU_TOP src system kernel disk_device_manager ; SubInclude HAIKU_TOP src system kernel fs ; SubInclude HAIKU_TOP src system kernel lib ; SubInclude HAIKU_TOP src system kernel messaging ; +SubInclude HAIKU_TOP src system kernel posix ; SubInclude HAIKU_TOP src system kernel slab ; SubInclude HAIKU_TOP src system kernel util ; SubInclude HAIKU_TOP src system kernel vm ; diff --git a/src/system/kernel/lib/Jamfile b/src/system/kernel/lib/Jamfile index b37f0ecd6b..2b46ff5e6a 100644 --- a/src/system/kernel/lib/Jamfile +++ b/src/system/kernel/lib/Jamfile @@ -31,7 +31,7 @@ SEARCH_SOURCE += [ FDirName $(posixSources) sys ] ; SEARCH_SOURCE += [ FDirName $(posixSources) time ] ; SEARCH_SOURCE += [ FDirName $(posixSources) unistd ] ; -KernelMergeObject kernel_posix.o : +KernelMergeObject kernel_lib_posix.o : # main kernel_errno.c dirent.c @@ -129,7 +129,7 @@ KernelMergeObject kernel_os_arch_$(TARGET_ARCH).o : SEARCH_SOURCE += [ FDirName $(posixSources) arch $(TARGET_ARCH) ] ; SEARCH_SOURCE += [ FDirName $(posixSources) string arch $(TARGET_ARCH) ] ; -KernelMergeObject kernel_posix_arch_$(TARGET_ARCH).o : +KernelMergeObject kernel_lib_posix_arch_$(TARGET_ARCH).o : setjmp.S siglongjmp.S sigsetjmp.S diff --git a/src/system/kernel/main.c b/src/system/kernel/main.c index fcd9d9510e..8a573d0778 100644 --- a/src/system/kernel/main.c +++ b/src/system/kernel/main.c @@ -32,8 +32,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/src/system/kernel/posix/Jamfile b/src/system/kernel/posix/Jamfile new file mode 100644 index 0000000000..c649048a74 --- /dev/null +++ b/src/system/kernel/posix/Jamfile @@ -0,0 +1,9 @@ +SubDir HAIKU_TOP src system kernel posix ; + +UsePrivateHeaders shared ; + +KernelMergeObject kernel_posix.o : + realtime_sem.cpp + + : $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused +; diff --git a/src/system/kernel/realtime_sem.cpp b/src/system/kernel/posix/realtime_sem.cpp similarity index 99% rename from src/system/kernel/realtime_sem.cpp rename to src/system/kernel/posix/realtime_sem.cpp index 51d6314230..75c23ecec8 100644 --- a/src/system/kernel/realtime_sem.cpp +++ b/src/system/kernel/posix/realtime_sem.cpp @@ -3,7 +3,7 @@ * Distributed under the terms of the MIT License. */ -#include +#include #include diff --git a/src/system/kernel/syscalls.cpp b/src/system/kernel/syscalls.cpp index 1fab5e86ff..e2652b182a 100644 --- a/src/system/kernel/syscalls.cpp +++ b/src/system/kernel/syscalls.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/system/kernel/team.cpp b/src/system/kernel/team.cpp index fcbccfc826..d02b5acc88 100644 --- a/src/system/kernel/team.cpp +++ b/src/system/kernel/team.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/system/libroot/posix/semaphore.cpp b/src/system/libroot/posix/semaphore.cpp index 40f0788ae4..1e0830acd0 100644 --- a/src/system/libroot/posix/semaphore.cpp +++ b/src/system/libroot/posix/semaphore.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include