[gcc(refs/vendors/ARM/heads/arm-12-m-pacbti)] arm: Fix inclusion of arm-mlib.h header more than once (pr108505).

[gcc(refs/vendors/ARM/heads/arm-12-m-pacbti)] arm: Fix inclusion of arm-mlib.h header more than once (pr108505).

[Andrea Corallo]

https://gcc.gnu.org/g:f2b8a0057dfc5864fb353175498eefb8c2b3977a

commit f2b8a0057dfc5864fb353175498eefb8c2b3977a
Author: Srinath Parvathaneni <srinath.parvathaneni@arm.com>
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  <srinath.parvathaneni@arm.com>
    
            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 b6dab5a6e47..c167613cd0c 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -4462,7 +4462,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@,,'`
@@ -4501,6 +4500,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