From: Ruiyu Ni <ruiyu.ni@intel.com>
Date: Mon, 27 Nov 2017 01:38:08 +0000 (+0800)
Subject: OvmfPkg/Sec: Fix 64bit SEC build failure
X-Git-Tag: edk2-stable201903~2989
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=46c6b956affbbbe9514a37e901fad17fab84a63f

OvmfPkg/Sec: Fix 64bit SEC build failure

Original code breaks a single assembly code to multiple lines.
But, when VS CL.exe preprocesses the FixedPcdGet32() macro
invocation to the replacement text, it loses '\', and causes
NASM to fail.

Changing the multiple lines to one line to resolve the build failure.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---

diff --git a/OvmfPkg/Sec/X64/SecEntry.nasm b/OvmfPkg/Sec/X64/SecEntry.nasm
index 7c55032ac9..d76adcffd8 100644
--- a/OvmfPkg/Sec/X64/SecEntry.nasm
+++ b/OvmfPkg/Sec/X64/SecEntry.nasm
@@ -45,10 +45,8 @@ ASM_PFX(_ModuleEntryPoint):
     ; Fill the temporary RAM with the initial stack value.
     ; The loop below will seed the heap as well, but that's harmless.
     ;
-    mov     rax, (FixedPcdGet32 (                        \
-                    PcdInitValueInTempStack              \
-                    ) << 32) |                           \
-                 FixedPcdGet32 (PcdInitValueInTempStack)      ; qword to store
+    mov     rax, (FixedPcdGet32 (PcdInitValueInTempStack) << 32) | FixedPcdGet32 (PcdInitValueInTempStack)
+                                                              ; qword to store
     mov     rdi, FixedPcdGet32 (PcdOvmfSecPeiTempRamBase)     ; base address,
                                                               ;   relative to
                                                               ;   ES