From: Ivan Maidanski <ivmai@mail.ru>
Date: Fri, 23 Sep 2011 08:13:03 +0000 (+0400)
Subject: Regenerate configure; update ChangeLog
X-Git-Tag: gc7_2~120^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efddfd8a72028ed54ae579dfc5c05133375c8ff4;p=gc

Regenerate configure; update ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index 6a925c10..7150b029 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-09-23  Ivan Maidanski <ivmai@mail.ru>
+
+	* configure: Regenerate.
+
+2011-09-23  Ivan Maidanski <ivmai@mail.ru>
+
+	* configure.ac (NO_DEBUGGING): Define based on testing enable_gc_debug
+	value (instead of based on with_cross_host value).
+
+2011-09-23  Ivan Maidanski <ivmai@mail.ru>
+
+	* configure.ac (THREAD_LOCAL_ALLOC): Test enable_shared and
+	enable_static values properly when setting THREAD_LOCAL_ALLOC
+	in case PARALLEL_MARK is off (Win32 only).
+
 2011-09-22  Ivan Maidanski <ivmai@mail.ru>
 
 	* configure: Regenerate.
diff --git a/configure b/configure
index 5cb6976f..94f28f54 100755
--- a/configure
+++ b/configure
@@ -5097,7 +5097,7 @@ $as_echo "$as_me: WARNING: \"Explicit GC_INIT() calls may be required.\"" >&2;};
       $as_echo "#define THREAD_LOCAL_ALLOC 1" >>confdefs.h
 
     else
-      if test "${enable_static}" == yes; then
+      if test "${enable_shared}" != yes || test "${enable_static}" != no; then
         # Imply THREAD_LOCAL_ALLOC unless GC_DLL.
         $as_echo "#define THREAD_LOCAL_ALLOC 1" >>confdefs.h
 
@@ -16378,6 +16378,9 @@ $as_echo "#define NO_CLOCK 1" >>confdefs.h
 
 $as_echo "#define SMALL_CONFIG 1" >>confdefs.h
 
+fi
+
+if test "$enable_gc_debug" == "no"; then
 
 $as_echo "#define NO_DEBUGGING 1" >>confdefs.h
 
@@ -16385,7 +16388,6 @@ fi
 
 
 
-
 # Check whether --enable-gc-assertions was given.
 if test "${enable_gc_assertions+set}" = set; then :
   enableval=$enable_gc_assertions;