From 031b0c76b55d902e4ab1e1a57fa3c7865eb51ce0 Mon Sep 17 00:00:00 2001
From: James Mintram <me@jamesrm.com>
Date: Sat, 2 Apr 2022 23:46:09 +0100
Subject: [PATCH] Kernel: Re-add dummy.cpp and remove duplicate definitions

---
 Kernel/Arch/aarch64/dummy.cpp | 12 ------------
 Kernel/CMakeLists.txt         |  2 ++
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Kernel/Arch/aarch64/dummy.cpp b/Kernel/Arch/aarch64/dummy.cpp
index 0d2fb587cd..5d3b464d00 100644
--- a/Kernel/Arch/aarch64/dummy.cpp
+++ b/Kernel/Arch/aarch64/dummy.cpp
@@ -9,23 +9,11 @@
 #include <Kernel/KSyms.h>
 #include <Kernel/Sections.h>
 
-// init.cpp
-extern size_t __stack_chk_guard;
-READONLY_AFTER_INIT size_t __stack_chk_guard;
-
 // This is a temporary file to get a non-empty Kernel binary on aarch64.
 // The prekernel currently never jumps to the kernel. This is dead code.
 void dummy();
 void dummy() { }
 
-// Assertions.h
-[[noreturn]] void __assertion_failed(char const*, char const*, unsigned, char const*);
-
-[[noreturn]] void __assertion_failed(char const*, char const*, unsigned, char const*)
-{
-    for (;;) { }
-}
-
 // kmalloc.h
 size_t kmalloc_good_size(size_t);
 size_t kmalloc_good_size(size_t) { return 0; }
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index e64e6e3ca4..d6ed90323f 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -397,6 +397,8 @@ else()
         Arch/aarch64/UART.cpp
         Arch/aarch64/Utils.cpp
 
+        Arch/aarch64/Dummy.cpp
+
         # Preload specific
         Arch/aarch64/init.cpp
         Arch/aarch64/PrekernelMMU.cpp