[m-rev.] for review: upgrade to Boehm GC 7.0 alpha 6 (CVS)

[Peter Wang]

On 2006-08-14, Peter Wang <wangp at students.csse.unimelb.edu.au> wrote:
> Mmake.common.in:
> configure.in:
> runtime/RESERVED_MACRO_NAMES:
> scripts/mgnuc.in:
> 	Don't define `THREAD_LOCAL_ALLOC' nor `GC_REDIRECT_TO_LOCAL' as
> 	thread-local allocation is automatically enabled in gc 7.0.

Oops.  Committed this followup.

Estimated hours taken: 0.2
Branches: main

configure.in:
Mmake.common.in:
        Revert previous change regarding thread-local allocation.
        We do need to define THREAD_LOCAL_ALLOC when building Boehm GC.

Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.465
diff -u -r1.465 configure.in
--- configure.in        15 Aug 2006 04:19:19 -0000      1.465
+++ configure.in        15 Aug 2006 08:54:25 -0000
@@ -2483,6 +2483,7 @@
 # Note that changes here may require changes in scripts/ml.in.
 LDFLAGS_FOR_THREADS=
 LD_LIBFLAGS_FOR_THREADS=
+ENABLE_BOEHM_THREAD_LOCAL_ALLOC=
 ENABLE_BOEHM_PARALLEL_MARK=
 case "$host" in
        *solaris*)
@@ -2498,6 +2499,7 @@
                CFLAGS_FOR_THREADS="-DMR_THREAD_SAFE -DLINUX_THREADS \
                        -D_THREAD_SAFE -D_REENTRANT"
                THREAD_LIBS="-lpthread -ldl"
+               ENABLE_BOEHM_THREAD_LOCAL_ALLOC="-DTHREAD_LOCAL_ALLOC"
                ENABLE_BOEHM_PARALLEL_MARK="-DPARALLEL_MARK"
                ;;

@@ -2573,6 +2575,7 @@
 AC_SUBST(THREAD_LIBS)
 AC_SUBST(LDFLAGS_FOR_THREADS)
 AC_SUBST(LD_LIBFLAGS_FOR_THREADS)
+AC_SUBST(ENABLE_BOEHM_THREAD_LOCAL_ALLOC)
 AC_SUBST(ENABLE_BOEHM_PARALLEL_MARK)

 #-----------------------------------------------------------------------------#
Index: Mmake.common.in
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmake.common.in,v
retrieving revision 1.90
diff -u -r1.90 Mmake.common.in
--- Mmake.common.in     15 Aug 2006 04:19:19 -0000      1.90
+++ Mmake.common.in     15 Aug 2006 08:54:25 -0000
@@ -148,7 +148,8 @@

 # Additional options to pass to the C compiler when building Boehm-GC for
 # threads.
-BOEHM_CFLAGS_FOR_THREADS = @ENABLE_BOEHM_PARALLEL_MARK@
+BOEHM_CFLAGS_FOR_THREADS = @ENABLE_BOEHM_THREAD_LOCAL_ALLOC@ \
+       @ENABLE_BOEHM_PARALLEL_MARK@

 # Do we want to deal with intermodule information when building the library?
 # By default yes, since this way we note immediately when intermodule


--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------