From: Richard Earnshaw <Richard.Earnshaw@foss.arm.com>
To: Srinath Parvathaneni <srinath.parvathaneni@arm.com>,
gcc-patches@gcc.gnu.org
Cc: nd@arm.com, richard.earnshaw@arm.com, kyrylo.tkachov@arm.com
Subject: Re: [PATCH][GCC] arm: Fix inclusion of arm-mlib.h header more than once (pr108505).
Date: Tue, 24 Jan 2023 10:48:06 +0000 [thread overview]
Message-ID: <c811e991-4c85-1d82-1fb3-ca46cd4715aa@foss.arm.com> (raw)
In-Reply-To: <0848d46d-cf28-4b97-bdb8-fda36ee53fea@AZ-NEU-EX04.Arm.com>
On 24/01/2023 09:55, Srinath Parvathaneni via Gcc-patches wrote:
> Hello,
>
> The patch fixes the build issue for arm-none-eabi target configured with
> --with-multilib-list=aprofile,rmprofile, in which case the header file
> arm/arm-mlib.h is being included more than once and the toolchain build
> is failing (PR108505).
>
> Regression tested on arm-none-eabi target and found no regressions.
>
> Ok for master?
>
> Regards,
> Srinath.
>
> gcc/ChangeLog:
>
> 2023-01-24 Srinath Parvathaneni <srinath.parvathaneni@arm.com>
>
> PR target/108505
> * config.gcc (tm_file): Move the variable out of loop.
>
>
> ############### Attachment also inlined for ease of reply ###############
>
>
A more robust fix would be:
> diff --git a/gcc/config.gcc b/gcc/config.gcc
> index 771bd35e803b47e79c0a62eab8f4845e9bbf96ef..d828223c16d3076da0ab6582dfaf59ad657ea438 100644
> --- a/gcc/config.gcc
> +++ b/gcc/config.gcc
> @@ -4350,7 +4350,6 @@ case "${target}" in
> case ${arm_multilib} in
> aprofile|rmprofile)
> tmake_profile_file="arm/t-multilib"
> - tm_file="$tm_file arm/arm-mlib.h"
tm_mlib_file="arm/arm-mlib.h"
> ;;
> @*)
> ml=`echo "X$arm_multilib" | sed '1s,^X@,,'`
> @@ -4389,6 +4388,7 @@ case "${target}" in
> # through to the multilib selector
> with_float="soft"
> tmake_file="${tmake_file} ${tmake_profile_file}"
> + tm_file="$tm_file arm/arm-mlib.h"
tm_file="$tm_file $tm_mlib_file"
> TM_MULTILIB_CONFIG="$with_multilib_list"
> fi
> fi
>
>
>
Then if we ever need to add additional alternative multilib variants we
can control the selection separately.
R.
prev parent reply other threads:[~2023-01-24 10:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-24 9:55 Srinath Parvathaneni
2023-01-24 9:56 ` Kyrylo Tkachov
2023-01-24 10:48 ` Richard Earnshaw [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c811e991-4c85-1d82-1fb3-ca46cd4715aa@foss.arm.com \
--to=richard.earnshaw@foss.arm.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=kyrylo.tkachov@arm.com \
--cc=nd@arm.com \
--cc=richard.earnshaw@arm.com \
--cc=srinath.parvathaneni@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).