  
  [libraries.common]  
    EfiShellLib
+@@ -72,7 +72,11 @@
+ 
+ [nmake.common]
+   IMAGE_ENTRY_POINT=InitializeMode
++
++[nmake.IA32, nmake.EBC, nmake.X64, nmake.IPF]
+   C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings 
+   C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
+   C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_BOOTSHELL
+ 
++[nmake.ARM, nmake.AARCH64]
++  C_STD_FLAGS = $(C_STD_FLAGS) -DEFI_BOOTSHELL
 Index: mode/mode.c
 ===================================================================
 --- mode/mode.c	(revision 64)

 
 [libraries.common]  
   EfiShellLib
Index: drvcfg/drvcfg.c
===================================================================
--- drvcfg/drvcfg.c	(revision 64)

 
 [libraries.common]
   EdkFrameworkProtocolLib
@@ -81,4 +89,7 @@
   EfiGuidLib
   EdkGuidLib
 
+[libraries.ARM]
+  CompilerIntrinsicsLib, CompilerIntrinsicsLib
+
 [nmake.common]
Index: Library/IA32/efilibplat.h
