diff --git a/OvmfPkg/Library/XenHypercallLib/ArmXenHypercall.c b/OvmfPkg/Library/XenHypercallLib/ArmXenHypercall.c
new file mode 100644
index 0000000000..1f213d6e6f
--- /dev/null
+++ b/OvmfPkg/Library/XenHypercallLib/ArmXenHypercall.c
@@ -0,0 +1,25 @@
+/** @file
+  Xen Hypercall Library implementation for ARM architecture
+
+  Copyright (C) 2015, Red Hat, Inc.
+  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
+
+  This program and the accompanying materials are licensed and made available
+  under the terms and conditions of the BSD License that accompanies this
+  distribution. The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php.
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+
+#include <Base.h>
+
+RETURN_STATUS
+EFIAPI
+XenHypercallLibInit (
+  VOID
+  )
+{
+  return RETURN_SUCCESS;
+}
diff --git a/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf b/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
index efc26fefab..f4503a4b01 100644
--- a/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
+++ b/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf
@@ -18,10 +18,10 @@
   FILE_GUID                      = B5EE9A32-CA5A-49A8-82E3-ADA4CCB77C7C
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
+  CONSTRUCTOR                    = XenHypercallLibInit
 
 [Defines.IA32, Defines.X64]
   LIBRARY_CLASS                  = XenHypercallLib|DXE_DRIVER UEFI_DRIVER
-  CONSTRUCTOR                    = XenHypercallLibInit
 
 [Defines.ARM, Defines.AARCH64]
   LIBRARY_CLASS                  = XenHypercallLib
@@ -41,6 +41,9 @@
 [Sources.X64]
   X64/hypercall.nasm
 
+[Sources.ARM, Sources.AARCH64]
+  ArmXenHypercall.c
+
 [Sources.ARM]
   Arm/Hypercall.S