can build

5 files changed, 1 insertions, 36 deletions

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 607190e1935..fc94378950a 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1409,10 +1409,7 @@ OBJS = \
 	init-regs.o \
 	internal-fn.o \
 	ipa-type-escape-analysis.o \
-	ipa-hello-world.o \
-	ipa-escape-analysis.o \
 	ipa-prototype.o \
-	ipa-type-escape-analysis.o \
 	type-walker.o \
 	type-reconstructor.o \
 	expr-walker.o \
diff --git a/gcc/common.opt b/gcc/common.opt
index 10d9d19b622..ed38e2a3e7a 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -3464,32 +3464,6 @@ fipa-ra
 Common Report Var(flag_ipa_ra) Optimization
 Use caller save register across calls if possible.
 
-fipa-typelist-struct=
-Common Joined Report Var(flag_ipa_typelist_struct) Init(0)
--fipa-typelist-struct=<string>	Name of struct of interest
-
-fipa-typelist-field=
-Common Joined Report Var(flag_ipa_typelist_field) Init(0)
--fipa-typelist-field=<string>	Name of struct of interest
-
-fipa-type-escape-analysis
-Common Report Var(flag_ipa_type_escape_analysis) Optimization
-Type escape analysis
-
-fipa-hello-world
-Common Report Var(flag_ipa_hello_world) Optimization
-Hello world
-
-ftp-types-compared=
-Common Joined Report Var(flag_tp_types_compared) Init(0)
-
-ftp-comparison-functions=
-Common Joined Report Var(flag_tp_comparison_functions) Init(0)
-
-fipa-prototype
-Common Report Var(flag_ipa_prototype) Optimization
-TBD
-
 fipa-type-escape-analysis
 Common Report Var(flag_ipa_type_escape_analysis) Optimization
 This flag is only used for debugging the type escape analysis
diff --git a/gcc/ipa-prototype.c b/gcc/ipa-prototype.c
index 76d5b223900..f83e0d8c54e 100644
--- a/gcc/ipa-prototype.c
+++ b/gcc/ipa-prototype.c
@@ -318,7 +318,7 @@ public:
     : simple_ipa_opt_pass(pass_data_ipa_prototype, ctx)
   {}
 
-  virtual bool gate(function*) { return flag_ipa_prototype; }
+  virtual bool gate(function*) { return false; }
   virtual unsigned execute (function*) { return iphw_execute(); }
 };
 } // anon namespace
diff --git a/gcc/passes.def b/gcc/passes.def
index 2163020c79e..795b0dff667 100644
--- a/gcc/passes.def
+++ b/gcc/passes.def
@@ -150,8 +150,6 @@ along with GCC; see the file COPYING3.  If not see
   NEXT_PASS (pass_ipa_profile);
   NEXT_PASS (pass_ipa_icf);
   NEXT_PASS (pass_ipa_devirt);
-  NEXT_PASS (pass_ipa_type_escape_analysis);
-  NEXT_PASS (pass_ipa_hello_world);
   NEXT_PASS (pass_ipa_cp);
   NEXT_PASS (pass_ipa_sra);
   NEXT_PASS (pass_ipa_cdtor_merge);
@@ -175,8 +173,6 @@ along with GCC; see the file COPYING3.  If not see
   NEXT_PASS (pass_materialize_all_clones);
   NEXT_PASS (pass_ipa_type_escape_analysis);
   NEXT_PASS (pass_ipa_structure_reorg);
-  NEXT_PASS (pass_ipa_hello_world);
-  NEXT_PASS (pass_ipa_prototype);
   NEXT_PASS (pass_ipa_pta);
   NEXT_PASS (pass_omp_simd_clone);
   TERMINATE_PASS_LIST (all_late_ipa_passes)
diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h
index 54d7d372fdf..d25ee6e658c 100644
--- a/gcc/tree-pass.h
+++ b/gcc/tree-pass.h
@@ -502,8 +502,6 @@ extern ipa_opt_pass_d *make_pass_ipa_inline (gcc::context *ctxt);
 extern simple_ipa_opt_pass *make_pass_ipa_free_lang_data (gcc::context *ctxt);
 extern simple_ipa_opt_pass *make_pass_ipa_free_fn_summary (gcc::context *ctxt);
 extern simple_ipa_opt_pass *make_pass_ipa_type_escape_analysis (gcc::context *ctxt);
-extern simple_ipa_opt_pass *make_pass_ipa_hello_world (gcc::context *ctxt);
-extern simple_ipa_opt_pass *make_pass_ipa_escape_analysis (gcc::context *ctxt);
 extern simple_ipa_opt_pass *make_pass_ipa_prototype (gcc::context *ctxt);
 extern ipa_opt_pass_d *make_pass_ipa_cp (gcc::context *ctxt);
 extern ipa_opt_pass_d *make_pass_ipa_sra (gcc::context *ctxt);