From: Kyrylo Tkachov <kyrylo.tkachov@arm.com>
Date: Thu, 4 Jun 2015 08:29:31 +0000 (+0000)
Subject: [AArch64] Always register fma_steering pass but gate it on the target option instead
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e2fc719399b507122ef4ea1867cff58e214be912;p=gcc.git

[AArch64] Always register fma_steering pass but gate it on the target option instead

	* config/aarch64/aarch64.c (aarch64_override_options): Unconditionally
	register fma steering pass.
	* config/aarch64/cortex-a57-fma-steering.c (gate): Add gating on
	AARCH64_TUNE_FMA_STEERING.

From-SVN: r224116
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 948abe51643..3cf20643acb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-06-04  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* config/aarch64/aarch64.c (aarch64_override_options): Unconditionally
+	register fma steering pass.
+	* config/aarch64/cortex-a57-fma-steering.c (gate): Add gating on
+	AARCH64_TUNE_FMA_STEERING.
+
 2015-06-03  Jan Hubicka  <hubicka@ucw.cz>
 
 	* tree.c (verify_type_variant): Verify that type and variant is
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 968a6b606fc..bbb044cc9bf 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -7207,8 +7207,7 @@ aarch64_override_options (void)
 #endif
     }
 
-  if (AARCH64_TUNE_FMA_STEERING)
-    aarch64_register_fma_steering ();
+  aarch64_register_fma_steering ();
 
   aarch64_override_options_after_change ();
 }
diff --git a/gcc/config/aarch64/cortex-a57-fma-steering.c b/gcc/config/aarch64/cortex-a57-fma-steering.c
index 3d7557ac2b4..5228b57199d 100644
--- a/gcc/config/aarch64/cortex-a57-fma-steering.c
+++ b/gcc/config/aarch64/cortex-a57-fma-steering.c
@@ -1053,7 +1053,7 @@ public:
   /* opt_pass methods: */
   virtual bool gate (function *)
     {
-      return optimize >= 2;
+      return AARCH64_TUNE_FMA_STEERING && optimize >= 2;
     }
 
   virtual unsigned int execute (function *)