diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
index 9b014b9fc6..0c8b04f7fa 100644
--- a/StdLib/StdLib.inc
+++ b/StdLib/StdLib.inc
@@ -69,6 +69,9 @@
 [LibraryClasses.ARM]
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
 
+[LibraryClasses.AArch64]
+  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+
 [Components]
 # BaseLib and BaseMemoryLib need to be built with the /GL- switch when using the Microsoft
 # tool chain.  This is required so that the library functions can be resolved during