MdeModulePkg: Don't build VarCheckUefiLib and DxeCore for EBC arch
authorLiming Gao <liming.gao@intel.com>
Tue, 30 Jan 2018 05:33:16 +0000 (13:33 +0800)
committerLiming Gao <liming.gao@intel.com>
Wed, 7 Feb 2018 01:16:16 +0000 (09:16 +0800)
EBC build failure is caused by d7a09cb86a0416c099fa3a9e0fbe2c8f399b28de.
It changes MAX_UINTN and MAX_ADDRESS definition as below. VarCheckUefiLib
and DxeCore uses MAX_UINTN and MAX_ADDRESS in the global data initialization.
New style has >> operator, and not supported by EBC compiler.
The fix is not to build VarCheckUefiLib and DxeCore for EBC arch.

#define MAX_UINTN  ((UINTN) ~0)
==>
#define MAX_UINTN  ((UINTN)(~0ULL >> (64 - sizeof (INTN) * 8)))

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
MdeModulePkg/MdeModulePkg.dsc

index dd7e9d5..1c0085a 100644 (file)
   MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf\r
   MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf\r
 \r
   MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf\r
   MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf\r
 \r
-  MdeModulePkg/Core/Dxe/DxeMain.inf {\r
-    <LibraryClasses>\r
-      NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf\r
-  }\r
   MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
   MdeModulePkg/Core/Pei/PeiMain.inf\r
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
   MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
   MdeModulePkg/Core/Pei/PeiMain.inf\r
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
   MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
   MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf\r
   MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf\r
   MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
   MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf\r
   MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf\r
-  MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf\r
   MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf\r
   MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf\r
   MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.inf\r
   MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf\r
   MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf\r
   MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.inf\r
   MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf\r
   MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfig.inf\r
 \r
   MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf\r
   MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfig.inf\r
 \r
-[Components.IA32, Components.X64, Components.Ebc]\r
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {\r
+[Components.IA32, Components.X64, Components.IPF, Components.ARM, Components.AARCH64]\r
+  MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf\r
+  MdeModulePkg/Core/Dxe/DxeMain.inf {\r
     <LibraryClasses>\r
     <LibraryClasses>\r
-      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf\r
-      NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf\r
-      NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf\r
+      NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf\r
   }\r
   }\r
+\r
+[Components.IA32, Components.X64, Components.Ebc]\r
   MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf\r
   \r
 [Components.IA32, Components.X64]\r
   MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf\r
   \r
 [Components.IA32, Components.X64]\r
       NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf\r
       NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf\r
   }\r
       NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf\r
       NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf\r
   }\r
+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf\r
+      NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf\r
+      NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf\r
+  }\r
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf\r
   MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf\r
   MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf\r
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf\r
   MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf\r
   MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf\r