public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-stable202305 PATCH 1/1] BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template
@ 2023-05-10 12:31 Rebecca Cran
  2023-05-10 12:36 ` Rebecca Cran
  2023-05-10 12:37 ` Ard Biesheuvel
  0 siblings, 2 replies; 7+ messages in thread
From: Rebecca Cran @ 2023-05-10 12:31 UTC (permalink / raw)
  To: devel, Liming Gao, Bob Feng, Yuwei Chen, Ard Biesheuvel; +Cc: Rebecca Cran

This reverts commit 11f62f4cc09f16d265da1a737dabfd8ed65f8c00.

While GCC uses objcopy for the OBJCOPY command, it's not needed for the
CLANGDWARF toolchain and can be left as echo.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 BaseTools/Conf/tools_def.template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index b3c822f0bc20..042b1e142b1b 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -1864,7 +1864,6 @@ DEFINE CLANGDWARF_ALL_CC_FLAGS         = DEF(GCC48_ALL_CC_FLAGS) DEF(CLANGDWARF_
 ###########################
 # CLANGDWARF IA32 definitions
 ###########################
-*_CLANGDWARF_IA32_OBJCOPY_PATH         = DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy
 *_CLANGDWARF_IA32_CC_PATH              = DEF(CLANGDWARF_IA32_PREFIX)clang
 *_CLANGDWARF_IA32_SLINK_PATH           = DEF(CLANGDWARF_IA32_PREFIX)llvm-ar
 *_CLANGDWARF_IA32_DLINK_PATH           = DEF(CLANGDWARF_IA32_PREFIX)clang
@@ -1901,7 +1900,6 @@ NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS     = DEF(CLANGDWARF_IA32_DLINK2_FLAGS) -O0 -
 ##########################
 # CLANGDWARF X64 definitions
 ##########################
-*_CLANGDWARF_X64_OBJCOPY_PATH         = DEF(CLANGDWARF_X64_PREFIX)llvm-objcopy
 *_CLANGDWARF_X64_CC_PATH              = DEF(CLANGDWARF_X64_PREFIX)clang
 *_CLANGDWARF_X64_SLINK_PATH           = DEF(CLANGDWARF_X64_PREFIX)llvm-ar
 *_CLANGDWARF_X64_DLINK_PATH           = DEF(CLANGDWARF_X64_PREFIX)clang
@@ -1949,7 +1947,6 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS   = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI
 *_CLANGDWARF_ARM_ASL_OUTFLAGS       = DEF(IASL_OUTFLAGS)
 *_CLANGDWARF_ARM_DTCPP_FLAGS        = DEF(GCC_DTCPP_FLAGS)
 
-*_CLANGDWARF_ARM_OBJCOPY_PATH       = ENV(CLANGDWARF_BIN)llvm-objcopy
 *_CLANGDWARF_ARM_CC_PATH            = ENV(CLANGDWARF_BIN)clang
 *_CLANGDWARF_ARM_ASM_PATH           = ENV(CLANGDWARF_BIN)clang
 *_CLANGDWARF_ARM_PP_PATH            = ENV(CLANGDWARF_BIN)clang
@@ -1994,7 +1991,6 @@ DEFINE CLANGDWARF_AARCH64_DLINK_FLAGS  = DEF(CLANGDWARF_AARCH64_TARGET) DEF(GCC_
 *_CLANGDWARF_AARCH64_ASL_OUTFLAGS   = DEF(IASL_OUTFLAGS)
 *_CLANGDWARF_AARCH64_DTCPP_FLAGS    = DEF(GCC_DTCPP_FLAGS)
 
-*_CLANGDWARF_AARCH64_OBJCOPY_PATH   = ENV(CLANGDWARF_BIN)llvm-objcopy
 *_CLANGDWARF_AARCH64_CC_PATH        = ENV(CLANGDWARF_BIN)clang
 *_CLANGDWARF_AARCH64_ASM_PATH       = ENV(CLANGDWARF_BIN)clang
 *_CLANGDWARF_AARCH64_PP_PATH        = ENV(CLANGDWARF_BIN)clang
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [edk2-stable202305 PATCH 1/1] BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template
  2023-05-10 12:31 [edk2-stable202305 PATCH 1/1] BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template Rebecca Cran
@ 2023-05-10 12:36 ` Rebecca Cran
  2023-05-10 12:37 ` Ard Biesheuvel
  1 sibling, 0 replies; 7+ messages in thread
From: Rebecca Cran @ 2023-05-10 12:36 UTC (permalink / raw)
  To: devel, Liming Gao, Bob Feng, Yuwei Chen, Ard Biesheuvel

PR: https://github.com/tianocore/edk2/pull/4384


On 5/10/23 06:31, Rebecca Cran wrote:
> This reverts commit 11f62f4cc09f16d265da1a737dabfd8ed65f8c00.
>
> While GCC uses objcopy for the OBJCOPY command, it's not needed for the
> CLANGDWARF toolchain and can be left as echo.
>
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>   BaseTools/Conf/tools_def.template | 4 ----
>   1 file changed, 4 deletions(-)
>
> diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
> index b3c822f0bc20..042b1e142b1b 100755
> --- a/BaseTools/Conf/tools_def.template
> +++ b/BaseTools/Conf/tools_def.template
> @@ -1864,7 +1864,6 @@ DEFINE CLANGDWARF_ALL_CC_FLAGS         = DEF(GCC48_ALL_CC_FLAGS) DEF(CLANGDWARF_
>   ###########################
>   # CLANGDWARF IA32 definitions
>   ###########################
> -*_CLANGDWARF_IA32_OBJCOPY_PATH         = DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy
>   *_CLANGDWARF_IA32_CC_PATH              = DEF(CLANGDWARF_IA32_PREFIX)clang
>   *_CLANGDWARF_IA32_SLINK_PATH           = DEF(CLANGDWARF_IA32_PREFIX)llvm-ar
>   *_CLANGDWARF_IA32_DLINK_PATH           = DEF(CLANGDWARF_IA32_PREFIX)clang
> @@ -1901,7 +1900,6 @@ NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS     = DEF(CLANGDWARF_IA32_DLINK2_FLAGS) -O0 -
>   ##########################
>   # CLANGDWARF X64 definitions
>   ##########################
> -*_CLANGDWARF_X64_OBJCOPY_PATH         = DEF(CLANGDWARF_X64_PREFIX)llvm-objcopy
>   *_CLANGDWARF_X64_CC_PATH              = DEF(CLANGDWARF_X64_PREFIX)clang
>   *_CLANGDWARF_X64_SLINK_PATH           = DEF(CLANGDWARF_X64_PREFIX)llvm-ar
>   *_CLANGDWARF_X64_DLINK_PATH           = DEF(CLANGDWARF_X64_PREFIX)clang
> @@ -1949,7 +1947,6 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS   = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI
>   *_CLANGDWARF_ARM_ASL_OUTFLAGS       = DEF(IASL_OUTFLAGS)
>   *_CLANGDWARF_ARM_DTCPP_FLAGS        = DEF(GCC_DTCPP_FLAGS)
>   
> -*_CLANGDWARF_ARM_OBJCOPY_PATH       = ENV(CLANGDWARF_BIN)llvm-objcopy
>   *_CLANGDWARF_ARM_CC_PATH            = ENV(CLANGDWARF_BIN)clang
>   *_CLANGDWARF_ARM_ASM_PATH           = ENV(CLANGDWARF_BIN)clang
>   *_CLANGDWARF_ARM_PP_PATH            = ENV(CLANGDWARF_BIN)clang
> @@ -1994,7 +1991,6 @@ DEFINE CLANGDWARF_AARCH64_DLINK_FLAGS  = DEF(CLANGDWARF_AARCH64_TARGET) DEF(GCC_
>   *_CLANGDWARF_AARCH64_ASL_OUTFLAGS   = DEF(IASL_OUTFLAGS)
>   *_CLANGDWARF_AARCH64_DTCPP_FLAGS    = DEF(GCC_DTCPP_FLAGS)
>   
> -*_CLANGDWARF_AARCH64_OBJCOPY_PATH   = ENV(CLANGDWARF_BIN)llvm-objcopy
>   *_CLANGDWARF_AARCH64_CC_PATH        = ENV(CLANGDWARF_BIN)clang
>   *_CLANGDWARF_AARCH64_ASM_PATH       = ENV(CLANGDWARF_BIN)clang
>   *_CLANGDWARF_AARCH64_PP_PATH        = ENV(CLANGDWARF_BIN)clang

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [edk2-stable202305 PATCH 1/1] BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template
  2023-05-10 12:31 [edk2-stable202305 PATCH 1/1] BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template Rebecca Cran
  2023-05-10 12:36 ` Rebecca Cran
@ 2023-05-10 12:37 ` Ard Biesheuvel
  2023-05-10 12:46   ` Rebecca Cran
  1 sibling, 1 reply; 7+ messages in thread
From: Ard Biesheuvel @ 2023-05-10 12:37 UTC (permalink / raw)
  To: Rebecca Cran; +Cc: devel, Liming Gao, Bob Feng, Yuwei Chen

On Wed, 10 May 2023 at 14:31, Rebecca Cran <rebecca@bsdio.com> wrote:
>
> This reverts commit 11f62f4cc09f16d265da1a737dabfd8ed65f8c00.
>
> While GCC uses objcopy for the OBJCOPY command, it's not needed for the
> CLANGDWARF toolchain and can be left as echo.
>

Are you sure you want to change this for IA32 and X86 as well? I'm not
sure what the significance is, I suppose it sets the debuglink on the
copies of the dll files?


> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  BaseTools/Conf/tools_def.template | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
> index b3c822f0bc20..042b1e142b1b 100755
> --- a/BaseTools/Conf/tools_def.template
> +++ b/BaseTools/Conf/tools_def.template
> @@ -1864,7 +1864,6 @@ DEFINE CLANGDWARF_ALL_CC_FLAGS         = DEF(GCC48_ALL_CC_FLAGS) DEF(CLANGDWARF_
>  ###########################
>  # CLANGDWARF IA32 definitions
>  ###########################
> -*_CLANGDWARF_IA32_OBJCOPY_PATH         = DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy
>  *_CLANGDWARF_IA32_CC_PATH              = DEF(CLANGDWARF_IA32_PREFIX)clang
>  *_CLANGDWARF_IA32_SLINK_PATH           = DEF(CLANGDWARF_IA32_PREFIX)llvm-ar
>  *_CLANGDWARF_IA32_DLINK_PATH           = DEF(CLANGDWARF_IA32_PREFIX)clang
> @@ -1901,7 +1900,6 @@ NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS     = DEF(CLANGDWARF_IA32_DLINK2_FLAGS) -O0 -
>  ##########################
>  # CLANGDWARF X64 definitions
>  ##########################
> -*_CLANGDWARF_X64_OBJCOPY_PATH         = DEF(CLANGDWARF_X64_PREFIX)llvm-objcopy
>  *_CLANGDWARF_X64_CC_PATH              = DEF(CLANGDWARF_X64_PREFIX)clang
>  *_CLANGDWARF_X64_SLINK_PATH           = DEF(CLANGDWARF_X64_PREFIX)llvm-ar
>  *_CLANGDWARF_X64_DLINK_PATH           = DEF(CLANGDWARF_X64_PREFIX)clang
> @@ -1949,7 +1947,6 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS   = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI
>  *_CLANGDWARF_ARM_ASL_OUTFLAGS       = DEF(IASL_OUTFLAGS)
>  *_CLANGDWARF_ARM_DTCPP_FLAGS        = DEF(GCC_DTCPP_FLAGS)
>
> -*_CLANGDWARF_ARM_OBJCOPY_PATH       = ENV(CLANGDWARF_BIN)llvm-objcopy
>  *_CLANGDWARF_ARM_CC_PATH            = ENV(CLANGDWARF_BIN)clang
>  *_CLANGDWARF_ARM_ASM_PATH           = ENV(CLANGDWARF_BIN)clang
>  *_CLANGDWARF_ARM_PP_PATH            = ENV(CLANGDWARF_BIN)clang
> @@ -1994,7 +1991,6 @@ DEFINE CLANGDWARF_AARCH64_DLINK_FLAGS  = DEF(CLANGDWARF_AARCH64_TARGET) DEF(GCC_
>  *_CLANGDWARF_AARCH64_ASL_OUTFLAGS   = DEF(IASL_OUTFLAGS)
>  *_CLANGDWARF_AARCH64_DTCPP_FLAGS    = DEF(GCC_DTCPP_FLAGS)
>
> -*_CLANGDWARF_AARCH64_OBJCOPY_PATH   = ENV(CLANGDWARF_BIN)llvm-objcopy
>  *_CLANGDWARF_AARCH64_CC_PATH        = ENV(CLANGDWARF_BIN)clang
>  *_CLANGDWARF_AARCH64_ASM_PATH       = ENV(CLANGDWARF_BIN)clang
>  *_CLANGDWARF_AARCH64_PP_PATH        = ENV(CLANGDWARF_BIN)clang
> --
> 2.39.2
>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [edk2-stable202305 PATCH 1/1] BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template
  2023-05-10 12:37 ` Ard Biesheuvel
@ 2023-05-10 12:46   ` Rebecca Cran
  2023-05-10 13:51     ` Ard Biesheuvel
  0 siblings, 1 reply; 7+ messages in thread
From: Rebecca Cran @ 2023-05-10 12:46 UTC (permalink / raw)
  To: Ard Biesheuvel; +Cc: devel, Liming Gao, Bob Feng, Yuwei Chen

On 5/10/23 06:37, Ard Biesheuvel wrote:
> On Wed, 10 May 2023 at 14:31, Rebecca Cran <rebecca@bsdio.com> wrote:
>> This reverts commit 11f62f4cc09f16d265da1a737dabfd8ed65f8c00.
>>
>> While GCC uses objcopy for the OBJCOPY command, it's not needed for the
>> CLANGDWARF toolchain and can be left as echo.
>>
> Are you sure you want to change this for IA32 and X86 as well? I'm not
> sure what the significance is, I suppose it sets the debuglink on the
> copies of the dll files?

Looking back to the tools_def.template from edk2-stable202302, we set 
OBJCOPY_PATH for CLANG38 IA32 and X64, but not for CLANGPDB or CLANGDWARF.

I was thinking it's safer to keep existing behavior for now.


-- 

Rebecca Cran


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [edk2-stable202305 PATCH 1/1] BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template
  2023-05-10 12:46   ` Rebecca Cran
@ 2023-05-10 13:51     ` Ard Biesheuvel
  2023-05-10 14:49       ` Rebecca Cran
  0 siblings, 1 reply; 7+ messages in thread
From: Ard Biesheuvel @ 2023-05-10 13:51 UTC (permalink / raw)
  To: Rebecca Cran; +Cc: devel, Liming Gao, Bob Feng, Yuwei Chen

On Wed, 10 May 2023 at 14:46, Rebecca Cran <rebecca@bsdio.com> wrote:
>
> On 5/10/23 06:37, Ard Biesheuvel wrote:
> > On Wed, 10 May 2023 at 14:31, Rebecca Cran <rebecca@bsdio.com> wrote:
> >> This reverts commit 11f62f4cc09f16d265da1a737dabfd8ed65f8c00.
> >>
> >> While GCC uses objcopy for the OBJCOPY command, it's not needed for the
> >> CLANGDWARF toolchain and can be left as echo.
> >>
> > Are you sure you want to change this for IA32 and X86 as well? I'm not
> > sure what the significance is, I suppose it sets the debuglink on the
> > copies of the dll files?
>
> Looking back to the tools_def.template from edk2-stable202302, we set
> OBJCOPY_PATH for CLANG38 IA32 and X64, but not for CLANGPDB or CLANGDWARF.
>
> I was thinking it's safer to keep existing behavior for now.
>

Existing behavior of CLANGDWARF for X86 and IA32, right? Yeah that makes sense.

Reviewed-by: Ard BIesheuvel <ardb@kernel.org>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [edk2-stable202305 PATCH 1/1] BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template
  2023-05-10 13:51     ` Ard Biesheuvel
@ 2023-05-10 14:49       ` Rebecca Cran
  2023-05-11  0:53         ` [edk2-devel] " Michael D Kinney
  0 siblings, 1 reply; 7+ messages in thread
From: Rebecca Cran @ 2023-05-10 14:49 UTC (permalink / raw)
  To: Ard Biesheuvel
  Cc: devel, Liming Gao, Bob Feng, Yuwei Chen, Michael D Kinney,
	Liming Gao

Mike/Liming:


GitHub PR with R-B added: https://github.com/tianocore/edk2/pull/4384


-- 
Rebecca Cran


On 5/10/23 07:51, Ard Biesheuvel wrote:
> On Wed, 10 May 2023 at 14:46, Rebecca Cran <rebecca@bsdio.com> wrote:
>> On 5/10/23 06:37, Ard Biesheuvel wrote:
>>> On Wed, 10 May 2023 at 14:31, Rebecca Cran <rebecca@bsdio.com> wrote:
>>>> This reverts commit 11f62f4cc09f16d265da1a737dabfd8ed65f8c00.
>>>>
>>>> While GCC uses objcopy for the OBJCOPY command, it's not needed for the
>>>> CLANGDWARF toolchain and can be left as echo.
>>>>
>>> Are you sure you want to change this for IA32 and X86 as well? I'm not
>>> sure what the significance is, I suppose it sets the debuglink on the
>>> copies of the dll files?
>> Looking back to the tools_def.template from edk2-stable202302, we set
>> OBJCOPY_PATH for CLANG38 IA32 and X64, but not for CLANGPDB or CLANGDWARF.
>>
>> I was thinking it's safer to keep existing behavior for now.
>>
> Existing behavior of CLANGDWARF for X86 and IA32, right? Yeah that makes sense.
>
> Reviewed-by: Ard BIesheuvel <ardb@kernel.org>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [edk2-devel] [edk2-stable202305 PATCH 1/1] BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template
  2023-05-10 14:49       ` Rebecca Cran
@ 2023-05-11  0:53         ` Michael D Kinney
  0 siblings, 0 replies; 7+ messages in thread
From: Michael D Kinney @ 2023-05-11  0:53 UTC (permalink / raw)
  To: devel@edk2.groups.io, rebecca@bsdio.com, Ard Biesheuvel
  Cc: Gao, Liming, Feng, Bob C, Chen, Christine, Kinney, Michael D

Merged

Mike

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca
> Cran
> Sent: Wednesday, May 10, 2023 7:50 AM
> To: Ard Biesheuvel <ardb@kernel.org>
> Cc: devel@edk2.groups.io; Gao, Liming <gaoliming@byosoft.com.cn>; Feng,
> Bob C <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>;
> Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>
> Subject: Re: [edk2-devel] [edk2-stable202305 PATCH 1/1] BaseTools: Revert
> Set the CLANGDWARF OBJCOPY path in tools_def.template
> 
> Mike/Liming:
> 
> 
> GitHub PR with R-B added: https://github.com/tianocore/edk2/pull/4384
> 
> 
> --
> Rebecca Cran
> 
> 
> On 5/10/23 07:51, Ard Biesheuvel wrote:
> > On Wed, 10 May 2023 at 14:46, Rebecca Cran <rebecca@bsdio.com> wrote:
> >> On 5/10/23 06:37, Ard Biesheuvel wrote:
> >>> On Wed, 10 May 2023 at 14:31, Rebecca Cran <rebecca@bsdio.com>
> wrote:
> >>>> This reverts commit 11f62f4cc09f16d265da1a737dabfd8ed65f8c00.
> >>>>
> >>>> While GCC uses objcopy for the OBJCOPY command, it's not needed for
> the
> >>>> CLANGDWARF toolchain and can be left as echo.
> >>>>
> >>> Are you sure you want to change this for IA32 and X86 as well? I'm not
> >>> sure what the significance is, I suppose it sets the debuglink on the
> >>> copies of the dll files?
> >> Looking back to the tools_def.template from edk2-stable202302, we set
> >> OBJCOPY_PATH for CLANG38 IA32 and X64, but not for CLANGPDB or
> CLANGDWARF.
> >>
> >> I was thinking it's safer to keep existing behavior for now.
> >>
> > Existing behavior of CLANGDWARF for X86 and IA32, right? Yeah that makes
> sense.
> >
> > Reviewed-by: Ard BIesheuvel <ardb@kernel.org>
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-05-11  0:54 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-10 12:31 [edk2-stable202305 PATCH 1/1] BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template Rebecca Cran
2023-05-10 12:36 ` Rebecca Cran
2023-05-10 12:37 ` Ard Biesheuvel
2023-05-10 12:46   ` Rebecca Cran
2023-05-10 13:51     ` Ard Biesheuvel
2023-05-10 14:49       ` Rebecca Cran
2023-05-11  0:53         ` [edk2-devel] " Michael D Kinney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox