From 50e74de279b62a7df8a913f602d3124a895f51fc Mon Sep 17 00:00:00 2001 From: Timon Kruiper Date: Wed, 12 Oct 2022 22:56:06 +0200 Subject: [PATCH] Kernel: Add StdLib.cpp and UserOrKernelBuffer.cpp to aarch64 build Also remove UserOrKernelBuffer::{read, write} and __stack_chk_fail from Dummy.cpp and init.cpp respectively. --- Kernel/Arch/aarch64/Dummy.cpp | 17 ----------------- Kernel/Arch/aarch64/init.cpp | 6 ------ Kernel/CMakeLists.txt | 2 ++ 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/Kernel/Arch/aarch64/Dummy.cpp b/Kernel/Arch/aarch64/Dummy.cpp index 63fef4d865..c84cfcb7b0 100644 --- a/Kernel/Arch/aarch64/Dummy.cpp +++ b/Kernel/Arch/aarch64/Dummy.cpp @@ -111,23 +111,6 @@ ErrorOr Inode::write_bytes(off_t, size_t, UserOrKernelBuffer const&, Ope } -// UserOrKernelBuffer.cpp -namespace Kernel { - -ErrorOr UserOrKernelBuffer::write(void const*, size_t, size_t) -{ - VERIFY_NOT_REACHED(); - return {}; -} - -ErrorOr UserOrKernelBuffer::read(void*, size_t, size_t) const -{ - VERIFY_NOT_REACHED(); - return {}; -} - -} - // x86 init multiboot_module_entry_t multiboot_copy_boot_modules_array[16]; diff --git a/Kernel/Arch/aarch64/init.cpp b/Kernel/Arch/aarch64/init.cpp index b2a1029225..a01940205b 100644 --- a/Kernel/Arch/aarch64/init.cpp +++ b/Kernel/Arch/aarch64/init.cpp @@ -65,12 +65,6 @@ extern ctor_func_t end_ctors[]; // FIXME: Share this with the Intel Prekernel. extern size_t __stack_chk_guard; size_t __stack_chk_guard; -extern "C" [[noreturn]] void __stack_chk_fail(); - -void __stack_chk_fail() -{ - Kernel::Processor::halt(); -} READONLY_AFTER_INIT bool g_in_early_boot; diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 7a9d2cd397..f6420c5357 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -485,7 +485,9 @@ else() KString.cpp KSyms.cpp MiniStdLib.cpp + StdLib.cpp UBSanitizer.cpp + UserOrKernelBuffer.cpp Devices/DeviceManagement.cpp