[vmkit-commits] [vmkit] r83842 - /vmkit/trunk/autoconf/configure.ac

[Nicolas Geoffray]

Author: geoffray
Date: Mon Oct 12 05:44:16 2009
New Revision: 83842

URL: http://llvm.org/viewvc/llvm-project?rev=83842&view=rev
Log:
Add a new GC: MMTk.


Modified:
    vmkit/trunk/autoconf/configure.ac

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=83842&r1=83841&r2=83842&view=diff

==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Mon Oct 12 05:44:16 2009
@@ -232,19 +232,29 @@
     ;;
   esac
 else
-  GC_LIBS=GCMmap2
-  if test "x$gc" = "xmulti-mmap"; then
-    GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/GCMmap2 -DWITH_TRACER -DMULTIPLE_GC -I\$(PROJ_SRC_ROOT)/lib/Mvm/Allocator"
-    AC_SUBST([GC_MULTI_MMAP], [1])
-    AC_SUBST([GC_SINGLE_MMAP], [0])
-  else
-    GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/GCMmap2 -DWITH_TRACER -I\$(PROJ_SRC_ROOT)/lib/Mvm/Allocator"
+  if test "x$gc" = "xmmtk";  then
+    GC_FLAGS="-I\$(PROJ_SRC_ROOT)/mmtk/mmtk-j3"
     AC_SUBST([GC_MULTI_MMAP], [0])
     AC_SUBST([GC_SINGLE_MMAP], [1])
+    AC_SUBST(GC_MMAP2, [0])
+    AC_SUBST(GC_BOEHM, [0])
+    GC_LIBS=MMTk
+    GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/MMTk"
+  else
+    GC_LIBS=GCMmap2
+    if test "x$gc" = "xmulti-mmap"; then
+      GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/GCMmap2 -DWITH_TRACER -DMULTIPLE_GC -I\$(PROJ_SRC_ROOT)/lib/Mvm/Allocator"
+      AC_SUBST([GC_MULTI_MMAP], [1])
+      AC_SUBST([GC_SINGLE_MMAP], [0])
+    else
+      GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/GCMmap2 -DWITH_TRACER -I\$(PROJ_SRC_ROOT)/lib/Mvm/Allocator"
+      AC_SUBST([GC_MULTI_MMAP], [0])
+      AC_SUBST([GC_SINGLE_MMAP], [1])
+    fi
+    AC_DEFINE([USE_GC_MMAP2], [1], [Using the gcmmap2])
+    AC_SUBST(GC_MMAP2, [1])
+    AC_SUBST(GC_BOEHM, [0])
   fi
-  AC_DEFINE([USE_GC_MMAP2], [1], [Using the gcmmap2])
-  AC_SUBST(GC_MMAP2, [1])
-  AC_SUBST(GC_BOEHM, [0])
 fi
   
 AC_SUBST([GC_FLAGS])