From a79e752360d02b4d5cc3989801535727e4e82644 Mon Sep 17 00:00:00 2001 From: steven Date: Sun, 23 May 2010 15:40:15 +0000 Subject: [PATCH] * regs.h: Do not include obstack.h, basic-block.h. Include machmode.h. * jump.c: Include basic-block.h. * profile.c: Likewise. * tree-profile.c: Likewise. * coverage.c: Likewise. * basic-block.h (optimize_function_for_size_p): Move to function.h. (optimize_function_for_speed_p): Likewise. * function.h (optimize_function_for_size_p, optimize_function_for_speed_p): Moved here from basic-block.h. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159761 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 13 +++++++++++++ gcc/basic-block.h | 2 -- gcc/coverage.c | 1 + gcc/function.h | 5 +++++ gcc/jump.c | 1 + gcc/profile.c | 1 + gcc/regs.h | 3 +-- gcc/tree-profile.c | 1 + 8 files changed, 23 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c8927954e4c9..4092ae1fb4d4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,16 @@ +2010-05-23 Steven Bosscher + + * regs.h: Do not include obstack.h, basic-block.h. + Include machmode.h. + * jump.c: Include basic-block.h. + * profile.c: Likewise. + * tree-profile.c: Likewise. + * coverage.c: Likewise. + * basic-block.h (optimize_function_for_size_p): Move to function.h. + (optimize_function_for_speed_p): Likewise. + * function.h (optimize_function_for_size_p, + optimize_function_for_speed_p): Moved here from basic-block.h. + 2010-05-23 Ralf Wildenhues * lto-wrapper.c (run_gcc): Unset MAKEFLAGS and MFLAGS diff --git a/gcc/basic-block.h b/gcc/basic-block.h index c5b8799d8d57..7992f2a162f1 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -749,8 +749,6 @@ extern bool optimize_bb_for_size_p (const_basic_block); extern bool optimize_bb_for_speed_p (const_basic_block); extern bool optimize_edge_for_size_p (edge); extern bool optimize_edge_for_speed_p (edge); -extern bool optimize_function_for_size_p (struct function *); -extern bool optimize_function_for_speed_p (struct function *); extern bool optimize_loop_for_size_p (struct loop *); extern bool optimize_loop_for_speed_p (struct loop *); extern bool optimize_loop_nest_for_size_p (struct loop *); diff --git a/gcc/coverage.c b/gcc/coverage.c index 5ef4dddd8128..065c87cd3646 100644 --- a/gcc/coverage.c +++ b/gcc/coverage.c @@ -37,6 +37,7 @@ along with GCC; see the file COPYING3. If not see #include "regs.h" #include "expr.h" #include "function.h" +#include "basic-block.h" #include "toplev.h" #include "tm_p.h" #include "ggc.h" diff --git a/gcc/function.h b/gcc/function.h index 9063e52558ce..6e150921f788 100644 --- a/gcc/function.h +++ b/gcc/function.h @@ -703,4 +703,9 @@ extern bool reference_callee_copied (CUMULATIVE_ARGS *, enum machine_mode, extern void used_types_insert (tree); extern int get_next_funcdef_no (void); + +/* In predict.c */ +extern bool optimize_function_for_size_p (struct function *); +extern bool optimize_function_for_speed_p (struct function *); + #endif /* GCC_FUNCTION_H */ diff --git a/gcc/jump.c b/gcc/jump.c index 6ce989d2037f..6c3263c01a04 100644 --- a/gcc/jump.c +++ b/gcc/jump.c @@ -47,6 +47,7 @@ along with GCC; see the file COPYING3. If not see #include "insn-attr.h" #include "recog.h" #include "function.h" +#include "basic-block.h" #include "expr.h" #include "except.h" #include "diagnostic.h" diff --git a/gcc/profile.c b/gcc/profile.c index ac460464697c..efbbf7936fea 100644 --- a/gcc/profile.c +++ b/gcc/profile.c @@ -59,6 +59,7 @@ along with GCC; see the file COPYING3. If not see #include "regs.h" #include "expr.h" #include "function.h" +#include "basic-block.h" #include "toplev.h" #include "coverage.h" #include "value-prof.h" diff --git a/gcc/regs.h b/gcc/regs.h index 01325b09e91b..c9dddb5abd15 100644 --- a/gcc/regs.h +++ b/gcc/regs.h @@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_REGS_H #define GCC_REGS_H -#include "obstack.h" +#include "machmode.h" #include "hard-reg-set.h" -#include "basic-block.h" #define REG_BYTES(R) mode_size[(int) GET_MODE (R)] diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c index 9bc1bc3eae01..2d3ec1228584 100644 --- a/gcc/tree-profile.c +++ b/gcc/tree-profile.c @@ -34,6 +34,7 @@ along with GCC; see the file COPYING3. If not see #include "regs.h" #include "expr.h" #include "function.h" +#include "basic-block.h" #include "toplev.h" #include "coverage.h" #include "tree.h" -- 2.47.2