Cleanup inconsistent use of __extension__.
ChangeLog:
2014-09-04 Wilco Dijkstra <wdijk...@arm.com>
* gcc/config/aarch64/aarch64.c: Cleanup use of __extension__.
---
gcc/config/aarch64/aarch64.c | 38 +++++++++++---------------------------
1 file changed, 11 insertions(+), 27 deletions(-)
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 57bb083..2c7c7c3 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -166,13 +166,12 @@ unsigned long aarch64_tune_flags = 0;
#endif
#if HAVE_DESIGNATED_INITIALIZERS && GCC_VERSION >= 2007
-__extension__
+# define EXTENSION __extension__
+#else
+# define EXTENSION
#endif
-#if HAVE_DESIGNATED_INITIALIZERS && GCC_VERSION >= 2007
-__extension__
-#endif
-static const struct cpu_addrcost_table generic_addrcost_table =
+EXTENSION static const struct cpu_addrcost_table generic_addrcost_table =
{
#if HAVE_DESIGNATED_INITIALIZERS
.addr_scale_costs =
@@ -190,10 +189,7 @@ static const struct cpu_addrcost_table
generic_addrcost_table =
NAMED_PARAM (imm_offset, 0)
};
-#if HAVE_DESIGNATED_INITIALIZERS && GCC_VERSION >= 2007
-__extension__
-#endif
-static const struct cpu_addrcost_table cortexa57_addrcost_table =
+EXTENSION static const struct cpu_addrcost_table cortexa57_addrcost_table =
{
#if HAVE_DESIGNATED_INITIALIZERS
.addr_scale_costs =
@@ -211,10 +207,7 @@ static const struct cpu_addrcost_table
cortexa57_addrcost_table =
NAMED_PARAM (imm_offset, 0),
};
-#if HAVE_DESIGNATED_INITIALIZERS && GCC_VERSION >= 2007
-__extension__
-#endif
-static const struct cpu_regmove_cost generic_regmove_cost =
+EXTENSION static const struct cpu_regmove_cost generic_regmove_cost =
{
NAMED_PARAM (GP2GP, 1),
NAMED_PARAM (GP2FP, 2),
@@ -223,10 +216,7 @@ static const struct cpu_regmove_cost generic_regmove_cost =
};
/* Generic costs for vector insn classes. */
-#if HAVE_DESIGNATED_INITIALIZERS && GCC_VERSION >= 2007
-__extension__
-#endif
-static const struct cpu_vector_cost generic_vector_cost =
+EXTENSION static const struct cpu_vector_cost generic_vector_cost =
{
NAMED_PARAM (scalar_stmt_cost, 1),
NAMED_PARAM (scalar_load_cost, 1),
@@ -243,10 +233,7 @@ static const struct cpu_vector_cost generic_vector_cost =
};
/* Generic costs for vector insn classes. */
-#if HAVE_DESIGNATED_INITIALIZERS && GCC_VERSION >= 2007
-__extension__
-#endif
-static const struct cpu_vector_cost cortexa57_vector_cost =
+EXTENSION static const struct cpu_vector_cost cortexa57_vector_cost =
{
NAMED_PARAM (scalar_stmt_cost, 1),
NAMED_PARAM (scalar_load_cost, 4),
@@ -262,10 +249,7 @@ static const struct cpu_vector_cost cortexa57_vector_cost =
NAMED_PARAM (cond_not_taken_branch_cost, 1)
};
-#if HAVE_DESIGNATED_INITIALIZERS && GCC_VERSION >= 2007
-__extension__
-#endif
-static const struct tune_params generic_tunings =
+EXTENSION static const struct tune_params generic_tunings =
{
&cortexa57_extra_costs,
&generic_addrcost_table,
@@ -275,7 +259,7 @@ static const struct tune_params generic_tunings =
NAMED_PARAM (issue_rate, 2)
};
-static const struct tune_params cortexa53_tunings =
+EXTENSION static const struct tune_params cortexa53_tunings =
{
&cortexa53_extra_costs,
&generic_addrcost_table,
@@ -285,7 +269,7 @@ static const struct tune_params cortexa53_tunings =
NAMED_PARAM (issue_rate, 2)
};
-static const struct tune_params cortexa57_tunings =
+EXTENSION static const struct tune_params cortexa57_tunings =
{
&cortexa57_extra_costs,
&cortexa57_addrcost_table,
--
1.9.1
