From: Srinath Parvathaneni <srinath.parvathaneni@arm.com>
Date: Wed, 8 Feb 2023 18:39:06 +0000 (+0000)
Subject: arm: Optimize arm-mlib.h header inclusion [pr108505].
X-Git-Tag: basepoints/gcc-14~1463
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eeda82d6288fb2a8fbc302d98ed51337e01aaaa;p=thirdparty%2Fgcc.git

arm: Optimize arm-mlib.h header inclusion [pr108505].

I have committed a fix [1] into gcc trunk for a build
issue mentioned in pr108505 and latter received few upstream
comments proposing more robust fix for this issue.

In this patch I'm addressing those comments and sending this
as a followup patch.

gcc/ChangeLog:

2023-01-27  Srinath Parvathaneni  <srinath.parvathaneni@arm.com>

	PR target/108505
	* config.gcc (tm_mlib_file): Define new variable.
---

diff --git a/gcc/config.gcc b/gcc/config.gcc
index f0958e1c959d..067720ac795b 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -4359,6 +4359,7 @@ case "${target}" in
 					case ${arm_multilib} in
 					aprofile|rmprofile)
 						tmake_profile_file="arm/t-multilib"
+						tm_mlib_file="arm/arm-mlib.h"
 						;;
 					@*)
 						ml=`echo "X$arm_multilib" | sed '1s,^X@,,'`
@@ -4397,7 +4398,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