remove #ifdef HAVE_CONFIG_Hs

[libfirm] / ir / common / firm.c

diff --git a/ir/common/firm.c b/ir/common/firm.c
index 97edf99..2084a0b 100644 (file)
--- a/ir/common/firm.c
+++ b/ir/common/firm.c
@@ -23,16 +23,12 @@
  * @author    Martin Trapp, Christian Schaefer, Goetz Lindenmaier
  * @version   $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #ifdef HAVE_FIRM_REVISION_H
 # include "firm_revision.h"
 #endif
 
-#include "firm_config.h"
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -63,6 +59,7 @@
 #include "funccall_t.h"
 #include "irhooks.h"
 #include "iredges_t.h"
+#include "irmemory_t.h"
 #include "tropt.h"
 #include "debugger.h"
 #include "be_t.h"
@@ -148,6 +145,8 @@ void init_firm(const firm_parameter_t *param)
        init_type_identify(def_params.ti_if);
        /* class cast optimization */
        firm_init_class_casts_opt();
+       /* memory disambiguation */
+       firm_init_memory_disambiguator();
 
        /* Init architecture dependent optimizations. */
        arch_dep_init(arch_dep_default_factory);