From 7ecbf85d67ff8f839e966ed8bbae33e079ea34b6 Mon Sep 17 00:00:00 2001 From: hboehm Date: Thu, 10 Jan 2008 21:47:52 +0000 Subject: [PATCH] 2008-01-10 Hans Boehm * configure.ac: Ignore --enable-parallel-mark on Darwin for now. * configure: Regenerate. * darwin_stop_world.c: Add FIXME comment for parallel marker. --- ChangeLog | 6 ++++++ configure | 58 ++++++++++++++++++++++++++--------------------------- configure.ac | 9 +++++---- darwin_stop_world.c | 2 ++ 4 files changed, 41 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 573e933..fa2d9b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-10 Hans Boehm + + * configure.ac: Ignore --enable-parallel-mark on Darwin for now. + * configure: Regenerate. + * darwin_stop_world.c: Add FIXME comment for parallel marker. + 2008-01-09 Hans Boehm * include/private/gc_priv.h: Update MAX_ROOT_SETS diff --git a/configure b/configure index 385323e..d88b044 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.29 . +# From configure.ac Revision: 1.30 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for gc 7.1alpha1. # @@ -4871,12 +4871,10 @@ _ACEOF { echo "$as_me:$LINENO: WARNING: \"Explict GC_INIT() calls may be required.\"" >&5 echo "$as_me: WARNING: \"Explict GC_INIT() calls may be required.\"" >&2;}; - if test "${enable_parallel_mark}" = yes; then - cat >>confdefs.h <<\_ACEOF -#define PARALLEL_MARK 1 -_ACEOF - - fi + # Parallel-mark is currently unreliable on Darwin; ignore request + # if test "${enable_parallel_mark}" = yes; then + # AC_DEFINE(PARALLEL_MARK) + # fi darwin_threads=true ;; *-*-osf*) @@ -6855,7 +6853,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6858 "configure"' > conftest.$ac_ext + echo '#line 6856 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9118,11 +9116,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9121: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9119: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9125: \$? = $ac_status" >&5 + echo "$as_me:9123: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9386,11 +9384,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9389: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9387: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9393: \$? = $ac_status" >&5 + echo "$as_me:9391: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9490,11 +9488,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9493: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9491: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9497: \$? = $ac_status" >&5 + echo "$as_me:9495: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11798,7 +11796,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:14239: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14245: \$? = $ac_status" >&5 + echo "$as_me:14243: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14342,11 +14340,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14345: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14343: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14349: \$? = $ac_status" >&5 + echo "$as_me:14347: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15912,11 +15910,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15915: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15913: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15919: \$? = $ac_status" >&5 + echo "$as_me:15917: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16016,11 +16014,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16019: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16017: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16023: \$? = $ac_status" >&5 + echo "$as_me:16021: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18218,11 +18216,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18221: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18219: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18225: \$? = $ac_status" >&5 + echo "$as_me:18223: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18486,11 +18484,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18489: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18487: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18493: \$? = $ac_status" >&5 + echo "$as_me:18491: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18590,11 +18588,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18593: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18591: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18597: \$? = $ac_status" >&5 + echo "$as_me:18595: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized diff --git a/configure.ac b/configure.ac index 05d4c5e..e9ee978 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_INIT(gc,7.1alpha1,Hans.Boehm@hp.com) AC_CONFIG_SRCDIR(gcj_mlc.c) AC_CANONICAL_TARGET AC_PREREQ(2.53) -AC_REVISION($Revision: 1.30 $) +AC_REVISION($Revision: 1.31 $) GC_SET_VERSION AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects nostdinc]) AM_MAINTAINER_MODE @@ -162,9 +162,10 @@ case "$THREADS" in AC_DEFINE(GC_DARWIN_THREADS) AC_DEFINE(THREAD_LOCAL_ALLOC) AC_MSG_WARN("Explict GC_INIT() calls may be required."); - if test "${enable_parallel_mark}" = yes; then - AC_DEFINE(PARALLEL_MARK) - fi + # Parallel-mark is currently unreliable on Darwin; ignore request + # if test "${enable_parallel_mark}" = yes; then + # AC_DEFINE(PARALLEL_MARK) + # fi darwin_threads=true ;; *-*-osf*) diff --git a/darwin_stop_world.c b/darwin_stop_world.c index a2f0926..9d3d1e2 100644 --- a/darwin_stop_world.c +++ b/darwin_stop_world.c @@ -476,6 +476,8 @@ void GC_stop_world() it created before stopping show up later. */ + /* FIXME: This seems to erroneously stop the parallel marker threads? */ + changes = 1; prev_list = NULL; prevcount = 0; -- 2.7.4