[kaffe] CVS kaffe (robilad): updated boehm gc to version 6.8
Kaffe CVS
cvs-commits at kaffe.org
Wed Nov 1 10:54:43 PST 2006
PatchSet 7431
Date: 2006/11/01 18:53:48
Author: robilad
Branch: HEAD
Tag: (none)
Log:
updated boehm gc to version 6.8
2006-11-01 Dalibor Topic <robilad at kaffe.org>
* kaffe/kaffevm/boehm-gc/boehm/configure.ac: Removed, since
boehm uses configure.in. That fixes a warning during
autogen.sh.
* kaffe/kaffevm/boehm-gc/boehm/configure.in
kaffe/kaffevm/boehm-gc/boehm/darwin_stop_world.c
kaffe/kaffevm/boehm-gc/boehm/dyn_load.c
kaffe/kaffevm/boehm-gc/boehm/malloc.c
kaffe/kaffevm/boehm-gc/boehm/os_dep.c
kaffe/kaffevm/boehm-gc/boehm/pthread_support.c
kaffe/kaffevm/boehm-gc/boehm/version.h
kaffe/kaffevm/boehm-gc/boehm/doc/Makefile.in
kaffe/kaffevm/boehm-gc/boehm/doc/README
kaffe/kaffevm/boehm-gc/boehm/doc/README.changes
kaffe/kaffevm/boehm-gc/boehm/include/Makefile.in
kaffe/kaffevm/boehm-gc/boehm/include/gc.h
kaffe/kaffevm/boehm-gc/boehm/include/gc_config_macros.h
kaffe/kaffevm/boehm-gc/boehm/include/private/gcconfig.h:
Updated to boehm gc 6.8.
also fixes a fail with intrp on x86-linux.
Members:
ChangeLog:1.4931->1.4932
external/gcc/fastjar/fastjar.info:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.12->1.13
kaffe/kaffevm/boehm-gc/boehm/configure:1.17->1.18
kaffe/kaffevm/boehm-gc/boehm/configure.ac:1.6->1.7(DEAD)
kaffe/kaffevm/boehm-gc/boehm/configure.in:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/darwin_stop_world.c:1.5->1.6
kaffe/kaffevm/boehm-gc/boehm/dyn_load.c:1.5->1.6
kaffe/kaffevm/boehm-gc/boehm/malloc.c:1.3->1.4
kaffe/kaffevm/boehm-gc/boehm/os_dep.c:1.5->1.6
kaffe/kaffevm/boehm-gc/boehm/pthread_support.c:1.6->1.7
kaffe/kaffevm/boehm-gc/boehm/version.h:1.5->1.6
kaffe/kaffevm/boehm-gc/boehm/doc/Makefile.in:1.11->1.12
kaffe/kaffevm/boehm-gc/boehm/doc/README:1.5->1.6
kaffe/kaffevm/boehm-gc/boehm/doc/README.changes:1.5->1.6
kaffe/kaffevm/boehm-gc/boehm/include/Makefile.in:1.11->1.12
kaffe/kaffevm/boehm-gc/boehm/include/gc.h:1.5->1.6
kaffe/kaffevm/boehm-gc/boehm/include/gc_config_macros.h:1.4->1.5
kaffe/kaffevm/boehm-gc/boehm/include/private/gcconfig.h:1.5->1.6
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4931 kaffe/ChangeLog:1.4932
--- kaffe/ChangeLog:1.4931 Fri Oct 6 18:50:53 2006
+++ kaffe/ChangeLog Wed Nov 1 18:53:48 2006
@@ -1,3 +1,25 @@
+2006-11-01 Dalibor Topic <robilad at kaffe.org>
+
+ * kaffe/kaffevm/boehm-gc/boehm/configure.ac: Removed, since
+ boehm uses configure.in. That fixes a warning during
+ autogen.sh.
+
+ * kaffe/kaffevm/boehm-gc/boehm/configure.in
+ kaffe/kaffevm/boehm-gc/boehm/darwin_stop_world.c
+ kaffe/kaffevm/boehm-gc/boehm/dyn_load.c
+ kaffe/kaffevm/boehm-gc/boehm/malloc.c
+ kaffe/kaffevm/boehm-gc/boehm/os_dep.c
+ kaffe/kaffevm/boehm-gc/boehm/pthread_support.c
+ kaffe/kaffevm/boehm-gc/boehm/version.h
+ kaffe/kaffevm/boehm-gc/boehm/doc/Makefile.in
+ kaffe/kaffevm/boehm-gc/boehm/doc/README
+ kaffe/kaffevm/boehm-gc/boehm/doc/README.changes
+ kaffe/kaffevm/boehm-gc/boehm/include/Makefile.in
+ kaffe/kaffevm/boehm-gc/boehm/include/gc.h
+ kaffe/kaffevm/boehm-gc/boehm/include/gc_config_macros.h
+ kaffe/kaffevm/boehm-gc/boehm/include/private/gcconfig.h:
+ Updated to boehm gc 6.8.
+
2006-10-06 Guilhem Lavaux <guilhem at kaffe.org>
* kaffe/kaffevm/jni/jni-helpers.c
Index: kaffe/external/gcc/fastjar/fastjar.info
diff -u kaffe/external/gcc/fastjar/fastjar.info:1.3 kaffe/external/gcc/fastjar/fastjar.info:1.4
--- kaffe/external/gcc/fastjar/fastjar.info:1.3 Mon Apr 3 22:30:28 2006
+++ kaffe/external/gcc/fastjar/fastjar.info Wed Nov 1 18:53:48 2006
@@ -1,4 +1,5 @@
-This is fastjar.info, produced by makeinfo version 4.7 from
+This is ../../../../kaffe/external/gcc/fastjar/fastjar.info, produced
+by makeinfo version 4.8 from
../../../../kaffe/external/gcc/fastjar/fastjar.texi.
INFO-DIR-SECTION Programming
@@ -506,9 +507,9 @@
Tag Table:
-Node: Top869
-Node: Invoking fastjar1187
-Node: Invoking grepjar2887
-Node: Copying3498
+Node: Top908
+Node: Invoking fastjar1226
+Node: Invoking grepjar2926
+Node: Copying3537
End Tag Table
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.12 kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.13
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in:1.12 Mon Apr 3 19:59:43 2006
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/Makefile.in Wed Nov 1 18:53:49 2006
@@ -63,7 +63,7 @@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/libtool.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/libtool.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/configure
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/configure:1.17 kaffe/kaffe/kaffevm/boehm-gc/boehm/configure:1.18
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/configure:1.17 Wed Aug 9 19:18:36 2006
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/configure Wed Nov 1 18:53:49 2006
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Revision: 1.6 .
+# From configure.in Revision: 1.3 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for gc 6.7.
+# Generated by GNU Autoconf 2.59 for gc 6.8.
#
# Report bugs to <Hans.Boehm at hp.com>.
#
@@ -429,8 +429,8 @@
# Identity of this package.
PACKAGE_NAME='gc'
PACKAGE_TARNAME='gc'
-PACKAGE_VERSION='6.7'
-PACKAGE_STRING='gc 6.7'
+PACKAGE_VERSION='6.8'
+PACKAGE_STRING='gc 6.8'
PACKAGE_BUGREPORT='Hans.Boehm at hp.com'
ac_unique_file="gcj_mlc.c"
@@ -956,7 +956,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gc 6.7 to adapt to many kinds of systems.
+\`configure' configures gc 6.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1023,7 +1023,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gc 6.7:";;
+ short | recursive ) echo "Configuration of gc 6.8:";;
esac
cat <<\_ACEOF
@@ -1167,7 +1167,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-gc configure 6.7
+gc configure 6.8
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1181,7 +1181,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gc $as_me 6.7, which was
+It was created by gc $as_me 6.8, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1953,7 +1953,7 @@
# Define the identity of the package.
PACKAGE='gc'
- VERSION='6.7'
+ VERSION='6.8'
cat >>confdefs.h <<_ACEOF
@@ -4018,9 +4018,9 @@
_ACEOF
;;
- *-*-hpux*)
- { echo "$as_me:$LINENO: WARNING: \"Only HP/UX 11 threads are supported.\"" >&5
-echo "$as_me: WARNING: \"Only HP/UX 11 threads are supported.\"" >&2;}
+ *-*-hpux11*)
+ { echo "$as_me:$LINENO: WARNING: \"Only HP-UX 11 POSIX threads are supported.\"" >&5
+echo "$as_me: WARNING: \"Only HP-UX 11 POSIX threads are supported.\"" >&2;}
cat >>confdefs.h <<\_ACEOF
#define GC_HPUX_THREADS 1
_ACEOF
@@ -4040,6 +4040,16 @@
_ACEOF
THREADDLLIBS="-lpthread -lrt"
+ # HPUX needs REENTRANT for the _r calls.
+
+cat >>confdefs.h <<\_ACEOF
+#define _REENTRANT 1
+_ACEOF
+
+ ;;
+ *-*-hpux10*)
+ { echo "$as_me:$LINENO: WARNING: \"Only HP-UX 11 POSIX threads are supported.\"" >&5
+echo "$as_me: WARNING: \"Only HP-UX 11 POSIX threads are supported.\"" >&2;}
;;
*-*-freebsd*)
{ echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
@@ -4051,6 +4061,32 @@
INCLUDES="$INCLUDES -pthread"
THREADDLLIBS=-pthread
;;
+ *-*-kfreebsd*-gnu)
+ cat >>confdefs.h <<\_ACEOF
+#define GC_FREEBSD_THREADS 1
+_ACEOF
+
+ INCLUDES="$INCLUDES -pthread"
+ THREADDLLIBS=-pthread
+ cat >>confdefs.h <<\_ACEOF
+#define _REENTRANT 1
+_ACEOF
+
+ if test "${enable_parallel_mark}" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define PARALLEL_MARK 1
+_ACEOF
+
+ fi
+ cat >>confdefs.h <<\_ACEOF
+#define THREAD_LOCAL_ALLOC 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define USE_COMPILER_TLS 1
+_ACEOF
+
+ ;;
*-*-netbsd*)
{ echo "$as_me:$LINENO: WARNING: \"Only on NetBSD 2.0 or later.\"" >&5
echo "$as_me: WARNING: \"Only on NetBSD 2.0 or later.\"" >&2;}
@@ -6084,7 +6120,7 @@
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6087 "configure"' > conftest.$ac_ext
+ echo '#line 6123 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6660,7 +6696,7 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:6663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:6699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
@@ -8595,7 +8631,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8598 "configure"
+#line 8634 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8693,7 +8729,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8696 "configure"
+#line 8732 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10317,7 +10353,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by gc $as_me 6.7, which was
+This file was extended by gc $as_me 6.8, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -10375,7 +10411,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-gc config.status 6.7
+gc config.status 6.8
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
===================================================================
Checking out kaffe/kaffe/kaffevm/boehm-gc/boehm/configure.ac
RCS: /home/cvs/kaffe/kaffe/kaffe/kaffevm/boehm-gc/boehm/Attic/configure.ac,v
VERS: 1.6
***************
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/configure.ac Wed Nov 1 18:54:43 2006
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,479 +0,0 @@
-# Copyright (c) 1999-2001 by Red Hat, Inc. All rights reserved.
-#
-# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
-# OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
-#
-# Permission is hereby granted to use or copy this program
-# for any purpose, provided the above notices are retained on all copies.
-# Permission to modify the code and to distribute modified code is granted,
-# provided the above notices are retained, and a notice that the code was
-# modified is included with the above copyright notice.
-#
-# Original author: Tom Tromey
-# Modified by: Grzegorz Jakacki <jakacki at acm dot org>
-
-dnl Process this file with autoconf to produce configure.
-
-# Initialization
-# ==============
-
-AC_INIT(gc,6.7,Hans.Boehm at hp.com)
- ## version must conform to [0-9]+[.][0-9]+(alpha[0-9]+)?
-AC_CONFIG_SRCDIR(gcj_mlc.c)
-AC_CANONICAL_TARGET
-AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.6 $)
-GC_SET_VERSION
-AM_INIT_AUTOMAKE
-
-AC_SUBST(PACKAGE)
-AC_SUBST(GC_VERSION)
-
-AC_PROG_CC
-AC_PROG_CXX
-
-AM_PROG_AS
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :) # :)
-
-AC_PROG_INSTALL
-
-AM_MAINTAINER_MODE
-
-. [$]{srcdir}/configure.host
-
-GC_CFLAGS=${gc_cflags}
-AC_SUBST(GC_CFLAGS)
-
-AC_ARG_ENABLE(threads, [ --enable-threads=TYPE choose threading package],
- THREADS=$enableval,
- [ AC_MSG_CHECKING([for thread model used by GCC])
- THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
- if test -z "$THREADS"; then
- THREADS=no
- fi
- AC_MSG_RESULT([$THREADS])])
-
-AC_ARG_ENABLE(parallel-mark,
-[ --enable-parallel-mark parallelize marking and free list construction],
- [case "$THREADS" in
- no | none | single)
- AC_MSG_ERROR([Parallel mark requires --enable-threads=x spec])
- ;;
- esac]
-)
-
-AC_ARG_ENABLE(cplusplus,
-[ --enable-cplusplus install C++ support],
-)
-
-INCLUDES=-I${srcdir}/include
-THREADDLLIBS=
-## Libraries needed to support dynamic loading and/or threads.
-case "$THREADS" in
- no | none | single)
- THREADS=none
- ;;
- posix | pthreads)
- THREADS=posix
- THREADDLLIBS=-lpthread
- case "$host" in
- x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* | alpha-*-linux*)
- AC_DEFINE(GC_LINUX_THREADS)
- AC_DEFINE(_REENTRANT)
- if test "${enable_parallel_mark}" = yes; then
- AC_DEFINE(PARALLEL_MARK)
- fi
- AC_DEFINE(THREAD_LOCAL_ALLOC)
- ;;
- *-*-linux*)
- AC_DEFINE(GC_LINUX_THREADS)
- AC_DEFINE(_REENTRANT)
- ;;
- *-*-aix*)
- AC_DEFINE(GC_AIX_THREADS)
- AC_DEFINE(_REENTRANT)
- ;;
- *-*-hpux*)
- AC_MSG_WARN("Only HP/UX 11 threads are supported.")
- AC_DEFINE(GC_HPUX_THREADS)
- AC_DEFINE(_POSIX_C_SOURCE,199506L)
- if test "${enable_parallel_mark}" = yes; then
- AC_DEFINE(PARALLEL_MARK)
- fi
- AC_DEFINE(THREAD_LOCAL_ALLOC)
- THREADDLLIBS="-lpthread -lrt"
- ;;
- *-*-freebsd*)
- AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
- AC_DEFINE(GC_FREEBSD_THREADS)
- INCLUDES="$INCLUDES -pthread"
- THREADDLLIBS=-pthread
- ;;
- *-*-netbsd*)
- AC_MSG_WARN("Only on NetBSD 2.0 or later.")
- AC_DEFINE(GC_NETBSD_THREADS)
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_PTHREADS)
- THREADDLLIBS="-lpthread -lrt"
- ;;
- *-*-solaris*)
- AC_DEFINE(GC_SOLARIS_THREADS)
- AC_DEFINE(GC_SOLARIS_PTHREADS)
- ;;
- *-*-irix*)
- AC_DEFINE(GC_IRIX_THREADS)
- ;;
- *-*-cygwin*)
- AC_DEFINE(GC_WIN32_THREADS)
- ;;
- *-*-darwin*)
- AC_DEFINE(GC_DARWIN_THREADS)
- AC_DEFINE(THREAD_LOCAL_ALLOC)
- if test "${enable_parallel_mark}" = yes; then
- AC_DEFINE(PARALLEL_MARK)
- fi
- ;;
- *-*-osf*)
- AC_DEFINE(GC_OSF1_THREADS)
- if test "${enable_parallel_mark}" = yes; then
- AC_DEFINE(PARALLEL_MARK)
- AC_DEFINE(THREAD_LOCAL_ALLOC)
- # May want to enable it in other cases, too.
- # Measurements havent yet been done.
- fi
- INCLUDES="$INCLUDES -pthread"
- THREADDLLIBS="-lpthread -lrt"
- ;;
- *)
- AC_MSG_ERROR("Pthreads not supported by the GC on this platform.")
- ;;
- esac
- ;;
- win32)
- AC_DEFINE(GC_WIN32_THREADS)
- dnl Wine getenv may not return NULL for missing entry
- AC_DEFINE(NO_GETENV)
- ;;
- dgux386)
- THREADS=dgux386
- AC_MSG_RESULT($THREADDLLIBS)
- # Use pthread GCC switch
- THREADDLLIBS=-pthread
- if test "${enable_parallel_mark}" = yes; then
- AC_DEFINE(PARALLEL_MARK)
- fi
- AC_DEFINE(THREAD_LOCAL_ALLOC)
- AC_DEFINE(GC_DGUX386_THREADS)
- AC_DEFINE(DGUX_THREADS)
- # Enable _POSIX4A_DRAFT10_SOURCE with flag -pthread
- INCLUDES="-pthread $INCLUDES"
- ;;
- aix)
- THREADS=posix
- THREADDLLIBS=-lpthread
- AC_DEFINE(GC_AIX_THREADS)
- AC_DEFINE(_REENTRANT)
- ;;
- decosf1 | irix | mach | os2 | solaris | dce | vxworks)
- AC_MSG_ERROR(thread package $THREADS not yet supported)
- ;;
- *)
- AC_MSG_ERROR($THREADS is an unknown thread package)
- ;;
-esac
-AC_SUBST(THREADDLLIBS)
-
-case "$host" in
- powerpc-*-darwin*)
- powerpc_darwin=true
- ;;
-esac
-AM_CONDITIONAL(POWERPC_DARWIN,test x$powerpc_darwin = xtrue)
-
-AC_MSG_CHECKING(for xlc)
-AC_TRY_COMPILE([],[
- #ifndef __xlC__
- # error
- #endif
-], [compiler_xlc=yes], [compiler_xlc=no])
-AC_MSG_RESULT($compiler_xlc)
-AM_CONDITIONAL(COMPILER_XLC,test $compiler_xlc = yes)
-if test $compiler_xlc = yes -a "$powerpc_darwin" = true; then
- # the darwin stack-frame-walking code is completely broken on xlc
- AC_DEFINE(DARWIN_DONT_PARSE_STACK)
-fi
-
-# We never want libdl on darwin. It is a fake libdl that just ends up making
-# dyld calls anyway
-case "$host" in
- *-*-darwin*) ;;
- *)
- AC_CHECK_LIB(dl, dlopen, THREADDLLIBS="$THREADDLLIBS -ldl")
- ;;
-esac
-
-AC_SUBST(EXTRA_TEST_LIBS)
-
-target_all=libgc.la
-AC_SUBST(target_all)
-
-dnl If the target is an eCos system, use the appropriate eCos
-dnl I/O routines.
-dnl FIXME: this should not be a local option but a global target
-dnl system; at present there is no eCos target.
-TARGET_ECOS="no"
-AC_ARG_WITH(ecos,
-[ --with-ecos enable runtime eCos target support],
-TARGET_ECOS="$with_ecos"
-)
-
-addobjs=
-addlibs=
-addincludes=
-addtests=
-CXXINCLUDES=
-case "$TARGET_ECOS" in
- no)
- ;;
- *)
- AC_DEFINE(ECOS)
- CXXINCLUDES="-I${TARGET_ECOS}/include"
- addobjs="$addobjs ecos.lo"
- ;;
-esac
-
-if test "${enable_cplusplus}" = yes; then
- addincludes="$addincludes include/gc_cpp.h include/gc_allocator.h"
- addtests="$addtests test_cpp"
-fi
-
-AM_CONDITIONAL(CPLUSPLUS, test "${enable_cplusplus}" = yes)
-
-AC_SUBST(CXX)
-
-AC_SUBST(INCLUDES)
-AC_SUBST(CXXINCLUDES)
-
-# Configuration of shared libraries
-#
-AC_MSG_CHECKING(whether to build shared libraries)
-AC_ENABLE_SHARED
-
-case "$host" in
- alpha-*-openbsd*)
- enable_shared=no
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- ;;
-esac
-
-# Configuration of machine-dependent code
-#
-AC_MSG_CHECKING(which machine-dependent code should be used)
-machdep=
-case "$host" in
- alpha-*-openbsd*)
- machdep="alpha_mach_dep.lo"
- if test x"${ac_cv_lib_dl_dlopen}" != xyes ; then
- AC_MSG_WARN(OpenBSD/Alpha without dlopen(). Shared library support is disabled)
- fi
- ;;
- alpha*-*-linux*)
- machdep="alpha_mach_dep.lo"
- ;;
- i?86-*-solaris2.[[89]] | i?86-*-solaris2.1?)
- AC_DEFINE(SOLARIS25_PROC_VDB_BUG_FIXED)
- ;;
- mipstx39-*-elf*)
- machdep="mips_ultrix_mach_dep.lo"
- AC_DEFINE(STACKBASE, __stackbase)
- AC_DEFINE(DATASTART_IS_ETEXT)
- ;;
- mips-dec-ultrix*)
- machdep="mips_ultrix_mach-dep.lo"
- ;;
- mips-nec-sysv*|mips-unknown-sysv*)
- ;;
- mips*-*-linux*)
- ;;
- mips-*-*)
- machdep="mips_sgi_mach_dep.lo"
- AC_DEFINE(NO_EXECUTE_PERMISSION)
- ;;
- sparc-*-netbsd*)
- machdep="sparc_netbsd_mach_dep.lo"
- ;;
- sparc-sun-solaris2.3)
- machdep="sparc_mach_dep.lo"
- AC_DEFINE(SUNOS53_SHARED_LIB)
- ;;
- sparc*-sun-solaris2.*)
- machdep="sparc_mach_dep.lo"
- ;;
- ia64-*-*)
- machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
- ;;
-esac
-if test x"$machdep" = x; then
-AC_MSG_RESULT($machdep)
- machdep="mach_dep.lo"
-fi
-addobjs="$addobjs $machdep"
-AC_SUBST(addobjs)
-AC_SUBST(addincludes)
-AC_SUBST(addlibs)
-AC_SUBST(addtests)
-
-AC_PROG_LIBTOOL
-
-#
-# Check for AViiON Machines running DGUX
-#
-ac_is_dgux=no
-AC_CHECK_HEADER(sys/dg_sys_info.h,
-[ac_is_dgux=yes;])
-
- ## :GOTCHA: we do not check anything but sys/dg_sys_info.h
-if test $ac_is_dgux = yes; then
- if test "$enable_full_debug" = "yes"; then
- CFLAGS="-g -mstandard -DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
- CXXFLAGS="-g -mstandard -DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
- else
- CFLAGS="-DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
- CXXFLAGS="-DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
- fi
- AC_SUBST(CFLAGS)
- AC_SUBST(CXXFLAGS)
-fi
-
-dnl We use these options to decide which functions to include.
-AC_ARG_WITH(target-subdir,
-[ --with-target-subdir=SUBDIR
- configuring with a cross compiler])
-AC_ARG_WITH(cross-host,
-[ --with-cross-host=HOST configuring with a cross compiler])
-
-# automake wants to see AC_EXEEXT. But we don't need it. And having
-# it is actually a problem, because the compiler we're passed can't
-# necessarily do a full link. So we fool automake here.
-if false; then
- # autoconf 2.50 runs AC_EXEEXT by default, and the macro expands
- # to nothing, so nothing would remain between `then' and `fi' if it
- # were not for the `:' below.
- :
- AC_EXEEXT
-fi
-
-dnl As of 4.13a2, the collector will not properly work on Solaris when
-dnl built with gcc and -O. So we remove -O in the appropriate case.
-dnl Not needed anymore on Solaris.
-AC_MSG_CHECKING(whether Solaris gcc optimization fix is necessary)
-case "$host" in
- *aix*)
- if test "$GCC" = yes; then
- AC_MSG_RESULT(yes)
- new_CFLAGS=
- for i in $CFLAGS; do
- case "$i" in
- -O*)
- ;;
- *)
- new_CFLAGS="$new_CFLAGS $i"
- ;;
- esac
- done
- CFLAGS="$new_CFLAGS"
- else
- AC_MSG_RESULT(no)
- fi
- ;;
- *) AC_MSG_RESULT(no) ;;
-esac
-
-dnl We need to override the top-level CFLAGS. This is how we do it.
-MY_CFLAGS="$CFLAGS"
-AC_SUBST(MY_CFLAGS)
-
-dnl Include defines that have become de facto standard.
-dnl ALL_INTERIOR_POINTERS can be overridden in startup code.
-AC_DEFINE(SILENT)
-AC_DEFINE(NO_SIGNALS)
-AC_DEFINE(NO_EXECUTE_PERMISSION)
-AC_DEFINE(ALL_INTERIOR_POINTERS)
-
-dnl By default, make the library as general as possible.
-AC_DEFINE(JAVA_FINALIZATION)
-AC_DEFINE(GC_GCJ_SUPPORT)
-AC_DEFINE(ATOMIC_UNCOLLECTABLE)
-
-dnl This is something of a hack. When cross-compiling we turn off
-dnl some functionality. We also enable the "small" configuration.
-dnl These is only correct when targetting an embedded system. FIXME.
-if test -n "${with_cross_host}"; then
- AC_DEFINE(NO_SIGSET)
- AC_DEFINE(NO_CLOCK)
- AC_DEFINE(SMALL_CONFIG)
- AC_DEFINE(NO_DEBUGGING)
-fi
-
-UNWINDLIBS=
-AC_ARG_ENABLE(full-debug,
-[ --enable-full-debug include full support for pointer backtracing etc.],
-[ if test "$enable_full_debug" = "yes"; then
- AC_MSG_WARN("Should define GC_DEBUG and use debug alloc. in clients.")
- AC_DEFINE(KEEP_BACK_PTRS)
- AC_DEFINE(DBG_HDRS_ALL)
- case $host in
- ia64-*-linux* )
- AC_DEFINE(MAKE_BACK_GRAPH)
- AC_DEFINE(SAVE_CALL_COUNT, 8)
- AC_CHECK_LIB(unwind, backtrace, [
- AC_DEFINE(GC_HAVE_BUILTIN_BACKTRACE)
- UNWINDLIBS=-lunwind
- AC_MSG_WARN("Client code may need to link against libunwind.")
- ])
- ;;
- x86-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* )
- AC_DEFINE(MAKE_BACK_GRAPH)
- AC_MSG_WARN("Client must not use -fomit-frame-pointer.")
- AC_DEFINE(SAVE_CALL_COUNT, 8)
- ;;
- i[3456]86-*-dgux*)
- AC_DEFINE(MAKE_BACK_GRAPH)
- ;;
- esac ]
- fi)
-
-AC_SUBST(UNWINDLIBS)
-
-AC_ARG_ENABLE(redirect-malloc,
-[ --enable-redirect-malloc redirect malloc and friends to GC routines])
-
-if test "${enable_redirect_malloc}" = yes; then
- if test "${enable_full_debug}" = yes; then
- AC_DEFINE(REDIRECT_MALLOC, GC_debug_malloc_replacement)
- AC_DEFINE(REDIRECT_REALLOC, GC_debug_realloc_replacement)
- AC_DEFINE(REDIRECT_FREE, GC_debug_free)
- else
- AC_DEFINE(REDIRECT_MALLOC, GC_malloc)
- fi
-fi
-
-AC_ARG_ENABLE(gc-assertions,
-[ --enable-gc-assertions collector-internal assertion checking])
-if test "${enable_gc_assertions}" = yes; then
- AC_DEFINE(GC_ASSERTIONS)
-fi
-
-AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
-
-AC_OUTPUT([Makefile doc/Makefile include/Makefile],,
-srcdir=${srcdir}
-host=${host}
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-CC="${CC}"
-DEFS="$DEFS"
-)
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/configure.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/configure.in:1.3 kaffe/kaffe/kaffevm/boehm-gc/boehm/configure.in:1.4
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/configure.in:1.3 Mon Apr 3 19:59:43 2006
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/configure.in Wed Nov 1 18:53:49 2006
@@ -17,12 +17,12 @@
# Initialization
# ==============
-AC_INIT(gc,6.7,Hans.Boehm at hp.com)
+AC_INIT(gc,6.8,Hans.Boehm at hp.com)
## version must conform to [0-9]+[.][0-9]+(alpha[0-9]+)?
AC_CONFIG_SRCDIR(gcj_mlc.c)
AC_CANONICAL_TARGET
AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.3 $)
+AC_REVISION($Revision: 1.4 $)
GC_SET_VERSION
AM_INIT_AUTOMAKE
@@ -94,8 +94,8 @@
AC_DEFINE(GC_AIX_THREADS)
AC_DEFINE(_REENTRANT)
;;
- *-*-hpux*)
- AC_MSG_WARN("Only HP/UX 11 threads are supported.")
+ *-*-hpux11*)
+ AC_MSG_WARN("Only HP-UX 11 POSIX threads are supported.")
AC_DEFINE(GC_HPUX_THREADS)
AC_DEFINE(_POSIX_C_SOURCE,199506L)
if test "${enable_parallel_mark}" = yes; then
@@ -103,12 +103,28 @@
fi
AC_DEFINE(THREAD_LOCAL_ALLOC)
THREADDLLIBS="-lpthread -lrt"
+ # HPUX needs REENTRANT for the _r calls.
+ AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads])
+ ;;
+ *-*-hpux10*)
+ AC_MSG_WARN("Only HP-UX 11 POSIX threads are supported.")
;;
*-*-freebsd*)
AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
AC_DEFINE(GC_FREEBSD_THREADS)
INCLUDES="$INCLUDES -pthread"
THREADDLLIBS=-pthread
+ ;;
+ *-*-kfreebsd*-gnu)
+ AC_DEFINE(GC_FREEBSD_THREADS)
+ INCLUDES="$INCLUDES -pthread"
+ THREADDLLIBS=-pthread
+ AC_DEFINE(_REENTRANT)
+ if test "${enable_parallel_mark}" = yes; then
+ AC_DEFINE(PARALLEL_MARK)
+ fi
+ AC_DEFINE(THREAD_LOCAL_ALLOC)
+ AC_DEFINE(USE_COMPILER_TLS)
;;
*-*-netbsd*)
AC_MSG_WARN("Only on NetBSD 2.0 or later.")
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/darwin_stop_world.c
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/darwin_stop_world.c:1.5 kaffe/kaffe/kaffevm/boehm-gc/boehm/darwin_stop_world.c:1.6
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/darwin_stop_world.c:1.5 Mon Apr 3 19:59:43 2006
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/darwin_stop_world.c Wed Nov 1 18:53:49 2006
@@ -169,6 +169,7 @@
void GC_push_all_stacks() {
int i;
+ task_t my_task;
kern_return_t r;
mach_port_t me;
ptr_t lo, hi;
@@ -178,7 +179,8 @@
me = mach_thread_self();
if (!GC_thr_initialized) GC_thr_init();
- r = task_threads(current_task(), &act_list, &listcount);
+ my_task = current_task();
+ r = task_threads(my_task, &act_list, &listcount);
if(r != KERN_SUCCESS) ABORT("task_threads failed");
for(i = 0; i < listcount; i++) {
thread_act_t thread = act_list[i];
@@ -268,8 +270,10 @@
);
# endif
GC_push_all_stack(lo, hi);
+ mach_port_deallocate(my_task, thread);
} /* for(p=GC_threads[i]...) */
- vm_deallocate(current_task(), (vm_address_t)act_list, sizeof(thread_t) * listcount);
+ vm_deallocate(my_task, (vm_address_t)act_list, sizeof(thread_t) * listcount);
+ mach_port_deallocate(my_task, me);
}
#endif /* !DARWIN_DONT_PARSE_STACK */
@@ -363,6 +367,7 @@
}
if (!found) GC_mach_threads_count++;
}
+ mach_port_deallocate(current_task(), my_thread);
return changed;
}
@@ -372,6 +377,7 @@
{
int i, changes;
GC_thread p;
+ task_t my_task = current_task();
mach_port_t my_thread = mach_thread_self();
kern_return_t kern_result;
thread_act_array_t act_list, prev_list;
@@ -407,13 +413,21 @@
prevcount = 0;
do {
int result;
- kern_result = task_threads(current_task(), &act_list, &listcount);
+ kern_result = task_threads(my_task, &act_list, &listcount);
result = GC_suspend_thread_list(act_list, listcount,
prev_list, prevcount);
changes = result;
prev_list = act_list;
prevcount = listcount;
- vm_deallocate(current_task(), (vm_address_t)act_list, sizeof(thread_t) * listcount);
+
+ if(kern_result == KERN_SUCCESS) {
+ int i;
+
+ for(i = 0; i < listcount; i++)
+ mach_port_deallocate(my_task, act_list[i]);
+
+ vm_deallocate(my_task, (vm_address_t)act_list, sizeof(thread_t) * listcount);
+ }
} while (changes);
@@ -430,12 +444,15 @@
#if DEBUG_THREADS
GC_printf1("World stopped from 0x%lx\n", my_thread);
#endif
+
+ mach_port_deallocate(my_task, my_thread);
}
/* Caller holds allocation lock, and has held it continuously since */
/* the world stopped. */
void GC_start_world()
{
+ task_t my_task = current_task();
mach_port_t my_thread = mach_thread_self();
int i, j;
GC_thread p;
@@ -456,7 +473,7 @@
}
# endif
- kern_result = task_threads(current_task(), &act_list, &listcount);
+ kern_result = task_threads(my_task, &act_list, &listcount);
for(i = 0; i < listcount; i++) {
thread_act_t thread = act_list[i];
if (thread != my_thread &&
@@ -484,8 +501,12 @@
}
}
}
+
+ mach_port_deallocate(my_task, thread);
}
- vm_deallocate(current_task(), (vm_address_t)act_list, sizeof(thread_t) * listcount);
+ vm_deallocate(my_task, (vm_address_t)act_list, sizeof(thread_t) * listcount);
+
+ mach_port_deallocate(my_task, my_thread);
# if DEBUG_THREADS
GC_printf0("World started\n");
# endif
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/dyn_load.c
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/dyn_load.c:1.5 kaffe/kaffe/kaffevm/boehm-gc/boehm/dyn_load.c:1.6
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/dyn_load.c:1.5 Mon Apr 3 19:59:43 2006
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/dyn_load.c Wed Nov 1 18:53:49 2006
@@ -26,7 +26,7 @@
* None of this is safe with dlclose and incremental collection.
* But then not much of anything is safe in the presence of dlclose.
*/
-#if defined(__linux__) && !defined(_GNU_SOURCE)
+#if (defined(__linux__) || defined(__GLIBC__)) && !defined(_GNU_SOURCE)
/* Can't test LINUX, since this must be define before other includes */
# define _GNU_SOURCE
#endif
@@ -381,7 +381,7 @@
/* For glibc 2.2.4+. Unfortunately, it doesn't work for older */
/* versions. Thanks to Jakub Jelinek for most of the code. */
-# if defined(LINUX) /* Are others OK here, too? */ \
+# if (defined(LINUX) || defined (__GLIBC__)) /* Are others OK here, too? */ \
&& (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
Index: kaffe/kaffe/kaffevm/boehm-gc/boehm/malloc.c
diff -u kaffe/kaffe/kaffevm/boehm-gc/boehm/malloc.c:1.3 kaffe/kaffe/kaffevm/boehm-gc/boehm/malloc.c:1.4
--- kaffe/kaffe/kaffevm/boehm-gc/boehm/malloc.c:1.3 Mon Apr 3 19:59:44 2006
+++ kaffe/kaffe/kaffevm/boehm-gc/boehm/malloc.c Wed Nov 1 18:53:49 2006
@@ -355,6 +355,12 @@
size_t lb;
# endif
{
+# if defined(GC_WIN32_THREADS) && defined(__GNUC__)
+ /* According to Gerard Allen, this helps with MINGW. */
+ /* When using threads need to initalised before use, but GCC uses a malloc
*** Patch too long, truncated ***
More information about the kaffe
mailing list