some workaround to avoid condeval creating Phibs which not all backends like

[libfirm] / ir / be / bejavacoal.c

diff --git a/ir/be/bejavacoal.c b/ir/be/bejavacoal.c
index 82a2e24..297c9fa 100644 (file)
--- a/ir/be/bejavacoal.c
+++ b/ir/be/bejavacoal.c
@@ -3,10 +3,8 @@
 #include "config.h"
 #endif
 
-#ifdef WITH_LIBCORE
 #include <libcore/lc_opts.h>
 #include <libcore/lc_opts_enum.h>
-#endif /* WITH_LIBCORE */
 
 #ifdef _WIN32
 #include <windows.h>
@@ -20,6 +18,8 @@
 #include <stdio.h>
 
 #include "bejavacoal.h"
+#include "irtools.h"
+#include "bemodule.h"
 
 #ifdef WITH_JVM
 
@@ -35,7 +35,6 @@ static char cls_name[256] = "coalescing/mst/safe/Algo";
 /* Name of the JVM dll/so */
 static char jvm_lib[512] = { 0 };
 
-#ifdef WITH_LIBCORE
 static const lc_opt_table_entry_t options[] = {
        LC_OPT_ENT_STR      ("jvm",  "absolute path to jvm dll",                    jvm_lib, sizeof(jvm_lib)),
        LC_OPT_ENT_STR      ("jar",  "jar file of the coalescer",                   jar_file, sizeof(jar_file)),
@@ -48,12 +47,11 @@ void be_init_javacoal(void)
        lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
        lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra");
        lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal");
-       lc_opt_entry_t *jc_grp = lc_opt_get_grp(grp, "jc");
+       lc_opt_entry_t *jc_grp = lc_opt_get_grp(chordal_grp, "jc");
        lc_opt_add_table(jc_grp, options);
 }
 
 BE_REGISTER_MODULE_CONSTRUCTOR(be_init_javacoal);
-#endif /* WITH_LIBCORE */
 
 #include <jni.h>