From: tbsaunde <tbsaunde@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 24 May 2015 00:32:54 +0000 (+0000)
Subject: add default for HAVE_load_multiple
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95951ddce84fa30dcc237f9341fcd2602bd40dbb;p=thirdparty%2Fgcc.git

add default for HAVE_load_multiple

gcc/ChangeLog:

2015-05-23  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* defaults.h (gen_load_multiple): New function.
	(HAVE_load_multiple): Add default value.
	* expr.c (move_block_to_reg): Adjust.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223623 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5e540b605872..5d609d456c35 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-23  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+	* defaults.h (gen_load_multiple): New function.
+	(HAVE_load_multiple): Add default value.
+	* expr.c (move_block_to_reg): Adjust.
+
 2015-05-23  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
 	* defaults.h (gen_mem_signal_fence): New function.
diff --git a/gcc/defaults.h b/gcc/defaults.h
index 50004d59e002..ea5ff804897a 100644
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -1474,6 +1474,16 @@ gen_mem_signal_fence (rtx)
 }
 #endif
 
+#ifndef HAVE_load_multiple
+#define HAVE_load_multiple 0
+static inline rtx
+gen_load_multiple (rtx, rtx, rtx)
+{
+  gcc_unreachable ();
+  return NULL;
+}
+#endif
+
 #endif /* GCC_INSN_FLAGS_H  */
 
 #endif  /* ! GCC_DEFAULTS_H */
diff --git a/gcc/expr.c b/gcc/expr.c
index 3605e9942897..c4b39f4be90c 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -1507,10 +1507,8 @@ void
 move_block_to_reg (int regno, rtx x, int nregs, machine_mode mode)
 {
   int i;
-#ifdef HAVE_load_multiple
   rtx pat;
   rtx_insn *last;
-#endif
 
   if (nregs == 0)
     return;
@@ -1519,7 +1517,6 @@ move_block_to_reg (int regno, rtx x, int nregs, machine_mode mode)
     x = validize_mem (force_const_mem (mode, x));
 
   /* See if the machine can do this with a load multiple insn.  */
-#ifdef HAVE_load_multiple
   if (HAVE_load_multiple)
     {
       last = get_last_insn ();
@@ -1533,7 +1530,6 @@ move_block_to_reg (int regno, rtx x, int nregs, machine_mode mode)
       else
 	delete_insns_since (last);
     }
-#endif
 
   for (i = 0; i < nregs; i++)
     emit_move_insn (gen_rtx_REG (word_mode, regno + i),