ArmPlatformPkg/PrePi: call all constructors by hand

Call ProcessLibraryConstructorList () to invoke all library constructors
by hand rather than calling only some of them explicitly.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index e5016ea45359f74e7688adb2504784070dde0dce..221bad55a3a50972122150bad0ce7d3c3594bfe7 100644 (file)
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -36,18 +36,6 @@
 UINT64 mSystemMemoryEnd = FixedPcdGet64(PcdSystemMemoryBase) +\r
                           FixedPcdGet64(PcdSystemMemorySize) - 1;\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-ExtractGuidedSectionLibConstructor (\r
-  VOID\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-LzmaDecompressLibConstructor (\r
-  VOID\r
-  );\r
-\r
 EFI_STATUS\r
 GetPlatformPpi (\r
   IN  EFI_GUID  *PpiGuid,\r
@@ -165,8 +153,7 @@ PrePiMain (
   PERF_START (NULL, "PEI", NULL, StartTimeStamp);\r
 \r
   // SEC phase needs to run library constructors by hand.\r
-  ExtractGuidedSectionLibConstructor ();\r
-  LzmaDecompressLibConstructor ();\r
+  ProcessLibraryConstructorList ();\r
 \r
   // Build HOBs to pass up our version of stuff the DXE Core needs to save space\r
   BuildPeCoffLoaderHob ();\r

diff --git a/ArmPlatformPkg/PrePi/PrePi.h b/ArmPlatformPkg/PrePi/PrePi.h
index e7f58e59240c92dd13c4bf7b36143d4b71d21455..39b11eba5993e274ac8811bacdcb91cbf162e3a6 100644 (file)
--- a/ArmPlatformPkg/PrePi/PrePi.h
+++ b/ArmPlatformPkg/PrePi/PrePi.h
@@ -87,4 +87,10 @@ ArchInitialize (
   VOID\r
   );\r
 \r
+VOID\r
+EFIAPI\r
+ProcessLibraryConstructorList (\r
+  VOID\r
+  );\r
+\r
 #endif /* _PREPI_H_ */\r