diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2ce924f..2db08a0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-14  Evandro Menezes  <e.menezes@samsung.com>
+
+	* config/aarch64/aarch64.c (generic_addrcost_table): Initialize
+	elements in the correct order.
+	(cortexa57_addrcost_table): Likewise.
+
 2014-08-20  Jan Hubicka  <hubicka@ucw.cz>
 
 	* cgraphunit.c (ipa_passes, compile): Reshedule
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index c3c871e..3de5a0c 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -177,9 +177,9 @@ static const struct cpu_addrcost_table generic_addrcost_table =
   .addr_scale_costs =
 #endif
     {
-      NAMED_PARAM (qi, 0),
       NAMED_PARAM (hi, 0),
       NAMED_PARAM (si, 0),
+      NAMED_PARAM (di, 0),
       NAMED_PARAM (ti, 0),
     },
   NAMED_PARAM (pre_modify, 0),
@@ -198,9 +198,9 @@ static const struct cpu_addrcost_table cortexa57_addrcost_table =
   .addr_scale_costs =
 #endif
     {
-      NAMED_PARAM (qi, 0),
       NAMED_PARAM (hi, 1),
       NAMED_PARAM (si, 0),
+      NAMED_PARAM (di, 0),
       NAMED_PARAM (ti, 1),
     },
   NAMED_PARAM (pre_modify, 0),