* autogen.sh: Make it work with unpatched Boehm GC.

* src/mm/gc-boehm.cpp: Likewise.

diff --git a/autogen.sh b/autogen.sh
index 5b41f04c3b038b04bf935a4aa42644421a55ad18..93efd66b1a7fe681e676e793243aee1f6a5b3565 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -147,4 +147,4 @@ fi
 
 export ACLOCAL AUTOCONF AUTOHEADER AUTOMAKE LIBTOOLIZE
 
-${AUTORECONF} --force --install
+${AUTORECONF} --force --install --no-recursive

diff --git a/src/mm/gc-boehm.cpp b/src/mm/gc-boehm.cpp
index 3cc8ada0978e4b94f6c115ca2e0bb859cff9a475..70d494cbb35816d37ca8eb7d5d3a959c0f19c7e5 100644 (file)
--- a/src/mm/gc-boehm.cpp
+++ b/src/mm/gc-boehm.cpp
@@ -41,6 +41,7 @@
 #endif
 
 #include "boehm-gc/include/gc.h"
+#include "boehm-gc/include/javaxfc.h"
 #include "mm/gc.hpp"
 #include "mm/memory.hpp"
 
@@ -60,6 +61,7 @@
 /* global variables ***********************************************************/
 
 static bool in_gc_out_of_memory = false;    /* is GC out of memory?           */
+static size_t gc_max_heap_size = 0;
 
 
 /* prototype static functions *************************************************/
@@ -105,6 +107,7 @@ void gc_init(size_t heapmaxsize, size_t heapstartsize)
        /* set the maximal heap size */
 
        GC_set_max_heap_size(heapmaxsize);
+       gc_max_heap_size = heapmaxsize;
 
        /* set the initial heap size */
 
@@ -215,7 +218,7 @@ int64_t gc_get_total_bytes(void)
 
 int64_t gc_get_max_heap_size(void)
 {
-       return GC_get_max_heap_size();
+       return gc_max_heap_size;
 }