OK. I will revert this at first. Let's figure out a right solution.
Acked-by: Jiewen Yao <[email protected]> > -----Original Message----- > From: [email protected] <[email protected]> On Behalf Of Gerd > Hoffmann > Sent: Friday, June 10, 2022 7:03 PM > To: [email protected] > Cc: Oliver Steffen <[email protected]>; James Bottomley > <[email protected]>; Tom Lendacky <[email protected]>; Gerd > Hoffmann <[email protected]>; Justen, Jordan L <[email protected]>; > Chen, Christine <[email protected]>; Brijesh Singh > <[email protected]>; Aktas, Erdem <[email protected]>; Yao, > Jiewen <[email protected]>; Gao, Liming <[email protected]>; > Ard Biesheuvel <[email protected]>; Pawel Polawski > <[email protected]>; Feng, Bob C <[email protected]>; Xu, Min M > <[email protected]> > Subject: [edk2-devel] [PATCH v6 1/3] Revert "OvmfPkg/Sec: fix stack switch" > > This reverts commit ff36b2550f94dc5fac838cf298ae5a23cfddf204. > > Has no effect because GCC_IA32_CC_FLAGS and GCC_X64_CC_FLAGS are > unused. > > Signed-off-by: Gerd Hoffmann <[email protected]> > --- > OvmfPkg/Sec/SecMain.c | 4 ---- > BaseTools/Conf/tools_def.template | 6 +++--- > 2 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c > index 3ca0dcdfd3dd..1167d22a68cc 100644 > --- a/OvmfPkg/Sec/SecMain.c > +++ b/OvmfPkg/Sec/SecMain.c > @@ -1052,15 +1052,11 @@ TemporaryRamMigration ( > if (SetJump (&JumpBuffer) == 0) { > #if defined (MDE_CPU_IA32) > JumpBuffer.Esp = JumpBuffer.Esp + DebugAgentContext.StackMigrateOffset; > - #ifndef OMIT_FRAME_POINTER > JumpBuffer.Ebp = JumpBuffer.Ebp + DebugAgentContext.StackMigrateOffset; > #endif > - #endif > #if defined (MDE_CPU_X64) > JumpBuffer.Rsp = JumpBuffer.Rsp + DebugAgentContext.StackMigrateOffset; > - #ifndef OMIT_FRAME_POINTER > JumpBuffer.Rbp = JumpBuffer.Rbp + DebugAgentContext.StackMigrateOffset; > - #endif > #endif > LongJump (&JumpBuffer, (UINTN)-1); > } > diff --git a/BaseTools/Conf/tools_def.template > b/BaseTools/Conf/tools_def.template > index adcd23f7273f..5ed19810b727 100755 > --- a/BaseTools/Conf/tools_def.template > +++ b/BaseTools/Conf/tools_def.template > @@ -1849,9 +1849,9 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add- > gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N > *_*_*_DTC_PATH = DEF(DTC_BIN) > > DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno- > strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno- > common > -DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign- > double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg- > probe -fno-omit-frame-pointer > -DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone - > Wno-address -mno-stack-arg-probe -fomit-frame-pointer - > DOMIT_FRAME_POINTER=1 > -DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian > -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata- > sections -fomit-frame-pointer -DOMIT_FRAME_POINTER=1 -Wno-address - > mthumb -mfloat-abi=soft -fno-pic -fno-pie > +DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign- > double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg- > probe > +DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone > -Wno-address -mno-stack-arg-probe > +DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian > -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata- > sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft -fno-pic > -fno-pie > DEFINE GCC_ARM_CC_XIPFLAGS = -mno-unaligned-access > DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle- > endian -fno-short-enums -fverbose-asm -funsigned-char -ffunction-sections - > fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind- > tables -fno-pic -fno-pie -ffixed-x18 > DEFINE GCC_AARCH64_CC_XIPFLAGS = -mstrict-align -mgeneral-regs-only > -- > 2.36.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90444): https://edk2.groups.io/g/devel/message/90444 Mute This Topic: https://groups.io/mt/91665753/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
