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

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.

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.

From-SVN: r280122
This commit is contained in:
Przemyslaw Wirkus 2020-01-10 16:46:42 +00:00 committed by Richard Earnshaw
parent 9a8610a5f0
commit 0e7ba3faa5
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,9 @@
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.
2020-01-09 Martin Liska <mliska@suse.cz>
Backport from mainline

View File

@ -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.