From adfdda5fca59a89be73f13ba56789e1604c0a33b Mon Sep 17 00:00:00 2001 From: Mikhail Krichanov Date: Sun, 12 Mar 2023 09:56:45 +0300 Subject: [PATCH] Build: Removed unnecessary !include MdePkg/MdeBuildOptions.dsc.inc. --- Ext4Pkg/Ext4Pkg.dsc | 2 -- FatPkg/FatPkg.dsc | 2 -- IntelFsp2Pkg/IntelFsp2Pkg.dsc | 2 -- IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc | 2 -- MdeModulePkg/MdeModulePkg.dsc | 2 +- MdePkg/MdeBuildOptions.dsc.inc | 1 + NetworkPkg/NetworkPkg.dsc | 1 - UefiCpuPkg/UefiCpuPkg.dsc | 2 -- UefiPayloadPkg/UefiPayloadPkg.dsc | 2 -- UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc | 2 -- 10 files changed, 2 insertions(+), 16 deletions(-) diff --git a/Ext4Pkg/Ext4Pkg.dsc b/Ext4Pkg/Ext4Pkg.dsc index 8b72de289d..e85e2fb40b 100644 --- a/Ext4Pkg/Ext4Pkg.dsc +++ b/Ext4Pkg/Ext4Pkg.dsc @@ -20,8 +20,6 @@ BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT -!include MdePkg/MdeBuildOptions.dsc.inc - [BuildOptions] *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES diff --git a/FatPkg/FatPkg.dsc b/FatPkg/FatPkg.dsc index 00f89e7229..e377c25ea1 100644 --- a/FatPkg/FatPkg.dsc +++ b/FatPkg/FatPkg.dsc @@ -21,8 +21,6 @@ BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT -!include MdePkg/MdeBuildOptions.dsc.inc - [BuildOptions] GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG INTEL:RELEASE_*_*_CC_FLAGS = /D MDEPKG_NDEBUG diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.dsc b/IntelFsp2Pkg/IntelFsp2Pkg.dsc index 8988f89c06..0713f0028d 100644 --- a/IntelFsp2Pkg/IntelFsp2Pkg.dsc +++ b/IntelFsp2Pkg/IntelFsp2Pkg.dsc @@ -81,7 +81,5 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80080046 gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07 -!include MdePkg/MdeBuildOptions.dsc.inc - [BuildOptions] *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc index 33ccde7f05..db5da76660 100644 --- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc +++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc @@ -101,7 +101,5 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80080046 gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07 -!include MdePkg/MdeBuildOptions.dsc.inc - [BuildOptions] *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index 643fda1ee4..e4086ef8e6 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -516,4 +516,4 @@ [Components.X64] MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf -!include MdePkg/MdeBuildOptions.dsc.inc +[BuildOptions] diff --git a/MdePkg/MdeBuildOptions.dsc.inc b/MdePkg/MdeBuildOptions.dsc.inc index 4992dca44a..366ead76d2 100644 --- a/MdePkg/MdeBuildOptions.dsc.inc +++ b/MdePkg/MdeBuildOptions.dsc.inc @@ -33,4 +33,5 @@ MSFT:*_*_*_DLINK_FLAGS = /MERGE:.rdata=.text CLANGPDB:*_*_*_DLINK_FLAGS = /MERGE:.rdata=.text XCODE:*_*_*_DLINK_FLAGS = -rename_section __DATA_CONST __text_const __TEXT __const -rename_section __DATA_CONST __cstring __TEXT __cstring -rename_section __DATA_CONST __ustring __TEXT __ustring -rename_section __DATA_CONST __const __TEXT __data_const + # GCC/CLANGGCC: To enable this feature uncomment MERGE_RODATA_INTO_TEXT definition in tools_def.txt. !endif diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc index e26b3e5c35..fc4fa5979a 100644 --- a/NetworkPkg/NetworkPkg.dsc +++ b/NetworkPkg/NetworkPkg.dsc @@ -132,7 +132,6 @@ NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf !include NetworkPkg/Network.dsc.inc -!include MdePkg/MdeBuildOptions.dsc.inc [BuildOptions] *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc index 904f8f0bde..70d37c12e8 100644 --- a/UefiCpuPkg/UefiCpuPkg.dsc +++ b/UefiCpuPkg/UefiCpuPkg.dsc @@ -185,7 +185,5 @@ [Components.X64] UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/DxeCpuExceptionHandlerLibUnitTest.inf -!include MdePkg/MdeBuildOptions.dsc.inc - [BuildOptions] *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc index c284b7a49f..655f1d8438 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -134,8 +134,6 @@ DEFINE MULTIPLE_DEBUG_PORT_SUPPORT = FALSE -!include MdePkg/MdeBuildOptions.dsc.inc - [BuildOptions] *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES !if $(USE_CBMEM_FOR_CONSOLE) == FALSE diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc b/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc index 23f706d1aa..8adf690098 100644 --- a/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc +++ b/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc @@ -56,8 +56,6 @@ [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 -!include MdePkg/MdeBuildOptions.dsc.inc - [BuildOptions] MSFT:*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES -D EDKII_UNIT_TEST_FRAMEWORK_ENABLED GCC:*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES -D EDKII_UNIT_TEST_FRAMEWORK_ENABLED