* [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX
@ 2023-05-11 6:59 Ard Biesheuvel
2023-05-12 1:43 ` 回复: " gaoliming
2023-05-12 1:46 ` Rebecca Cran
0 siblings, 2 replies; 4+ messages in thread
From: Ard Biesheuvel @ 2023-05-11 6:59 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Rebecca Cran, Liming Gao
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* 回复: [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX
2023-05-11 6:59 [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX Ard Biesheuvel
@ 2023-05-12 1:43 ` gaoliming
2023-05-12 6:40 ` [edk2-devel] " Ard Biesheuvel
2023-05-12 1:46 ` Rebecca Cran
1 sibling, 1 reply; 4+ messages in thread
From: gaoliming @ 2023-05-12 1:43 UTC (permalink / raw)
To: 'Ard Biesheuvel', devel; +Cc: 'Rebecca Cran'
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
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX
2023-05-11 6:59 [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX Ard Biesheuvel
2023-05-12 1:43 ` 回复: " gaoliming
@ 2023-05-12 1:46 ` Rebecca Cran
1 sibling, 0 replies; 4+ messages in thread
From: Rebecca Cran @ 2023-05-12 1:46 UTC (permalink / raw)
To: Ard Biesheuvel, devel; +Cc: Liming Gao
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)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [edk2-devel] 回复: [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX
2023-05-12 1:43 ` 回复: " gaoliming
@ 2023-05-12 6:40 ` Ard Biesheuvel
0 siblings, 0 replies; 4+ messages in thread
From: Ard Biesheuvel @ 2023-05-12 6:40 UTC (permalink / raw)
To: devel, gaoliming; +Cc: Rebecca Cran
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
> >
> >
>
>
>
>
>
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-12 6:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-11 6:59 [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX Ard Biesheuvel
2023-05-12 1:43 ` 回复: " gaoliming
2023-05-12 6:40 ` [edk2-devel] " Ard Biesheuvel
2023-05-12 1:46 ` Rebecca Cran
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox