From: Richard Earnshaw <rearnsha@arm.com>
Date: Mon, 9 Dec 2019 13:51:50 +0000 (+0000)
Subject: arm: fix v[78]-r multilibs when configured with --with-multlib-list=aprofile
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8d106dd51fac1a524ede3019769c214668021350;p=gcc.git

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.

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

From-SVN: r279128
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 29328fed1c1..101fc5c139d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-09  Richard Earnshaw  <rearnsha@arm.com>
+
+	* config/arm/t-multilib: Use arm->thumb multilib reuse rules
+	on a-profile.
+
 2019-12-09  Segher Boessenkool  <segher@kernel.crashing.org>
 
 	* config/rs6000/rs6000.md (unnamed mfcr define_insn): Name this
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.