diff mbox series

[arm,backport] arm: fix v[78]-r multilibs when configured with --with-multlib-list=aprofile

Message ID AM6PR08MB45812B4306406851E687FB7AE4380@AM6PR08MB4581.eurprd08.prod.outlook.com
State New
Headers show
Series [arm,backport] arm: fix v[78]-r multilibs when configured with --with-multlib-list=aprofile | expand

Commit Message

Przemyslaw Wirkus Jan. 10, 2020, 2:30 p.m. UTC 
Hi,
When gcc for Arm is configured with --with-multilib-list=aprofile a
misplaced endif directive in the makefile was causing the arm->thumb
mapping for multilibs to be omitted from the reuse rules.  This
resulted in the default multilib being picked rather than the thumb2
opimized version.

gcc/ChangeLog:
2020-01-10  Przemyslaw Wirkus  <przemyslaw.wirkus@arm.com>

	Backport from trunk
	* config/arm/t-multilib: Use arm->thumb multilib reuse rules
	on a-profile.

Ok for gcc-9-branch?

kind regards
Przemyslaw Wirkus

Comments

Richard Earnshaw (lists) Jan. 10, 2020, 4:50 p.m. UTC | #1 
On 10/01/2020 14:30, Przemyslaw Wirkus wrote:
> Hi,
> When gcc for Arm is configured with --with-multilib-list=aprofile a
> misplaced endif directive in the makefile was causing the arm->thumb
> mapping for multilibs to be omitted from the reuse rules.  This
> resulted in the default multilib being picked rather than the thumb2
> opimized version.
> 
> gcc/ChangeLog:
> 2020-01-10  Przemyslaw Wirkus  <przemyslaw.wirkus@arm.com>
> 
> 	Backport from trunk
> 	* config/arm/t-multilib: Use arm->thumb multilib reuse rules
> 	on a-profile.
> 
> Ok for gcc-9-branch?
> 
> kind regards
> Przemyslaw Wirkus
> 

Pushed.

R.
diff mbox series

Patch

diff --git a/gcc/config/arm/t-multilib b/gcc/config/arm/t-multilib
index dc97c8f09fb0b7f53520432e1a174adfce1bf6af..d5ee537193f2416909516c563b9848a79dabb1bf 100644
--- a/gcc/config/arm/t-multilib
+++ b/gcc/config/arm/t-multilib
@@ -185,6 +185,8 @@  MULTILIB_MATCHES	+= march?armv7=march?armv8.5-a
 MULTILIB_MATCHES	+= $(foreach ARCH, $(v8_5_a_simd_variants), \
 			     march?armv7+fp=march?armv8.5-a$(ARCH))
 
+endif		# Not APROFILE.
+
 # Use Thumb libraries for everything.
 
 MULTILIB_REUSE		+= mthumb/march.armv7/mfloat-abi.soft=marm/march.armv7/mfloat-abi.soft
@@ -198,4 +200,3 @@  MULTILIB_REUSE		+= $(foreach MODE, arm thumb, \
 			     $(foreach ARCH, armv7, \
 			       mthumb/march.$(ARCH)/mfloat-abi.soft=m$(MODE)/march.$(ARCH)/mfloat-abi.softfp))
 
-endif		# Not APROFILE.