summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuiyu Ni <ruiyu.ni@intel.com>2017-11-27 09:38:08 +0800
committerRuiyu Ni <ruiyu.ni@intel.com>2017-11-29 10:42:25 +0800
commit46c6b956affbbbe9514a37e901fad17fab84a63f (patch)
tree4d300b9f6a7e1bdfa13e72bef4b879874393718d
parentff5a4bcff3e2afe4a94e62d457ccfc5361590067 (diff)
downloadedk2-46c6b956affbbbe9514a37e901fad17fab84a63f.tar.gz
edk2-46c6b956affbbbe9514a37e901fad17fab84a63f.tar.bz2
edk2-46c6b956affbbbe9514a37e901fad17fab84a63f.zip
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>
-rw-r--r--OvmfPkg/Sec/X64/SecEntry.nasm6
1 files changed, 2 insertions, 4 deletions
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