From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.41386.1674638473891260091 for ; Wed, 25 Jan 2023 01:21:14 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: pierre.gondois@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 400414B3; Wed, 25 Jan 2023 01:21:55 -0800 (PST) Received: from cam-smtp0.cambridge.arm.com (pierre123.nice.arm.com [10.34.100.128]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2FF803F5A1; Wed, 25 Jan 2023 01:21:12 -0800 (PST) From: "PierreGondois" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao , Yuwei Chen , Leif Lindholm , Ard Biesheuvel , Sami Mujawar , Laszlo Ersek Subject: [PATCH 1/1] tools_def: Remove duplicated -Os Date: Wed, 25 Jan 2023 10:20:59 +0100 Message-Id: <20230125092059.497721-1-pierre.gondois@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Pierre Gondois BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2928 commit 17bd834eb5fd ("BaseTools: Factorize GCC flags") makes GCC48_ALL_CC_FLAGS inherit from GCC_ALL_CC_FLAGS. GCC_ALL_CC_FLAGS contains the '-Os' flag. The latest flag in a command line overrides the previous optimization option. This allows more specific build configuration to override the inherited '-Os' flag. If a build configuration includes GCC48_ALL_CC_FLAGS, hard-coded '-Os' options are not necessary anymore. Remove them. Reported-by: Laszlo Ersek Signed-off-by: Pierre Gondois --- BaseTools/Conf/tools_def.template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def= .template index 380d4587335a..f77e936c0453 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -2024,8 +2024,8 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS =3D -mab= i=3Dlp64d -march=3Dloongarch64 DEF( *_GCC48_IA32_OBJCOPY_FLAGS =3D *_GCC48_IA32_NASM_FLAGS =3D -f elf32 =20 - DEBUG_GCC48_IA32_CC_FLAGS =3D DEF(GCC48_IA32_CC_FLAGS) -Os -RELEASE_GCC48_IA32_CC_FLAGS =3D DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-= unused-but-set-variable + DEBUG_GCC48_IA32_CC_FLAGS =3D DEF(GCC48_IA32_CC_FLAGS) +RELEASE_GCC48_IA32_CC_FLAGS =3D DEF(GCC48_IA32_CC_FLAGS) -Wno-unus= ed-but-set-variable NOOPT_GCC48_IA32_CC_FLAGS =3D DEF(GCC48_IA32_CC_FLAGS) -O0 =20 ################## @@ -2052,8 +2052,8 @@ RELEASE_GCC48_IA32_CC_FLAGS =3D DEF(GCC48_IA3= 2_CC_FLAGS) -Os -Wno-unused-but *_GCC48_X64_OBJCOPY_FLAGS =3D *_GCC48_X64_NASM_FLAGS =3D -f elf64 =20 - DEBUG_GCC48_X64_CC_FLAGS =3D DEF(GCC48_X64_CC_FLAGS) -Os -RELEASE_GCC48_X64_CC_FLAGS =3D DEF(GCC48_X64_CC_FLAGS) -Os -Wno-un= used-but-set-variable + DEBUG_GCC48_X64_CC_FLAGS =3D DEF(GCC48_X64_CC_FLAGS) +RELEASE_GCC48_X64_CC_FLAGS =3D DEF(GCC48_X64_CC_FLAGS) -Wno-unused= -but-set-variable NOOPT_GCC48_X64_CC_FLAGS =3D DEF(GCC48_X64_CC_FLAGS) -O0 =20 ################## @@ -2161,8 +2161,8 @@ RELEASE_GCC48_AARCH64_CC_FLAGS =3D DEF(GCC48_AARC= H64_CC_FLAGS) -Wno-unused-but-s *_GCC49_IA32_OBJCOPY_FLAGS =3D *_GCC49_IA32_NASM_FLAGS =3D -f elf32 =20 - DEBUG_GCC49_IA32_CC_FLAGS =3D DEF(GCC49_IA32_CC_FLAGS) -Os -RELEASE_GCC49_IA32_CC_FLAGS =3D DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-= unused-but-set-variable -Wno-unused-const-variable + DEBUG_GCC49_IA32_CC_FLAGS =3D DEF(GCC49_IA32_CC_FLAGS) +RELEASE_GCC49_IA32_CC_FLAGS =3D DEF(GCC49_IA32_CC_FLAGS) -Wno-unus= ed-but-set-variable -Wno-unused-const-variable NOOPT_GCC49_IA32_CC_FLAGS =3D DEF(GCC49_IA32_CC_FLAGS) -O0 =20 ################## @@ -2189,8 +2189,8 @@ RELEASE_GCC49_IA32_CC_FLAGS =3D DEF(GCC49_IA3= 2_CC_FLAGS) -Os -Wno-unused-but *_GCC49_X64_OBJCOPY_FLAGS =3D *_GCC49_X64_NASM_FLAGS =3D -f elf64 =20 - DEBUG_GCC49_X64_CC_FLAGS =3D DEF(GCC49_X64_CC_FLAGS) -Os -RELEASE_GCC49_X64_CC_FLAGS =3D DEF(GCC49_X64_CC_FLAGS) -Os -Wno-un= used-but-set-variable -Wno-unused-const-variable + DEBUG_GCC49_X64_CC_FLAGS =3D DEF(GCC49_X64_CC_FLAGS) +RELEASE_GCC49_X64_CC_FLAGS =3D DEF(GCC49_X64_CC_FLAGS) -Wno-unused= -but-set-variable -Wno-unused-const-variable NOOPT_GCC49_X64_CC_FLAGS =3D DEF(GCC49_X64_CC_FLAGS) -O0 =20 ################## @@ -2304,10 +2304,10 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS =3D -z commo= n-page-size=3D0x20 *_GCC5_IA32_OBJCOPY_FLAGS =3D *_GCC5_IA32_NASM_FLAGS =3D -f elf32 =20 - DEBUG_GCC5_IA32_CC_FLAGS =3D DEF(GCC5_IA32_CC_FLAGS) -flto -Os + DEBUG_GCC5_IA32_CC_FLAGS =3D DEF(GCC5_IA32_CC_FLAGS) -flto DEBUG_GCC5_IA32_DLINK_FLAGS =3D DEF(GCC5_IA32_X64_DLINK_FLAGS) -flt= o -Os -Wl,-m,elf_i386,--oformat=3Delf32-i386 =20 -RELEASE_GCC5_IA32_CC_FLAGS =3D DEF(GCC5_IA32_CC_FLAGS) -flto -Os -= Wno-unused-but-set-variable -Wno-unused-const-variable +RELEASE_GCC5_IA32_CC_FLAGS =3D DEF(GCC5_IA32_CC_FLAGS) -flto -Wno-= unused-but-set-variable -Wno-unused-const-variable RELEASE_GCC5_IA32_DLINK_FLAGS =3D DEF(GCC5_IA32_X64_DLINK_FLAGS) -flt= o -Os -Wl,-m,elf_i386,--oformat=3Delf32-i386 =20 NOOPT_GCC5_IA32_CC_FLAGS =3D DEF(GCC5_IA32_CC_FLAGS) -O0 @@ -2336,10 +2336,10 @@ RELEASE_GCC5_IA32_DLINK_FLAGS =3D DEF(GCC5_IA3= 2_X64_DLINK_FLAGS) -flto -Os -Wl, *_GCC5_X64_OBJCOPY_FLAGS =3D *_GCC5_X64_NASM_FLAGS =3D -f elf64 =20 - DEBUG_GCC5_X64_CC_FLAGS =3D DEF(GCC5_X64_CC_FLAGS) -flto -DUSIN= G_LTO -Os + DEBUG_GCC5_X64_CC_FLAGS =3D DEF(GCC5_X64_CC_FLAGS) -flto -DUSIN= G_LTO DEBUG_GCC5_X64_DLINK_FLAGS =3D DEF(GCC5_X64_DLINK_FLAGS) -flto -Os =20 -RELEASE_GCC5_X64_CC_FLAGS =3D DEF(GCC5_X64_CC_FLAGS) -flto -DUSIN= G_LTO -Os -Wno-unused-but-set-variable -Wno-unused-const-variable +RELEASE_GCC5_X64_CC_FLAGS =3D DEF(GCC5_X64_CC_FLAGS) -flto -DUSIN= G_LTO -Wno-unused-but-set-variable -Wno-unused-const-variable RELEASE_GCC5_X64_DLINK_FLAGS =3D DEF(GCC5_X64_DLINK_FLAGS) -flto -Os =20 NOOPT_GCC5_X64_CC_FLAGS =3D DEF(GCC5_X64_CC_FLAGS) -O0 --=20 2.25.1