defaults.h (REGISTER_MOVE_COST): Define default here.

	* defaults.h (REGISTER_MOVE_COST): Define default here.
	* regclass.c: Don't define default REGISTER_MOVE_COST here.
	* reload.c, reload1.c: Ditto.

From-SVN: r68567

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bf44a3c738f9369b3dec83fed7079d84024d060e..ef1db4194a83cb2f33dbfaa97a908d513dc074a7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-27  Hans-Peter Nilsson  <hp@axis.com>
+
+       * defaults.h (REGISTER_MOVE_COST): Define default here.
+       * regclass.c: Don't define default REGISTER_MOVE_COST here.
+       * reload.c, reload1.c: Ditto.
+
 2003-06-27  Richard Earnshaw <rearnsha@arm.com>
 
        * flags.h: Really install previous change.

diff --git a/gcc/defaults.h b/gcc/defaults.h
index 0f328fa95910db74be3497667dee8d53aee4dbbc..eb3e78cae1348dddbb6cf9d0779ba4cb27aeceb6 100644 (file)
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -621,6 +621,10 @@ You Lose!  You must define PREFERRED_DEBUGGING_TYPE!
 #define EXTRA_CONSTRAINT_STR(OP, C,STR) EXTRA_CONSTRAINT (OP, C)
 #endif
 
+#ifndef REGISTER_MOVE_COST
+#define REGISTER_MOVE_COST(m, x, y) 2
+#endif
+
 /* Determine whether the the entire c99 runtime
    is present in the runtime library.  */
 #ifndef TARGET_C99_FUNCTIONS

diff --git a/gcc/regclass.c b/gcc/regclass.c
index 01c08f3a07861dac6f392d82eb2ccdecff5ff6f2..e587f71a40c0111731ea51c172ac2d89babe6c2d 100644 (file)
--- a/gcc/regclass.c
+++ b/gcc/regclass.c
@@ -45,10 +45,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "ggc.h"
 #include "timevar.h"
 
-#ifndef REGISTER_MOVE_COST
-#define REGISTER_MOVE_COST(m, x, y) 2
-#endif
-
 static void init_reg_sets_1    PARAMS ((void));
 static void init_reg_modes     PARAMS ((void));
 static void init_reg_autoinc   PARAMS ((void));

diff --git a/gcc/reload.c b/gcc/reload.c
index 7a2efa31f5d1c8b3b23ffac2c5722a088e8853f8..9b1b148d86002d6c29ddc1c351fb3d912fa35269 100644 (file)
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -105,10 +105,6 @@ a register with any other reload.  */
 #include "function.h"
 #include "toplev.h"
 
-#ifndef REGISTER_MOVE_COST
-#define REGISTER_MOVE_COST(m, x, y) 2
-#endif
-
 #ifndef REGNO_MODE_OK_FOR_BASE_P
 #define REGNO_MODE_OK_FOR_BASE_P(REGNO, MODE) REGNO_OK_FOR_BASE_P (REGNO)
 #endif

diff --git a/gcc/reload1.c b/gcc/reload1.c
index 2e641673585ffd0da07a1033d0794b277c65189d..e1c470e12c7ab1ec8b0736b9e71ffb5bf044a685 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -78,10 +78,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    fixing up each insn, and generating the new insns to copy values
    into the reload registers.  */
 
-#ifndef REGISTER_MOVE_COST
-#define REGISTER_MOVE_COST(m, x, y) 2
-#endif
-
 #ifndef LOCAL_REGNO
 #define LOCAL_REGNO(REGNO)  0
 #endif