tmp: arcv: protos.

Signed-off-by: Luis Silva <luiss@synopsys.com>

Author: luismgsilva

gcc/config/riscv/arcv.h

@@ -21,14 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #define GCC_RISCV_ARCV_H
 
 /* ARCV scheduler interface functions.  */
-extern bool arcv_can_issue_more_p (int, int);
-extern int arcv_sched_variable_issue (rtx_insn *, int);
-extern bool arcv_macro_fusion_pair_p (rtx_insn *, rtx_insn *);
-extern void arcv_sched_init (void);
-extern int arcv_sched_reorder2 (rtx_insn **, int *);
-extern int arcv_sched_adjust_priority (rtx_insn *, int);
-extern int arcv_sched_adjust_cost (rtx_insn *, int, int);
-extern void arcv_sched_fusion_priority (rtx_insn *, int, int *, int *);
+/* FIXME: Remove this file?  */
 
 #endif /* GCC_RISCV_ARCV_H */
 

gcc/config/riscv/riscv-protos.h

@@ -165,9 +165,6 @@ extern bool riscv_epilogue_uses (unsigned int);
 extern bool riscv_can_use_return_insn (void);
 extern rtx riscv_function_value (const_tree, const_tree, enum machine_mode);
 extern bool riscv_store_data_bypass_p (rtx_insn *, rtx_insn *);
-extern bool arcv_mpy_1c_bypass_p (rtx_insn *, rtx_insn *);
-extern bool arcv_mpy_2c_bypass_p (rtx_insn *, rtx_insn *);
-extern bool arcv_mpy_10c_bypass_p (rtx_insn *, rtx_insn *);
 extern rtx riscv_gen_gpr_save_insn (struct riscv_frame_info *);
 extern bool riscv_gpr_save_operation_p (rtx);
 extern void riscv_reinit (void);
@@ -224,6 +221,24 @@ extern bool riscv_expand_block_compare (rtx, rtx, rtx, rtx);
 extern bool riscv_expand_block_move (rtx, rtx, rtx);
 extern bool riscv_expand_block_clear (rtx, rtx);
 
+#ifndef GCC_RISCV_ARCV_H
+#define GCC_RISCV_ARCV_H
+
+/* Routines implemented in arcv.cc.  */
+extern bool arcv_mpy_1c_bypass_p (rtx_insn *, rtx_insn *);
+extern bool arcv_mpy_2c_bypass_p (rtx_insn *, rtx_insn *);
+extern bool arcv_mpy_10c_bypass_p (rtx_insn *, rtx_insn *);
+extern bool arcv_can_issue_more_p (int, int);
+extern int arcv_sched_variable_issue (rtx_insn *, int);
+extern bool arcv_macro_fusion_pair_p (rtx_insn *, rtx_insn *);
+extern void arcv_sched_init (void);
+extern int arcv_sched_reorder2 (rtx_insn **, int *);
+extern int arcv_sched_adjust_priority (rtx_insn *, int);
+extern int arcv_sched_adjust_cost (rtx_insn *, int, int);
+extern void arcv_sched_fusion_priority (rtx_insn *, int, int *, int *);
+
+#endif /* GCC_RISCV_ARCV_H */
+
 /* Information about one CPU we know about.  */
 struct riscv_cpu_info {
   /* This CPU's canonical name.  */