reload1.c (reloads_conflict, gen_reload): Make them static.

	* reload1.c (reloads_conflict, gen_reload): Make them static.
	* reload.h: Remove the corresponding prototypes.

From-SVN: r90350

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e949d74d9ecc9a2cd063bbf252b22d95f36c2f84..17a5627ca44136afccecd197087d1cee3a17c10b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-09  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * reload1.c (reloads_conflict, gen_reload): Make them static.
+       * reload.h: Remove the corresponding prototypes.
+
 2004-11-09  Kazu Hirata  <kazu@cs.umass.edu>
 
        * reload.c (refers_to_mem_for_reload_p,

diff --git a/gcc/reload.h b/gcc/reload.h
index 5cd0ad62cb190344b6a42b6450723da698c64732..7ddadb74141324a558eb523848f454f71b653b61 100644 (file)
--- a/gcc/reload.h
+++ b/gcc/reload.h
@@ -331,7 +331,6 @@ extern int push_reload (rtx, rtx, rtx *, rtx *, enum reg_class,
 extern void reload_cse_regs (rtx);
 
 /* Functions in reload1.c:  */
-extern int reloads_conflict (int, int);
 
 /* Initialize the reload pass once per compilation.  */
 extern void init_reload (void);
@@ -347,11 +346,6 @@ extern void mark_home_live (int);
    replacement (such as sp), plus an offset.  */
 extern rtx eliminate_regs (rtx, enum machine_mode, rtx);
 
-/* Emit code to perform a reload from IN (which may be a reload register) to
-   OUT (which may also be a reload register).  IN or OUT is from operand
-   OPNUM with reload type TYPE.  */
-extern rtx gen_reload (rtx, rtx, int, enum reload_type);
-
 /* Deallocate the reload register used by reload number R.  */
 extern void deallocate_reload_reg (int r);
 

diff --git a/gcc/reload1.c b/gcc/reload1.c
index d70fb299f81927ceff3986c54978bcaf9dd3d2d4..c38ec99f32eb47fb08239f50e08259dd46ea0f59 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -430,6 +430,8 @@ static rtx inc_for_reload (rtx, rtx, rtx, int);
 static void add_auto_inc_notes (rtx, rtx);
 #endif
 static void copy_eh_notes (rtx, rtx);
+static int reloads_conflict (int, int);
+static rtx gen_reload (rtx, rtx, int, enum reload_type);
 \f
 /* Initialize the reload pass once per compilation.  */
 
@@ -4593,7 +4595,7 @@ reload_reg_reaches_end_p (unsigned int regno, int opnum, enum reload_type type)
 
    This function uses the same algorithm as reload_reg_free_p above.  */
 
-int
+static int
 reloads_conflict (int r1, int r2)
 {
   enum reload_type r1_type = rld[r1].when_needed;
@@ -7334,7 +7336,7 @@ emit_reload_insns (struct insn_chain *chain)
 
    Returns first insn emitted.  */
 
-rtx
+static rtx
 gen_reload (rtx out, rtx in, int opnum, enum reload_type type)
 {
   rtx last = get_last_insn ();