diff options
| author | Vitaly Cheptsov <cheptsov@ispras.ru> | 2020-12-02 02:26:51 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-12-04 02:59:38 +0000 |
| commit | 31e8a47b62a4f3dc45d8f9bbf3529a188e867a87 (patch) | |
| tree | 38570155c683032a5592a5fa347ca66d62a1c45a /MdeModulePkg | |
| parent | 6af76adbbfccd31f4f8753fb0ddbbd9f4372f572 (diff) | |
| download | edk2-31e8a47b62a4f3dc45d8f9bbf3529a188e867a87.tar.gz | |
MdeModulePkg: Fix undefined reference to memcpy with XCODE5
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3098
XCODE5 toolchain in NOOPT mode generates memcpy when trying
to copy PEI_CORE_FV_HANDLE structure. This breaks OVMF
compilation with XCODE5.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Vitaly Cheptsov <cheptsov@ispras.ru>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Diffstat (limited to 'MdeModulePkg')
| -rw-r--r-- | MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c | 4 | ||||
| -rw-r--r-- | MdeModulePkg/Core/Pei/PeiMain.h | 2 | ||||
| -rw-r--r-- | MdeModulePkg/Core/Pei/Ppi/Ppi.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c index b9a279ec73..3369585bcc 100644 --- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c +++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c @@ -1256,13 +1256,13 @@ EvacuateTempRam ( }
for (FvIndex = 0; FvIndex < Private->FvCount; FvIndex++) {
if (Private->Fv[FvIndex].FvHandle == PeiCoreFvHandle.FvHandle) {
- PeiCoreFvHandle = Private->Fv[FvIndex];
+ CopyMem (&PeiCoreFvHandle, &Private->Fv[FvIndex], sizeof (PEI_CORE_FV_HANDLE));
break;
}
}
Status = EFI_SUCCESS;
- ConvertPeiCorePpiPointers (Private, PeiCoreFvHandle);
+ ConvertPeiCorePpiPointers (Private, &PeiCoreFvHandle);
for (FvIndex = 0; FvIndex < Private->FvCount; FvIndex++) {
FvHeader = Private->Fv[FvIndex].FvHeader;
diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h index c27e8fc33b..daa48b4c5f 100644 --- a/MdeModulePkg/Core/Pei/PeiMain.h +++ b/MdeModulePkg/Core/Pei/PeiMain.h @@ -542,7 +542,7 @@ ConvertPpiPointersFv ( VOID
ConvertPeiCorePpiPointers (
IN PEI_CORE_INSTANCE *PrivateData,
- PEI_CORE_FV_HANDLE CoreFvHandle
+ IN PEI_CORE_FV_HANDLE *CoreFvHandle
);
/**
diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c index 541047d98a..0ad71d116f 100644 --- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c +++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c @@ -1062,7 +1062,7 @@ ProcessPpiListFromSec ( VOID
ConvertPeiCorePpiPointers (
IN PEI_CORE_INSTANCE *PrivateData,
- PEI_CORE_FV_HANDLE CoreFvHandle
+ IN PEI_CORE_FV_HANDLE *CoreFvHandle
)
{
EFI_FV_FILE_INFO FileInfo;
@@ -1079,16 +1079,16 @@ ConvertPeiCorePpiPointers ( //
// Find the PEI Core in the BFV in temporary memory.
//
- Status = CoreFvHandle.FvPpi->FindFileByType (
- CoreFvHandle.FvPpi,
+ Status = CoreFvHandle->FvPpi->FindFileByType (
+ CoreFvHandle->FvPpi,
EFI_FV_FILETYPE_PEI_CORE,
- CoreFvHandle.FvHandle,
+ CoreFvHandle->FvHandle,
&PeiCoreFileHandle
);
ASSERT_EFI_ERROR (Status);
if (!EFI_ERROR (Status)) {
- Status = CoreFvHandle.FvPpi->GetFileInfo (CoreFvHandle.FvPpi, PeiCoreFileHandle, &FileInfo);
+ Status = CoreFvHandle->FvPpi->GetFileInfo (CoreFvHandle->FvPpi, PeiCoreFileHandle, &FileInfo);
ASSERT_EFI_ERROR (Status);
Status = PeiGetPe32Data (PeiCoreFileHandle, &PeiCoreImageBase);
|