On Wed, 25 Jan 2023 at 10:21, <pierre.gond...@arm.com> wrote:
>
> From: Pierre Gondois <pierre.gond...@arm.com>
>
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2928
>
> 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 <ler...@redhat.com>
> Signed-off-by: Pierre Gondois <pierre.gond...@arm.com>

Acked-by: Ard Biesheuvel <a...@kernel.org>

> ---
>  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           = 
> -mabi=lp64d -march=loongarch64 DEF(
>  *_GCC48_IA32_OBJCOPY_FLAGS        =
>  *_GCC48_IA32_NASM_FLAGS           = -f elf32
>
> -  DEBUG_GCC48_IA32_CC_FLAGS       = DEF(GCC48_IA32_CC_FLAGS) -Os
> -RELEASE_GCC48_IA32_CC_FLAGS       = DEF(GCC48_IA32_CC_FLAGS) -Os 
> -Wno-unused-but-set-variable
> +  DEBUG_GCC48_IA32_CC_FLAGS       = DEF(GCC48_IA32_CC_FLAGS)
> +RELEASE_GCC48_IA32_CC_FLAGS       = DEF(GCC48_IA32_CC_FLAGS) 
> -Wno-unused-but-set-variable
>    NOOPT_GCC48_IA32_CC_FLAGS       = DEF(GCC48_IA32_CC_FLAGS) -O0
>
>  ##################
> @@ -2052,8 +2052,8 @@ RELEASE_GCC48_IA32_CC_FLAGS       = 
> DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-unused-but
>  *_GCC48_X64_OBJCOPY_FLAGS        =
>  *_GCC48_X64_NASM_FLAGS           = -f elf64
>
> -  DEBUG_GCC48_X64_CC_FLAGS       = DEF(GCC48_X64_CC_FLAGS) -Os
> -RELEASE_GCC48_X64_CC_FLAGS       = DEF(GCC48_X64_CC_FLAGS) -Os 
> -Wno-unused-but-set-variable
> +  DEBUG_GCC48_X64_CC_FLAGS       = DEF(GCC48_X64_CC_FLAGS)
> +RELEASE_GCC48_X64_CC_FLAGS       = DEF(GCC48_X64_CC_FLAGS) 
> -Wno-unused-but-set-variable
>    NOOPT_GCC48_X64_CC_FLAGS       = DEF(GCC48_X64_CC_FLAGS) -O0
>
>  ##################
> @@ -2161,8 +2161,8 @@ RELEASE_GCC48_AARCH64_CC_FLAGS   = 
> DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
>  *_GCC49_IA32_OBJCOPY_FLAGS        =
>  *_GCC49_IA32_NASM_FLAGS           = -f elf32
>
> -  DEBUG_GCC49_IA32_CC_FLAGS       = DEF(GCC49_IA32_CC_FLAGS) -Os
> -RELEASE_GCC49_IA32_CC_FLAGS       = DEF(GCC49_IA32_CC_FLAGS) -Os 
> -Wno-unused-but-set-variable -Wno-unused-const-variable
> +  DEBUG_GCC49_IA32_CC_FLAGS       = DEF(GCC49_IA32_CC_FLAGS)
> +RELEASE_GCC49_IA32_CC_FLAGS       = DEF(GCC49_IA32_CC_FLAGS) 
> -Wno-unused-but-set-variable -Wno-unused-const-variable
>    NOOPT_GCC49_IA32_CC_FLAGS       = DEF(GCC49_IA32_CC_FLAGS) -O0
>
>  ##################
> @@ -2189,8 +2189,8 @@ RELEASE_GCC49_IA32_CC_FLAGS       = 
> DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-unused-but
>  *_GCC49_X64_OBJCOPY_FLAGS        =
>  *_GCC49_X64_NASM_FLAGS           = -f elf64
>
> -  DEBUG_GCC49_X64_CC_FLAGS       = DEF(GCC49_X64_CC_FLAGS) -Os
> -RELEASE_GCC49_X64_CC_FLAGS       = DEF(GCC49_X64_CC_FLAGS) -Os 
> -Wno-unused-but-set-variable -Wno-unused-const-variable
> +  DEBUG_GCC49_X64_CC_FLAGS       = DEF(GCC49_X64_CC_FLAGS)
> +RELEASE_GCC49_X64_CC_FLAGS       = DEF(GCC49_X64_CC_FLAGS) 
> -Wno-unused-but-set-variable -Wno-unused-const-variable
>    NOOPT_GCC49_X64_CC_FLAGS       = DEF(GCC49_X64_CC_FLAGS) -O0
>
>  ##################
> @@ -2304,10 +2304,10 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z 
> common-page-size=0x20
>  *_GCC5_IA32_OBJCOPY_FLAGS        =
>  *_GCC5_IA32_NASM_FLAGS           = -f elf32
>
> -  DEBUG_GCC5_IA32_CC_FLAGS       = DEF(GCC5_IA32_CC_FLAGS) -flto -Os
> +  DEBUG_GCC5_IA32_CC_FLAGS       = DEF(GCC5_IA32_CC_FLAGS) -flto
>    DEBUG_GCC5_IA32_DLINK_FLAGS    = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os 
> -Wl,-m,elf_i386,--oformat=elf32-i386
>
> -RELEASE_GCC5_IA32_CC_FLAGS       = DEF(GCC5_IA32_CC_FLAGS) -flto -Os 
> -Wno-unused-but-set-variable -Wno-unused-const-variable
> +RELEASE_GCC5_IA32_CC_FLAGS       = DEF(GCC5_IA32_CC_FLAGS) -flto 
> -Wno-unused-but-set-variable -Wno-unused-const-variable
>  RELEASE_GCC5_IA32_DLINK_FLAGS    = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os 
> -Wl,-m,elf_i386,--oformat=elf32-i386
>
>    NOOPT_GCC5_IA32_CC_FLAGS       = DEF(GCC5_IA32_CC_FLAGS) -O0
> @@ -2336,10 +2336,10 @@ RELEASE_GCC5_IA32_DLINK_FLAGS    = 
> DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
>  *_GCC5_X64_OBJCOPY_FLAGS         =
>  *_GCC5_X64_NASM_FLAGS            = -f elf64
>
> -  DEBUG_GCC5_X64_CC_FLAGS        = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO 
> -Os
> +  DEBUG_GCC5_X64_CC_FLAGS        = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO
>    DEBUG_GCC5_X64_DLINK_FLAGS     = DEF(GCC5_X64_DLINK_FLAGS) -flto -Os
>
> -RELEASE_GCC5_X64_CC_FLAGS        = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO 
> -Os -Wno-unused-but-set-variable -Wno-unused-const-variable
> +RELEASE_GCC5_X64_CC_FLAGS        = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO 
> -Wno-unused-but-set-variable -Wno-unused-const-variable
>  RELEASE_GCC5_X64_DLINK_FLAGS     = DEF(GCC5_X64_DLINK_FLAGS) -flto -Os
>
>    NOOPT_GCC5_X64_CC_FLAGS        = DEF(GCC5_X64_CC_FLAGS) -O0
> --
> 2.25.1
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#99157): https://edk2.groups.io/g/devel/message/99157
Mute This Topic: https://groups.io/mt/96517596/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-


Reply via email to