From: Segher Boessenkool <segher@gcc.gnu.org>
Date: Thu, 10 Sep 2015 17:25:35 +0000 (+0200)
Subject: shrink-wrap: Header hygiene
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8b661145105bf5d8d7be3f2e57b51c8b8d2c27b7;p=gcc.git

shrink-wrap: Header hygiene

2015-09-10  Segher Boessenkool  <segher@kernel.crashing.org>

	* shrink-wrap.c (requires_stack_frame_p): Make static.
	(prepare_shrink_wrap): Likewise.
	(dup_block_and_redirect): Likewise.
	* shrink-wrap.h: Remove declarations of those functions.

From-SVN: r227652
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df8cc5d6aee..4831e7f9677 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,11 @@
-2015-09-09  Mark Wielaard  <mjw@redhat.com>
+2015-09-10  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* shrink-wrap.c (requires_stack_frame_p): Make static.
+	(prepare_shrink_wrap): Likewise.
+	(dup_block_and_redirect): Likewise.
+	* shrink-wrap.h: Remove declarations of those functions.
+
+2015-09-10  Mark Wielaard  <mjw@redhat.com>
 
 	* doc/invoke.texi (Wnonnull): Also warns when comparing against NULL.
 
diff --git a/gcc/shrink-wrap.c b/gcc/shrink-wrap.c
index c90c40a2429..0ece4cf81c3 100644
--- a/gcc/shrink-wrap.c
+++ b/gcc/shrink-wrap.c
@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3.  If not see
    PROLOGUE_USED contains the hard registers used in the function
    prologue.  SET_UP_BY_PROLOGUE is the set of registers we expect the
    prologue to set up for the function.  */
-bool
+static bool
 requires_stack_frame_p (rtx_insn *insn, HARD_REG_SET prologue_used,
 			HARD_REG_SET set_up_by_prologue)
 {
@@ -420,7 +420,7 @@ move_insn_for_shrink_wrap (basic_block bb, rtx_insn *insn,
    to call-saved registers because their values are live across one or
    more calls during the function.  */
 
-void
+static void
 prepare_shrink_wrap (basic_block entry_block)
 {
   rtx_insn *insn, *curr;
@@ -465,7 +465,7 @@ prepare_shrink_wrap (basic_block entry_block)
 
 /* Create a copy of BB instructions and insert at BEFORE.  Redirect
    preds of BB to COPY_BB if they don't appear in NEED_PROLOGUE.  */
-void
+static void
 dup_block_and_redirect (basic_block bb, basic_block copy_bb, rtx_insn *before,
 			bitmap_head *need_prologue)
 {
diff --git a/gcc/shrink-wrap.h b/gcc/shrink-wrap.h
index dda9b926f5c..efc83703b77 100644
--- a/gcc/shrink-wrap.h
+++ b/gcc/shrink-wrap.h
@@ -23,11 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "function.h"
 
 /* In shrink-wrap.c.  */
-extern bool requires_stack_frame_p (rtx_insn *, HARD_REG_SET, HARD_REG_SET);
-extern void prepare_shrink_wrap (basic_block entry_block);
-extern void dup_block_and_redirect (basic_block bb, basic_block copy_bb,
-				    rtx_insn *before,
-				    bitmap_head *need_prologue);
 extern void try_shrink_wrapping (edge *entry_edge, edge orig_entry_edge,
 				 bitmap_head *bb_flags, rtx_insn *prologue_seq);
 extern edge get_unconverted_simple_return (edge, bitmap_head,