MdePkg/ProcessorBind: add defines for page allocation granularity

[mirror_edk2.git] / MdePkg / Include / Arm / ProcessorBind.h

diff --git a/MdePkg/Include/Arm/ProcessorBind.h b/MdePkg/Include/Arm/ProcessorBind.h
index 8207044684d7743db0c73ed57614dd717a88cadb..dde1fd1152bab6dba64cb3fea1023903441a177c 100644 (file)
--- a/MdePkg/Include/Arm/ProcessorBind.h
+++ b/MdePkg/Include/Arm/ProcessorBind.h
@@ -28,9 +28,16 @@
 #pragma pack()\r
 #endif\r
 \r
+//\r
+// RVCT does not support the __builtin_unreachable() macro\r
+//\r
+#ifdef __ARMCC_VERSION\r
+#define UNREACHABLE()\r
+#endif\r
+\r
 #if _MSC_EXTENSIONS \r
   //\r
-  // use Microsoft* C complier dependent integer width types \r
+  // use Microsoft* C compiler dependent integer width types\r
   //\r
   typedef unsigned __int64    UINT64;\r
   typedef __int64             INT64;\r
@@ -103,6 +110,12 @@ typedef INT32   INTN;
 ///\r
 #define CPU_STACK_ALIGNMENT  sizeof(UINT64)\r
 \r
+///\r
+/// Page allocation granularity for ARM\r
+///\r
+#define DEFAULT_PAGE_ALLOCATION_GRANULARITY   (0x1000)\r
+#define RUNTIME_PAGE_ALLOCATION_GRANULARITY   (0x1000)\r
+\r
 //\r
 // Modifier to ensure that all protocol member functions and EFI intrinsics\r
 // use the correct C calling convention. All protocol member functions and\r
@@ -110,7 +123,9 @@ typedef INT32   INTN;
 //\r
 #define EFIAPI    \r
 \r
-#if defined(__GNUC__)\r
+// When compiling with Clang, we still use GNU as for the assembler, so we still\r
+// need to define the GCC_ASM* macros.\r
+#if defined(__GNUC__) || defined(__clang__)\r
   ///\r
   /// For GNU assembly code, .global or .globl can declare global symbols.\r
   /// Define this macro to unify the usage.\r
@@ -158,6 +173,10 @@ typedef INT32   INTN;
 **/\r
 #define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)\r
 \r
+#ifndef __USER_LABEL_PREFIX__\r
+#define __USER_LABEL_PREFIX__\r
+#endif\r
+\r
 #endif\r
 \r
 \r