1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX

Ard Biesheuvel posted 1 patch 12 months ago
Failed in applying to current master (apply log)
BaseTools/Conf/tools_def.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[edk2-devel] [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX
Posted by Ard Biesheuvel 12 months ago 
When using CLANGDWARF to build for the ARM architecture, objcopy is
references via the wrong environment variable, resulting in the wrong
llvm-objcopy to be used (if one exists), or the build to fail (if
CLANGDWARF_BIN points to the only available instance)

So use CLANGDWARF_BIN instead, which was what was intended.

Cc: Rebecca Cran <rebecca@bsdio.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Fixes: ecbc394365f50f3c ("BaseTools: Set CLANGDWARF RC path ...")
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 BaseTools/Conf/tools_def.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 4ae21b85a8571f93..503a6687c1f03f56 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -1957,7 +1957,7 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS   = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI
 *_CLANGDWARF_ARM_ASLDLINK_PATH      = ENV(CLANGDWARF_BIN)clang

 

 *_CLANGDWARF_ARM_SLINK_PATH         = ENV(CLANGDWARF_BIN)llvm-ar

-*_CLANGDWARF_ARM_RC_PATH            = ENV(CLANGDWARF_ARM_PREFIX)llvm-objcopy

+*_CLANGDWARF_ARM_RC_PATH            = ENV(CLANGDWARF_BIN)llvm-objcopy

 

 *_CLANGDWARF_ARM_ASLCC_FLAGS        = DEF(GCC_ASLCC_FLAGS) -fno-lto

 *_CLANGDWARF_ARM_ASLDLINK_FLAGS     = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_ASLDLINK_FLAGS)

-- 
2.39.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#104670): https://edk2.groups.io/g/devel/message/104670
Mute This Topic: https://groups.io/mt/98822561/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX
Posted by Rebecca Cran 12 months ago 
Reviewed-by: Rebecca Cran <rebecca@bsdio.com>


Thanks!


On 5/11/23 12:59 AM, Ard Biesheuvel wrote:
> When using CLANGDWARF to build for the ARM architecture, objcopy is
> references via the wrong environment variable, resulting in the wrong
> llvm-objcopy to be used (if one exists), or the build to fail (if
> CLANGDWARF_BIN points to the only available instance)
>
> So use CLANGDWARF_BIN instead, which was what was intended.
>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Fixes: ecbc394365f50f3c ("BaseTools: Set CLANGDWARF RC path ...")
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
>   BaseTools/Conf/tools_def.template | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
> index 4ae21b85a8571f93..503a6687c1f03f56 100755
> --- a/BaseTools/Conf/tools_def.template
> +++ b/BaseTools/Conf/tools_def.template
> @@ -1957,7 +1957,7 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS   = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI
>   *_CLANGDWARF_ARM_ASLDLINK_PATH      = ENV(CLANGDWARF_BIN)clang
>
>   
>
>   *_CLANGDWARF_ARM_SLINK_PATH         = ENV(CLANGDWARF_BIN)llvm-ar
>
> -*_CLANGDWARF_ARM_RC_PATH            = ENV(CLANGDWARF_ARM_PREFIX)llvm-objcopy
>
> +*_CLANGDWARF_ARM_RC_PATH            = ENV(CLANGDWARF_BIN)llvm-objcopy
>
>   
>
>   *_CLANGDWARF_ARM_ASLCC_FLAGS        = DEF(GCC_ASLCC_FLAGS) -fno-lto
>
>   *_CLANGDWARF_ARM_ASLDLINK_FLAGS     = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_ASLDLINK_FLAGS)
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#104730): https://edk2.groups.io/g/devel/message/104730
Mute This Topic: https://groups.io/mt/98822561/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] 回复: [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX
Posted by gaoliming via groups.io 12 months ago 
Ard: 
  This change is good to me.  Reviewed-by: Liming Gao
<gaoliming@byosoft.com.cn>
  
  Will it be merged for this stable tag?

