Index: gcc/ChangeLog.aarch64
===================================================================
--- gcc/ChangeLog.aarch64	(revision 193695)
+++ gcc/ChangeLog.aarch64	(working copy)
@@ -2,6 +2,74 @@
 
 	* Makefile.in (gengtype-lex.o): Add dependency on $(BCONFIG_H).
 
+2012-11-21  James Greenhalgh  <james.greenhalgh@arm.com>
+
+	* config/aarch64/aarch64.c
+	(aarch64_output_mi_thunk): Use 4.7 API for plus_constant.
+
+2012-11-20  Sofiane Naci  <sofiane.naci@arm.com>
+
+	Backport from mainline
+	2012-11-20  Sofiane Naci  <sofiane.naci@arm.com>
+
+	* config/aarch64/aarch64.md
+	(define_attr "sync_*"): Remove.
+	(define_attr "length"): Update.
+	Include atomics.md.
+	* config/aarch64/aarch64-protos.h
+	(aarch64_expand_compare_and_swap): Add function prototype.
+	(aarch64_split_compare_and_swap): Likewise.
+	(aarch64_split_atomic_op): Likewise.
+	(aarch64_expand_sync): Remove function prototype.
+	(aarch64_output_sync_insn): Likewise.
+	(aarch64_output_sync_lock_release): Likewise.
+	(aarch64_sync_loop_insns): Likewise.
+	(struct aarch64_sync_generator): Remove.
+	(enum aarch64_sync_generator_tag): Likewise.
+	* config/aarch64/aarch64.c
+	(aarch64_legitimize_sync_memory): Remove function.
+	(aarch64_emit): Likewise.
+	(aarch64_insn_count): Likewise.
+	(aarch64_output_asm_insn): Likewise.
+	(aarch64_load_store_suffix): Likewise.
+	(aarch64_output_sync_load): Likewise.
+	(aarch64_output_sync_store): Likewise.
+	(aarch64_output_op2): Likewise.
+	(aarch64_output_op3): Likewise.
+	(aarch64_output_sync_loop): Likewise.
+	(aarch64_get_sync_operand): Likewise.
+	(aarch64_process_output_sync_insn): Likewise.
+	(aarch64_output_sync_insn): Likewise.
+	(aarch64_output_sync_lock_release): Likewise.
+	(aarch64_sync_loop_insns): Likewise.
+	(aarch64_call_generator): Likewise.
+	(aarch64_expand_sync): Likewise.
+	(* emit_f): Remove variable.
+	(aarch64_insn_count): Likewise.
+	(FETCH_SYNC_OPERAND): Likewise.
+	(aarch64_emit_load_exclusive): New function.
+	(aarch64_emit_store_exclusive): Likewise.
+	(aarch64_emit_unlikely_jump): Likewise.
+	(aarch64_expand_compare_and_swap): Likewise.
+	(aarch64_split_compare_and_swap): Likewise.
+	(aarch64_split_atomic_op): Likewise.
+	* config/aarch64/iterators.md
+	(atomic_sfx): New mode attribute.
+	(atomic_optab): New code attribute.
+	(atomic_op_operand): Likewise.
+	(atomic_op_str): Likewise.
+	(syncop): Rename to atomic_op.
+	* config/aarch64/sync.md: Delete.
+	* config/aarch64/atomics.md: New file.
+
+2012-11-19  Sofiane Naci  <sofiane.naci@arm.com>
+
+	Backport from mainline
+	2012-11-19  Sofiane Naci  <sofiane.naci@arm.com>
+
+	* config/aarch64/aarch64.c
+	(aarch64_output_mi_thunk): Refactor to generate RTL patterns.
+
 2012-11-13  Ian Bolton  <ian.bolton@arm.com>
 
 	Backport from mainline
