Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ArmVirtPkg: Fix dsc include ordering 

Fix the issue caused by ordering change in dsc include files
while enabling dynamic stack check.

Signed-off-by: Ashish Singhal <ashishsingha@nvidia.com>
This commit is contained in:
Ashish Singhal 2025-05-08 13:27:13 -06:00 committed by mergify[bot]
parent b2db39cefe
commit 399a40e5cb
7 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ArmVirtPkg/ArmVirt.dsc.inc
View File

@ -33,13 +33,6 @@
DEFINE FD_NUM_BLOCKS = 0x300
!endif
# Dynamic stack cookies are not supported on ARM
!if $(ARCH) == ARM
DEFINE CUSTOM_STACK_CHECK_LIB = STATIC
!else
DEFINE CUSTOM_STACK_CHECK_LIB = DYNAMIC
!endif
[BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000

6
ArmVirtPkg/ArmVirtCloudHv.dsc
View File

@ -28,7 +28,11 @@
DEFINE TTY_TERMINAL = FALSE
DEFINE SECURE_BOOT_ENABLE = FALSE
# This comes before MdeLibs to ensure stack cookie configuration is chosen
# This comes at the beginning of includes to pick all relevant defines early on.
!include ArmVirtPkg/ArmVirtStackCookies.dsc.inc
# This comes at the end of includes to pick all relevant components without any
# unintentional overrides.
!include ArmVirtPkg/ArmVirt.dsc.inc
[LibraryClasses.common]

9
ArmVirtPkg/ArmVirtKvmTool.dsc
View File

@ -30,9 +30,8 @@
[Defines.AARCH64]
DEFINE ACPIVIEW_ENABLE = TRUE
# This comes before MdeLibs to ensure stack cookie configuration is chosen
!include ArmVirtPkg/ArmVirt.dsc.inc
# This comes at the beginning of includes to pick all relevant defines early on.
!include ArmVirtPkg/ArmVirtStackCookies.dsc.inc
!if $(ARCH) == AARCH64
!include DynamicTablesPkg/DynamicTables.dsc.inc
@ -40,6 +39,10 @@
!include MdePkg/MdeLibs.dsc.inc
# This comes at the end of includes to pick all relevant components without any
# unintentional overrides.
!include ArmVirtPkg/ArmVirt.dsc.inc
[LibraryClasses.common]
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf

10
ArmVirtPkg/ArmVirtQemu.dsc
View File

@ -45,17 +45,21 @@
DEFINE NETWORK_ISCSI_ENABLE = FALSE
DEFINE NETWORK_PXE_BOOT_ENABLE = TRUE
# This comes at the beginning of includes to pick all relevant defines early on.
!include ArmVirtPkg/ArmVirtStackCookies.dsc.inc
!if $(NETWORK_SNP_ENABLE) == TRUE
!error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"
!endif
!include NetworkPkg/NetworkDefines.dsc.inc
# This comes before MdeLibs to ensure stack cookie configuration is chosen
!include ArmVirtPkg/ArmVirt.dsc.inc
!include MdePkg/MdeLibs.dsc.inc
# This comes at the end of includes to pick all relevant components without any
# unintentional overrides.
!include ArmVirtPkg/ArmVirt.dsc.inc
[LibraryClasses.common]
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf

10
ArmVirtPkg/ArmVirtQemuKernel.dsc
View File

@ -42,17 +42,21 @@
DEFINE NETWORK_ISCSI_ENABLE = FALSE
DEFINE NETWORK_PXE_BOOT_ENABLE = TRUE
# This comes at the beginning of includes to pick all relevant defines early on.
!include ArmVirtPkg/ArmVirtStackCookies.dsc.inc
!if $(NETWORK_SNP_ENABLE) == TRUE
!error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"
!endif
!include NetworkPkg/NetworkDefines.dsc.inc
# This comes before MdeLibs to ensure stack cookie configuration is chosen
!include ArmVirtPkg/ArmVirt.dsc.inc
!include MdePkg/MdeLibs.dsc.inc
# This comes at the end of includes to pick all relevant components without any
# unintentional overrides.
!include ArmVirtPkg/ArmVirt.dsc.inc
[LibraryClasses.common]
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf

16
ArmVirtPkg/ArmVirtStackCookies.dsc.inc Normal file
View File

@ -0,0 +1,16 @@
#
# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
[Defines]
# Dynamic stack cookies are not supported on ARM
!if $(ARCH) == ARM
DEFINE CUSTOM_STACK_CHECK_LIB = STATIC
!else
DEFINE CUSTOM_STACK_CHECK_LIB = DYNAMIC
!endif

8
ArmVirtPkg/ArmVirtXen.dsc
View File

@ -23,11 +23,15 @@
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = ArmVirtPkg/ArmVirtXen.fdf
# This comes before MdeLibs to ensure stack cookie configuration is chosen
!include ArmVirtPkg/ArmVirt.dsc.inc
# This comes at the beginning of includes to pick all relevant defines early on.
!include ArmVirtPkg/ArmVirtStackCookies.dsc.inc
!include MdePkg/MdeLibs.dsc.inc
# This comes at the end of includes to pick all relevant components without any
# unintentional overrides.
!include ArmVirtPkg/ArmVirt.dsc.inc
[LibraryClasses]
SerialPortLib|OvmfPkg/Library/XenConsoleSerialPortLib/XenConsoleSerialPortLib.inf
!if $(TARGET) != RELEASE