[COMMITTED] arm: fix v[78]-r multilibs when configured with --with-multlib-list=aprofile
diff mbox series

Message ID fd76a994-8b54-f2e0-d8a5-3f2f07271678@arm.com
State New
Headers show
Series
  • [COMMITTED] arm: fix v[78]-r multilibs when configured with --with-multlib-list=aprofile
Related show

Commit Message

Richard Earnshaw (lists) Dec. 9, 2019, 1:53 p.m. UTC
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.

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

Committed to trunk.

Patch
diff mbox series

diff --git a/gcc/config/arm/t-multilib b/gcc/config/arm/t-multilib
index dc97c8f09fb..d5ee537193f 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.