Index: gcc/ChangeLog
===================================================================
--- gcc/ChangeLog	(revision 193695)
+++ gcc/ChangeLog	(working copy)
@@ -1,71 +1,3 @@
-2012-11-21  James Greenhalgh  <james.greenhalgh@arm.com>
-
-	* config/aarch64/aarch64.c
-	(aarch64_output_mi_thunk): Use 4.7 API for plus_constant. 
-
-2012-11-20  Sofiane Naci  <sofiane.naci@arm.com>
-
-	Backport from mainline
-	2012-11-20  Sofiane Naci  <sofiane.naci@arm.com>
-
-	* config/aarch64/aarch64.md
-	(define_attr "sync_*"): Remove.
-	(define_attr "length"): Update.
-	Include atomics.md.
-	* config/aarch64/aarch64-protos.h
-	(aarch64_expand_compare_and_swap): Add function prototype.
-	(aarch64_split_compare_and_swap): Likewise.
-	(aarch64_split_atomic_op): Likewise.
-	(aarch64_expand_sync): Remove function prototype.
-	(aarch64_output_sync_insn): Likewise.
-	(aarch64_output_sync_lock_release): Likewise.
-	(aarch64_sync_loop_insns): Likewise.
-	(struct aarch64_sync_generator): Remove.
-	(enum aarch64_sync_generator_tag): Likewise.
-	* config/aarch64/aarch64.c
-	(aarch64_legitimize_sync_memory): Remove function.
-	(aarch64_emit): Likewise.
-	(aarch64_insn_count): Likewise.
-	(aarch64_output_asm_insn): Likewise.
-	(aarch64_load_store_suffix): Likewise.
-	(aarch64_output_sync_load): Likewise.
-	(aarch64_output_sync_store): Likewise.
-	(aarch64_output_op2): Likewise.
-	(aarch64_output_op3): Likewise.
-	(aarch64_output_sync_loop): Likewise.
-	(aarch64_get_sync_operand): Likewise.
-	(aarch64_process_output_sync_insn): Likewise.
-	(aarch64_output_sync_insn): Likewise.
-	(aarch64_output_sync_lock_release): Likewise.
-	(aarch64_sync_loop_insns): Likewise.
-	(aarch64_call_generator): Likewise.
-	(aarch64_expand_sync): Likewise.
-	(* emit_f): Remove variable.
-	(aarch64_insn_count): Likewise.
-	(FETCH_SYNC_OPERAND): Likewise.
-	(aarch64_emit_load_exclusive): New function.
-	(aarch64_emit_store_exclusive): Likewise.
-	(aarch64_emit_unlikely_jump): Likewise.
-	(aarch64_expand_compare_and_swap): Likewise.
-	(aarch64_split_compare_and_swap): Likewise.
-	(aarch64_split_atomic_op): Likewise.
-	* config/aarch64/iterators.md
-	(atomic_sfx): New mode attribute.
-	(atomic_optab): New code attribute.
-	(atomic_op_operand): Likewise.
-	(atomic_op_str): Likewise.
-	(syncop): Rename to atomic_op.
-	* config/aarch64/sync.md: Delete.
-	* config/aarch64/atomics.md: New file.
-
-2012-11-19  Sofiane Naci  <sofiane.naci@arm.com>
-
-	Backport from mainline
-	2012-11-19  Sofiane Naci  <sofiane.naci@arm.com>
-
-	* config/aarch64/aarch64.c
-	(aarch64_output_mi_thunk): Refactor to generate RTL patterns.
-
 2012-11-03  Peter Bergner  <bergner@vnet.ibm.com>
 
 	Backport from mainline
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog	(revision 193695)
+++ gcc/testsuite/ChangeLog	(working copy)
@@ -1,21 +1,3 @@
-2012-11-20  Sofiane Naci  <sofiane.naci@arm.com>
-
-	Backport from mainline
-	2012-11-20  Sofiane Naci  <sofiane.naci@arm.com>
-
-	* gcc.target/aarch64/atomic-comp-swap-release-acquire.c: New testcase.
-	* gcc.target/aarch64/atomic-op-acq_rel.c: Likewise.
-	* gcc.target/aarch64/atomic-op-acquire.c: Likewise.
-	* gcc.target/aarch64/atomic-op-char.c: Likewise.
-	* gcc.target/aarch64/atomic-op-consume.c: Likewise.
-	* gcc.target/aarch64/atomic-op-imm.c: Likewise.
-	* gcc.target/aarch64/atomic-op-int.c: Likewise.
-	* gcc.target/aarch64/atomic-op-long.c: Likewise.
-	* gcc.target/aarch64/atomic-op-relaxed.c: Likewise.
-	* gcc.target/aarch64/atomic-op-release.c: Likewise.
-	* gcc.target/aarch64/atomic-op-seq_cst.c: Likewise.
-	* gcc.target/aarch64/atomic-op-short.c: Likewise.
-
 2012-11-02  Jeff Law  <law@redhat.com>
 
 	* gcc.c-torture/execute/pr54985.c: New test.
Index: gcc/testsuite/ChangeLog.aarch64
===================================================================
--- gcc/testsuite/ChangeLog.aarch64	(revision 193695)
+++ gcc/testsuite/ChangeLog.aarch64	(working copy)
@@ -1,3 +1,21 @@
+2012-11-20  Sofiane Naci  <sofiane.naci@arm.com>
+
+	Backport from mainline
+	2012-11-20  Sofiane Naci  <sofiane.naci@arm.com>
+
+	* gcc.target/aarch64/atomic-comp-swap-release-acquire.c: New testcase.
+	* gcc.target/aarch64/atomic-op-acq_rel.c: Likewise.
+	* gcc.target/aarch64/atomic-op-acquire.c: Likewise.
+	* gcc.target/aarch64/atomic-op-char.c: Likewise.
+	* gcc.target/aarch64/atomic-op-consume.c: Likewise.
+	* gcc.target/aarch64/atomic-op-imm.c: Likewise.
+	* gcc.target/aarch64/atomic-op-int.c: Likewise.
+	* gcc.target/aarch64/atomic-op-long.c: Likewise.
+	* gcc.target/aarch64/atomic-op-relaxed.c: Likewise.
+	* gcc.target/aarch64/atomic-op-release.c: Likewise.
+	* gcc.target/aarch64/atomic-op-seq_cst.c: Likewise.
+	* gcc.target/aarch64/atomic-op-short.c: Likewise.
+
 2012-11-13  Ian Bolton  <ian.bolton@arm.com>
 
 	Backport from mainline

