arm: Fix inclusion of arm-mlib.h header more than once (pr108505).
authorSrinath Parvathaneni <srinath.parvathaneni@arm.com>
Tue, 24 Jan 2023 09:57:52 +0000 (09:57 +0000)
committerSrinath Parvathaneni <srinath.parvathaneni@arm.com>
Tue, 24 Jan 2023 09:58:21 +0000 (09:58 +0000)
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.

gcc/config.gcc

index 771bd35..d828223 100644 (file)
@@ -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