X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbejavacoal.c;h=3ef97dbb5a7e000d67a5244edac91c57d9d965ac;hb=80a6158fdd766f42ee6c508a773bc114ff1b61f3;hp=fde61e6b16d144ebe3a8a23d7dfe071cf86c103a;hpb=0050bc6bc6026d71c49d10b4644fc1e635682d46;p=libfirm

diff --git a/ir/be/bejavacoal.c b/ir/be/bejavacoal.c
index fde61e6b1..3ef97dbb5 100644
--- a/ir/be/bejavacoal.c
+++ b/ir/be/bejavacoal.c
@@ -20,6 +20,10 @@
 #include <stdio.h>
 
 #include "bejavacoal.h"
+#include "irtools.h"
+#include "bemodule.h"
+
+#ifdef WITH_JVM
 
 /* Path to the jar file. A little OS dependent convenience. */
 #ifdef _WIN32
@@ -30,7 +34,7 @@ static char jar_file[512] = "/ben/hack/public/coal.jar";
 
 static char cls_name[256] = "coalescing/mst/safe/Algo";
 
-/* Name of teh JVM dll/so */
+/* Name of the JVM dll/so */
 static char jvm_lib[512] = { 0 };
 
 #ifdef WITH_LIBCORE
@@ -41,14 +45,18 @@ static const lc_opt_table_entry_t options[] = {
 	{ NULL }
 };
 
-void be_java_coal_register_options(lc_opt_entry_t *grp)
+void be_init_javacoal(void)
 {
-	lc_opt_entry_t *jc_grp = lc_opt_get_grp(grp, "jc");
+	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(chordal_grp, "jc");
 	lc_opt_add_table(jc_grp, options);
 }
-#endif
 
-#ifdef WITH_JVM
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_javacoal);
+#endif /* WITH_LIBCORE */
+
 #include <jni.h>
 
 typedef struct _jni_env_t {
@@ -462,5 +470,4 @@ void be_java_coal_start_jvm(void)
 {
 }
 
-
 #endif /* WITH_JVM */