From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2098) id 44ABF3858D28; Tue, 24 Jan 2023 09:58:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 44ABF3858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674554320; bh=qeLuppTWKst8vwtrbcqnuSMeocZqXaeS1U4zkGt9yLU=; h=From:To:Subject:Date:From; b=brPPoWYtQsqtB06ccJ1yH+zrdfvlbXX7cv8nLjW+sf0os7ZsNyzns6mCDDTAxs+LF Y3LJQ0jFWwswGNCxDgwqFEhSHMGukmM7sDSAcS2LthDAzr9eXcMx/b69U99FIvarwy l47Bm+T4ZLeOmMgwmGxKMCEwp175b42+gKNGY6ds= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: SRINATH PARVATHANENI To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5322] arm: Fix inclusion of arm-mlib.h header more than once (pr108505). X-Act-Checkin: gcc X-Git-Author: Srinath Parvathaneni X-Git-Refname: refs/heads/master X-Git-Oldrev: e304e9283a97e28dc0074d8d30715d3f626b4e87 X-Git-Newrev: 275820c09e5f397040cbff69c90012dc1e220faf Message-Id: <20230124095840.44ABF3858D28@sourceware.org> Date: Tue, 24 Jan 2023 09:58:40 +0000 (GMT) List-Id: https://gcc.gnu.org/g:275820c09e5f397040cbff69c90012dc1e220faf commit r13-5322-g275820c09e5f397040cbff69c90012dc1e220faf Author: Srinath Parvathaneni Date: Tue Jan 24 09:57:52 2023 +0000 arm: Fix inclusion of arm-mlib.h header more than once (pr108505). 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). gcc/ChangeLog: 2023-01-24 Srinath Parvathaneni PR target/108505 * config.gcc (tm_file): Move the variable out of loop. Diff: --- gcc/config.gcc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/config.gcc b/gcc/config.gcc index 771bd35e803..d828223c16d 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" ;; @*) 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_MULTILIB_CONFIG="$with_multilib_list" fi fi