From 560a6c233286ec736a7a7c570efc68161c9953be Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Tue, 9 Jul 2024 16:49:29 +0200
Subject: MHR-36: newoskrnl: Adding support for ARM64 based UEFI machines, (EPM
 UEFI)

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Kernel/NewKit/CxxAbi.hpp |  4 ++--
 Kernel/NewKit/Macros.hpp | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'Kernel/NewKit')

diff --git a/Kernel/NewKit/CxxAbi.hpp b/Kernel/NewKit/CxxAbi.hpp
index 3f858e21..bcab19a7 100644
--- a/Kernel/NewKit/CxxAbi.hpp
+++ b/Kernel/NewKit/CxxAbi.hpp
@@ -7,7 +7,7 @@
 
 #include <NewKit/Defines.hpp>
 
-#ifdef __GNUC__
+#ifndef __NDK__
 
 #define kDSOMaxObjects (128)
 
@@ -25,4 +25,4 @@ namespace cxxabiv1
 	typedef void* __guard;
 }
 
-#endif // __GNUC__
\ No newline at end of file
+#endif // __GNUC__
diff --git a/Kernel/NewKit/Macros.hpp b/Kernel/NewKit/Macros.hpp
index b15cda51..913ad7cf 100644
--- a/Kernel/NewKit/Macros.hpp
+++ b/Kernel/NewKit/Macros.hpp
@@ -86,9 +86,9 @@
 #define END_STRING_ENUM() }
 #endif
 
-#ifndef Alloca
-#define Alloca(Sz) __builtin_alloca(Sz)
-#endif // #ifndef Alloca
+#ifndef ALLOCA
+#define ALLOCA(Sz) __builtin_alloca(Sz)
+#endif // #ifndef ALLOCA
 
 #ifndef CANT_REACH
 #define CANT_REACH() __builtin_unreachable()
@@ -107,8 +107,8 @@
 #define CONST const
 
 #define STRINGIFY(X)	#X
-#define NEWOS_UNUSED(X) ((void)X)
+#define NEWOS_UNUSED(X) ((Kernel::Void)X)
 
 #ifndef RGB
-#define RGB(R, G, B) (UInt32)(0x##R##G##B)
+#define RGB(R, G, B) (Kernel::UInt32)(R | G << 0x8 | B << 0x10)
 #endif // !RGB
-- 
cgit v1.2.3