Sync with svn rev. 193696

Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

6 files changed, 93 insertions, 84 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2c100c846..a55eae1b9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,66 +1,3 @@
-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
diff --git a/gcc/ChangeLog.aarch64 b/gcc/ChangeLog.aarch64
index a8bc958a0..ab803b9bc 100644
--- a/gcc/ChangeLog.aarch64
+++ b/gcc/ChangeLog.aarch64
@@ -1,3 +1,75 @@
+2012-11-21  Marcus Shawcroft  <marcus.shawcroft@arm.com>
+
+	* 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
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 5e5b97493..fc1ddf2a8 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3888,7 +3888,7 @@ build/genflags.o : genflags.c $(RTL_BASE_H) $(OBSTACK_H) $(BCONFIG_H)	\
   $(SYSTEM_H) coretypes.h $(GTM_H) errors.h $(READ_MD_H) gensupport.h
 build/gengenrtl.o : gengenrtl.c $(BCONFIG_H) $(SYSTEM_H) rtl.def
 gengtype-lex.o build/gengtype-lex.o : gengtype-lex.c gengtype.h $(SYSTEM_H)
-gengtype-lex.o: $(CONFIG_H)
+gengtype-lex.o: $(CONFIG_H) $(BCONFIG_H)
 build/gengtype-lex.o: $(BCONFIG_H)
 gengtype-parse.o build/gengtype-parse.o : gengtype-parse.c gengtype.h \
   $(SYSTEM_H)
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index f8ecea27c..212bf1168 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -2286,7 +2286,7 @@ aarch64_output_mi_thunk (FILE *file, tree thunk ATTRIBUTE_UNUSED,
 	{
 	  if (delta >= -256 && delta < 256)
 	    addr = gen_rtx_PRE_MODIFY (Pmode, this_rtx,
-				       plus_constant (Pmode, this_rtx, delta));
+				       plus_constant (this_rtx, delta));
 	  else
 	    aarch64_add_constant (file, this_regno, IP1_REGNUM, delta);
 	}
@@ -2294,7 +2294,7 @@ aarch64_output_mi_thunk (FILE *file, tree thunk ATTRIBUTE_UNUSED,
       aarch64_emit_move (temp0, gen_rtx_MEM (Pmode, addr));
 
       if (vcall_offset >= -256 && vcall_offset < 32768)
-	  addr = plus_constant (Pmode, temp0, vcall_offset);
+	  addr = plus_constant (temp0, vcall_offset);
       else
 	{
 	  aarch64_build_constant (file, IP1_REGNUM, vcall_offset);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4e8aaa19d..0bc42d3a9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -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.
diff --git a/gcc/testsuite/ChangeLog.aarch64 b/gcc/testsuite/ChangeLog.aarch64
index 0cd0707d6..10ad92aec 100644
--- a/gcc/testsuite/ChangeLog.aarch64
+++ b/gcc/testsuite/ChangeLog.aarch64
@@ -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