Fix A12 multilib rule.

This affects only arm-none-eabi targets and those using t-aprofile in
their multilib lists. The problem here is that when the A12 support
was added, we mistakenly added this to the MULTILIB_MATCHES rule for
the A15 rather than putting out a separate line for this.

Fixed thusly and verified that the correct multilibs are now chosen.

     * config/arm/t-aprofile (MULTILIB_MATCHES): Correct A12 rule.

From-SVN: r208896

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 82f387ccca4354d04e249a99b62d8a600207148f..c51f8e8d03458a20add7af543f6fdc115736ae05 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-28  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
+
+       * config/arm/t-aprofile (MULTILIB_MATCHES): Correct A12 rule.
+
 2014-03-28  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
        * config/rs6000/rs6000.c (fusion_gpr_load_p): Refuse optimization

diff --git a/gcc/config/arm/t-aprofile b/gcc/config/arm/t-aprofile
index b968711c16c76c23f1f5d7eb73bc1b44bd3cc7fe..ff9e2e1b3bef4513edb896025e919d91431fa826 100644 (file)
--- a/gcc/config/arm/t-aprofile
+++ b/gcc/config/arm/t-aprofile
@@ -81,7 +81,8 @@ MULTILIB_EXCEPTIONS    += *march=armv7ve/*mfpu=neon-fp-armv8*
 MULTILIB_MATCHES       += march?armv7-a=mcpu?cortex-a8
 MULTILIB_MATCHES       += march?armv7-a=mcpu?cortex-a9
 MULTILIB_MATCHES       += march?armv7-a=mcpu?cortex-a5
-MULTILIB_MATCHES       += march?armv7ve=mcpu?cortex-a15=mcpu?cortex-a12
+MULTILIB_MATCHES       += march?armv7ve=mcpu?cortex-a15
+MULTILIB_MATCHES       += march?armv7ve=mcpu?cortex-a12
 MULTILIB_MATCHES       += march?armv7ve=mcpu?cortex-a15.cortex-a7
 MULTILIB_MATCHES       += march?armv8-a=mcpu?cortex-a53
 MULTILIB_MATCHES       += march?armv8-a=mcpu?cortex-a57