Thanks
Liming
> -----邮件原件-----
> 发件人: Ard Biesheuvel <ardb@kernel.org>
> 发送时间: 2023年5月11日 15:00
> 收件人: devel@edk2.groups.io
> 抄送: Ard Biesheuvel <ardb@kernel.org>; Rebecca Cran
> <rebecca@bsdio.com>; Liming Gao <gaoliming@byosoft.com.cn>
> 主题: [PATCH] BaseTools/tools_def: Drop ref to undefined
> CLANGDWARF_ARM_PREFIX
> 
> When using CLANGDWARF to build for the ARM architecture, objcopy is
> 
> references via the wrong environment variable, resulting in the wrong
> 
> llvm-objcopy to be used (if one exists), or the build to fail (if
> 
> CLANGDWARF_BIN points to the only available instance)
> 
> 
> 
> So use CLANGDWARF_BIN instead, which was what was intended.
> 
> 
> 
> Cc: Rebecca Cran <rebecca@bsdio.com>
> 
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> 
> Fixes: ecbc394365f50f3c ("BaseTools: Set CLANGDWARF RC path ...")
> 
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> 
> ---
> 
>  BaseTools/Conf/tools_def.template | 2 +-
> 
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 
> 
> diff --git a/BaseTools/Conf/tools_def.template
> b/BaseTools/Conf/tools_def.template
> 
> index 4ae21b85a8571f93..503a6687c1f03f56 100755
> 
> --- a/BaseTools/Conf/tools_def.template
> 
> +++ b/BaseTools/Conf/tools_def.template
> 
> @@ -1957,7 +1957,7 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS   =
> DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI
> 
>  *_CLANGDWARF_ARM_ASLDLINK_PATH      =
> ENV(CLANGDWARF_BIN)clang
> 
> 
> 
> 
> 
>  *_CLANGDWARF_ARM_SLINK_PATH         =
> ENV(CLANGDWARF_BIN)llvm-ar
> 
> 
> -*_CLANGDWARF_ARM_RC_PATH            =
> ENV(CLANGDWARF_ARM_PREFIX)llvm-objcopy
> 
> 
> +*_CLANGDWARF_ARM_RC_PATH            =
> ENV(CLANGDWARF_BIN)llvm-objcopy
> 
> 
> 
> 
> 
>  *_CLANGDWARF_ARM_ASLCC_FLAGS        = DEF(GCC_ASLCC_FLAGS)
> -fno-lto
> 
> 
>  *_CLANGDWARF_ARM_ASLDLINK_FLAGS     =
> DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_ASLDLINK_FLAGS)
> 
> 
> --
> 
> 2.39.2
> 
> 





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#104729): https://edk2.groups.io/g/devel/message/104729
Mute This Topic: https://groups.io/mt/98841231/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] 回复: [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX
Posted by Ard Biesheuvel 12 months ago 
On Fri, 12 May 2023 at 03:43, gaoliming via groups.io
<gaoliming=byosoft.com.cn@groups.io> wrote:
>
> Ard:
>   This change is good to me.  Reviewed-by: Liming Gao
> <gaoliming@byosoft.com.cn>
>
>   Will it be merged for this stable tag?
>

Yes I will merge it today.

Thanks,

> > -----邮件原件-----
> > 发件人: Ard Biesheuvel <ardb@kernel.org>
> > 发送时间: 2023年5月11日 15:00
> > 收件人: devel@edk2.groups.io
> > 抄送: Ard Biesheuvel <ardb@kernel.org>; Rebecca Cran
> > <rebecca@bsdio.com>; Liming Gao <gaoliming@byosoft.com.cn>
> > 主题: [PATCH] BaseTools/tools_def: Drop ref to undefined
> > CLANGDWARF_ARM_PREFIX
> >
> > When using CLANGDWARF to build for the ARM architecture, objcopy is
> >
> > references via the wrong environment variable, resulting in the wrong
> >
> > llvm-objcopy to be used (if one exists), or the build to fail (if
> >
> > CLANGDWARF_BIN points to the only available instance)
> >
> >
> >
> > So use CLANGDWARF_BIN instead, which was what was intended.
> >
> >
> >
> > Cc: Rebecca Cran <rebecca@bsdio.com>
> >
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> >
> > Fixes: ecbc394365f50f3c ("BaseTools: Set CLANGDWARF RC path ...")
> >
> > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> >
> > ---
> >
> >  BaseTools/Conf/tools_def.template | 2 +-
> >
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >
> >
> > diff --git a/BaseTools/Conf/tools_def.template
> > b/BaseTools/Conf/tools_def.template
> >
> > index 4ae21b85a8571f93..503a6687c1f03f56 100755
> >
> > --- a/BaseTools/Conf/tools_def.template
> >
> > +++ b/BaseTools/Conf/tools_def.template
> >
> > @@ -1957,7 +1957,7 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS   =
> > DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI
> >
> >  *_CLANGDWARF_ARM_ASLDLINK_PATH      =
> > ENV(CLANGDWARF_BIN)clang
> >
> >
> >
> >
> >
> >  *_CLANGDWARF_ARM_SLINK_PATH         =
> > ENV(CLANGDWARF_BIN)llvm-ar
> >
> >
> > -*_CLANGDWARF_ARM_RC_PATH            =
> > ENV(CLANGDWARF_ARM_PREFIX)llvm-objcopy
> >
> >
> > +*_CLANGDWARF_ARM_RC_PATH            =
> > ENV(CLANGDWARF_BIN)llvm-objcopy
> >
> >
> >
> >
> >
> >  *_CLANGDWARF_ARM_ASLCC_FLAGS        = DEF(GCC_ASLCC_FLAGS)
> > -fno-lto
> >
> >
> >  *_CLANGDWARF_ARM_ASLDLINK_FLAGS     =
> > DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_ASLDLINK_FLAGS)
> >
> >
> > --
> >
> > 2.39.2
> >
> >
>
>
>
>
>
> 
>
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#104769): https://edk2.groups.io/g/devel/message/104769
Mute This Topic: https://groups.io/mt/98841231/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.