- remove some more of the optimisation flags inside firm. Enabling/Disabling

[libfirm] / ir / common / firm.c

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 5c40fc9..fbe300c 100644 (file)
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -47,21 +47,18 @@
 #include "irgraph_t.h"
 #include "type_t.h"
 #include "entity_t.h"
-#include "opt_inline_t.h"
-#include "scalar_replace.h"
 #include "firmstat.h"
 #include "irarch.h"
-#include "reassoc_t.h"
-#include "funccall_t.h"
 #include "irhooks.h"
 #include "iredges_t.h"
 #include "irmemory_t.h"
-#include "tropt.h"
+#include "opt_init.h"
 #include "debugger.h"
 #include "be_t.h"
 
 /* returns the firm root */
-lc_opt_entry_t *firm_opt_get_root(void) {
+lc_opt_entry_t *firm_opt_get_root(void)
+{
        static lc_opt_entry_t *grp = NULL;
        if (!grp)
                grp = lc_opt_get_grp(lc_opt_root_grp(), "firm");
@@ -93,8 +90,6 @@ void ir_init(const firm_parameter_t *param)
        firm_init_flags();
        /* initialize all ident stuff */
        init_ident(def_params.id_if, 1024);
-       /* initialize Firm hooks */
-       firm_init_hooks();
        /* enhanced statistics, need idents and hooks */
        firm_init_stat(def_params.enable_statistics);
        /* Edges need hooks. */
@@ -138,6 +133,7 @@ void ir_init(const firm_parameter_t *param)
        firm_init_class_casts_opt();
        /* memory disambiguation */
        firm_init_memory_disambiguator();
+       firm_init_loop_opt();
 
        /* Init architecture dependent optimizations. */
        arch_dep_init(arch_dep_default_factory);