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>

2 files changed, 7 insertions, 14 deletions

diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index e5016ea453..221bad55a3 100644
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -37,18 +37,6 @@ UINT64 mSystemMemoryEnd = FixedPcdGet64(PcdSystemMemoryBase) +
                           FixedPcdGet64(PcdSystemMemorySize) - 1;

 

 EFI_STATUS

-EFIAPI

-ExtractGuidedSectionLibConstructor (

-  VOID

-  );

-

-EFI_STATUS

-EFIAPI

-LzmaDecompressLibConstructor (

-  VOID

-  );

-

-EFI_STATUS

 GetPlatformPpi (

   IN  EFI_GUID  *PpiGuid,

   OUT VOID      **Ppi

@@ -165,8 +153,7 @@ PrePiMain (
   PERF_START (NULL, "PEI", NULL, StartTimeStamp);

 

   // SEC phase needs to run library constructors by hand.

-  ExtractGuidedSectionLibConstructor ();

-  LzmaDecompressLibConstructor ();

+  ProcessLibraryConstructorList ();

 

   // Build HOBs to pass up our version of stuff the DXE Core needs to save space

   BuildPeCoffLoaderHob ();

diff --git a/ArmPlatformPkg/PrePi/PrePi.h b/ArmPlatformPkg/PrePi/PrePi.h
index e7f58e5924..39b11eba59 100644
--- a/ArmPlatformPkg/PrePi/PrePi.h
+++ b/ArmPlatformPkg/PrePi/PrePi.h
@@ -87,4 +87,10 @@ ArchInitialize (
   VOID

   );

 

+VOID

+EFIAPI

+ProcessLibraryConstructorList (

+  VOID

+  );

+

 #endif /* _PREPI_H_ */