added WITH_ILP switch

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 296f1a4..3e2469e 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -8,6 +8,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#ifdef WITH_ILP
+
 #include "becopyilp_t.h"
 #include "beifg_t.h"
 
@@ -181,3 +187,10 @@ void free_ilp_env(ilp_env_t *ienv) {
        free_lpp(ienv->lp);
        free(ienv);
 }
+
+#else /* WITH_ILP */
+
+static void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+}
+
+#endif /* WITH_ILP */

diff --git a/ir/be/becopyilp1.c b/ir/be/becopyilp1.c
index 2a0aca4..77ae74a 100644 (file)
--- a/ir/be/becopyilp1.c
+++ b/ir/be/becopyilp1.c
@@ -13,6 +13,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#ifdef WITH_ILP
+
 #include "becopyilp_t.h"
 
 #define DEBUG_LVL 1
@@ -33,3 +35,10 @@ static void ilp1_apply(ilp_env_t *ienv) {
 int co_solve_ilp1(copy_opt_t *co, double time_limit) {
        return 1;
 }
+
+#else /* WITH_ILP */
+
+static void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+}
+
+#endif /* WITH_ILP */

diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index 3dbc923..2d8320c 100644 (file)
--- a/ir/be/becopyilp2.c
+++ b/ir/be/becopyilp2.c
@@ -30,6 +30,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#ifdef WITH_ILP
+
 #include <bitset.h>
 #include "pdeq.h"
 
@@ -377,7 +379,7 @@ static void extend_path(ilp_env_t *ienv, pdeq *path, ir_node *irn) {
        /* check for forbidden interferences */
        len = pdeq_len(path);
        curr_path = alloca(len * sizeof(*curr_path));
-       pdeq_copyl(path, curr_path);
+       pdeq_copyl(path, (const void **)curr_path);
 
        for (i=1; i<len; ++i)
                if (be_ifg_connected(ifg, irn, curr_path[i]))
@@ -523,3 +525,10 @@ int co_solve_ilp2(copy_opt_t *co, double time_limit) {
 
        return sol_state == lpp_optimal;
 }
+
+#else /* WITH_ILP */
+
+static void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+}
+
+#endif /* WITH_ILP */

diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index 1c892cd..8e9ebda 100644 (file)
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -11,9 +11,8 @@
 #ifndef _BECOPYILP_T_H
 #define _BECOPYILP_T_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "firm_config.h"
+
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif