newcomp moved to jit

[cacao.git] / loader.c

diff --git a/loader.c b/loader.c
index 3927e3a7c719ea4974129d5840742e74c5e28cb1..9b58781060b1e91090a6343d6c6b9dceef55c842 100644 (file)
--- a/loader.c
+++ b/loader.c
@@ -22,7 +22,10 @@
 #include "tables.h"
 #include "native.h"
 #include "builtin.h"
+#include "jit.h"
+#ifdef OLD_COMPILER
 #include "compiler.h"
+#endif
 #include "asmpart.h"
 
 #include "threads/thread.h"                        /* schani */
@@ -548,10 +551,14 @@ static void method_load (methodinfo *m, classinfo *c)
                functionptr f = native_findfunction 
                       (c->name, m->name, m->descriptor, (m->flags & ACC_STATIC) != 0);
                if (f) {
+#ifdef OLD_COMPILER
                if (newcompiler)
-                       m -> stubroutine = ncreatenativestub (f, m);
-               else
+#endif
                        m -> stubroutine = createnativestub (f, m);
+#ifdef OLD_COMPILER
+               else
+                       m -> stubroutine = oldcreatenativestub (f, m);
+#endif
                        }
                }