Commit 506ab775 authored by Erick Gallesio's avatar Erick Gallesio

Changed the GC to 7.0alpha7

parent ae2bf1bc
......@@ -7252,13 +7252,8 @@ fi
if test "$HAVE_GC" = "no"
then
echo "No Boehm-Demers-Weiser GC library. Using the one provided with the package"
case `uname -s` in
Darwin*) echo "Force GC compilation without optimizations on MacOS";
(cd gc; CC="$CC" CFLAGS="-g" sh ./configure --prefix=$prefix \
--disable-threads) || { echo "Cannot configure the GC"; exit; } ;;
*) (cd gc; CC="$CC" CFLAGS="$CFLAGS" sh ./configure --prefix=$prefix \
--enable-threads=$THREADS) || { echo "Cannot configure the GC"; exit; } ;;
esac
(cd gc; CC="$CC" CFLAGS="$CFLAGS" sh ./configure --prefix=$prefix \
--enable-threads=$THREADS) || { echo "Cannot configure the GC"; exit; }
GC=gc
GCLIB="../gc/.libs/libgc.a"
......
......@@ -2,7 +2,7 @@ dnl configure.in for STklos
dnl
dnl Author: Erick Gallesio [eg@unice.fr]
dnl Creation date: 28-Dec-1999 21:19 (eg)
dnl Last file update: 2-May-2006 16:29 (eg)
dnl Last file update: 27-Oct-2006 11:17 (eg)
AC_INIT(src/stklos.c)
......@@ -319,14 +319,9 @@ fi
if test "$HAVE_GC" = "no"
then
echo "No Boehm-Demers-Weiser GC library. Using the one provided with the package"
case `uname -s` in
Darwin*) echo "Force GC compilation without optimizations on MacOS";
(cd gc; CC="$CC" CFLAGS="-g" sh ./configure --prefix=$prefix \
--disable-threads) || { echo "Cannot configure the GC"; exit; } ;;
*) (cd gc; CC="$CC" CFLAGS="$CFLAGS" sh ./configure --prefix=$prefix \
--enable-threads=$THREADS) || { echo "Cannot configure the GC"; exit; } ;;
esac
(cd gc; CC="$CC" CFLAGS="$CFLAGS" sh ./configure --prefix=$prefix \
--enable-threads=$THREADS) || { echo "Cannot configure the GC"; exit; }
GC=gc
GCLIB="../gc/.libs/libgc.a"
GCINC="-I../gc/include"
......
......@@ -19,11 +19,18 @@
## FIXME: `make distcheck' in this directory will not currently work.
## This is most likely to the explicit flags passed to submakes.
if USE_INTERNAL_LIBATOMICS_OPS
SUBDIRS = @maybe_libatomic_ops@
else
# We currently use the source files directly from libatomic_ops, if we
# use the internal version. This is done since libatomic_ops doesn't
# use libtool, since it has no real use for it. But that seems to make
# it hard to use either the resulting object files or libraries.
# Thus there seems too be no real reason to recusively build in the
# libatomic_ops directory.
# if USE_INTERNAL_LIBATOMICS_OPS
# SUBDIRS = @maybe_libatomic_ops@
# else
# SUBDIRS =
# endif
SUBDIRS =
endif
SUBDIRS += .
......@@ -64,26 +71,22 @@ if PTHREADS
libgc_la_SOURCES += pthread_support.c pthread_stop_world.c
endif
# CHECK: No solaris_pthreads.c solaris_threads.c in gc7.0alpha2.tar.gz.
#if ARCH_SOLARIS
#libgc_la_SOURCES += solaris_pthreads.c solaris_threads.c
#endif
if POWERPC_DARWIN
libgc_la_SOURCES += powerpc_darwin_mach_dep.s
endif
if DARWIN_THREADS
libgc_la_SOURCES += darwin_stop_world.c
endif
if LURC_THREADS
libgc_la_SOURCES += lurc_support.c
endif
if WIN32_THREADS
libgc_la_SOURCES += win32_threads.c
endif
if USE_INTERNAL_LIBATOMIC_OPS
libgc_la_SOURCES += atomic_ops.c
endif
if NEED_ATOMIC_OPS_ASM
libgc_la_SOURCES += atomic_ops_sysdeps.S
endif
# Include THREADDLLIBS here to ensure that the correct versions of
# linuxthread semaphore functions get linked:
libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
......@@ -91,7 +94,7 @@ libgc_la_DEPENDENCIES = @addobjs@
libgc_la_LDFLAGS = -version-info 1:2:0
EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
mips_sgi_mach_dep.s mips_ultrix_mach_dep.s \
rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
......@@ -146,13 +149,6 @@ endif
.S.lo:
$(LTCOMPILE) $(ASM_CPP_OPTIONS) -c $<
## We have our own definition of LTCOMPILE because we want to use our
## CFLAGS, not those passed in from the top level make.
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS)
LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@
## We need to add DEFS to assembler flags
## :FIXME: what if assembler does not accept -D... ?
## (use Autoconf to prepare ASDEFS ???)
......@@ -186,7 +182,8 @@ EXTRA_DIST += add_gc_prefix.c gcname.c if_mach.c if_not_there.c \
MacProjects.sit.hqx mach_dep.c setjmp_t.c \
threadlibs.c AmigaOS.c \
Mac_files/datastart.c Mac_files/dataend.c \
Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h
Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
include/private/msvc_dbg.h msvc_dbg.c
# :CHECK: If pc_excludes still around, re-add to EXTRA_DIST.
......
......@@ -32,7 +32,7 @@ VPATH= $(srcdir)
# Atomic_ops installation directory. If this doesn't exist, we create
# it from the included libatomic_ops distribution.
AO_VERSION=1.1
AO_VERSION=1.2
AO_SRC_DIR=$(srcdir)/libatomic_ops-$(AO_VERSION)
AO_INSTALL_DIR=$(srcdir)/libatomic_ops-install
......@@ -145,9 +145,9 @@ HOSTCFLAGS=$(CFLAGS)
# -DJAVA_FINALIZATION makes it somewhat safer to finalize objects out of
# order by specifying a nonstandard finalization mark procedure (see
# finalize.c). Objects reachable from finalizable objects will be marked
# in a sepearte postpass, and hence their memory won't be reclaimed.
# in a separate postpass, and hence their memory won't be reclaimed.
# Not recommended unless you are implementing a language that specifies
# these semantics. Since 5.0, determines only only the initial value
# these semantics. Since 5.0, determines only the initial value
# of GC_java_finalization variable.
# -DFINALIZE_ON_DEMAND causes finalizers to be run only in response
# to explicit GC_invoke_finalizers() calls.
......@@ -339,7 +339,7 @@ SRCS= $(CSRCS) mips_sgi_mach_dep.s rs6000_mach_dep.s alpha_mach_dep.S \
include/gc_backptr.h \
hpux_test_and_clear.s include/gc_gcj.h \
include/private/dbg_mlc.h \
include/private/specific.h powerpc_darwin_mach_dep.s \
include/private/specific.h \
include/leak_detector.h include/gc_amiga_redirects.h \
include/gc_pthread_redirects.h ia64_save_regs_in_stack.s \
include/gc_config_macros.h include/private/pthread_support.h \
......@@ -369,7 +369,7 @@ GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \
include/include.am doc/doc.am \
ltmain.sh mkinstalldirs depcomp missing \
cord/cord.am tests/tests.am autogen.sh \
bdw-gc.pc.in
bdw-gc.pc.in compile
OTHER_MAKEFILES= OS2_MAKEFILE NT_MAKEFILE NT_THREADS_MAKEFILE gc.mak \
BCC_MAKEFILE EMX_MAKEFILE WCC_MAKEFILE Makefile.dj \
......@@ -383,7 +383,7 @@ OTHER_FILES= Makefile setjmp_t.c callprocs \
Mac_files/datastart.c Mac_files/dataend.c \
Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
add_gc_prefix.c gc_cpp.cpp \
version.h AmigaOS.c \
version.h AmigaOS.c mscvc_dbg.c include/private/msvc_dbg.h \
$(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES)
CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
......@@ -467,8 +467,8 @@ base_lib gc.a: $(OBJS) dyn_load.o $(UTILS)
echo > base_lib
rm -f dont_ar_1
cp $(AO_INSTALL_DIR)/lib/libatomic_ops.a gc.a
./if_mach SPARC SUNOS5 touch dont_ar_1
./if_mach SPARC SUNOS5 $(AR) rus gc.a $(OBJS) dyn_load.o
./if_mach SPARC SOLARIS touch dont_ar_1
./if_mach SPARC SOLARIS $(AR) rus gc.a $(OBJS) dyn_load.o
./if_mach M68K AMIGA touch dont_ar_1
./if_mach M68K AMIGA $(AR) -vrus gc.a $(OBJS) dyn_load.o
./if_not_there dont_ar_1 $(AR) ru gc.a $(OBJS) dyn_load.o
......@@ -477,8 +477,8 @@ base_lib gc.a: $(OBJS) dyn_load.o $(UTILS)
cords: $(CORD_OBJS) cord/cordtest $(UTILS)
rm -f dont_ar_3
./if_mach SPARC SUNOS5 touch dont_ar_3
./if_mach SPARC SUNOS5 $(AR) rus gc.a $(CORD_OBJS)
./if_mach SPARC SOLARIS touch dont_ar_3
./if_mach SPARC SOLARIS $(AR) rus gc.a $(CORD_OBJS)
./if_mach M68K AMIGA touch dont_ar_3
./if_mach M68K AMIGA $(AR) -vrus gc.a $(CORD_OBJS)
./if_not_there dont_ar_3 $(AR) ru gc.a $(CORD_OBJS)
......@@ -501,8 +501,8 @@ c++-nt: c++
c++: gc_cpp.o $(srcdir)/include/gc_cpp.h test_cpp
rm -f dont_ar_4
./if_mach SPARC SUNOS5 touch dont_ar_4
./if_mach SPARC SUNOS5 $(AR) rus gc.a gc_cpp.o
./if_mach SPARC SOLARIS touch dont_ar_4
./if_mach SPARC SOLARIS $(AR) rus gc.a gc_cpp.o
./if_mach M68K AMIGA touch dont_ar_4
./if_mach M68K AMIGA $(AR) -vrus gc.a gc_cpp.o
./if_not_there dont_ar_4 $(AR) ru gc.a gc_cpp.o
......@@ -553,12 +553,12 @@ dyn_test:
mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/mips_sgi_mach_dep.s \
$(srcdir)/mips_ultrix_mach_dep.s \
$(srcdir)/rs6000_mach_dep.s $(srcdir)/powerpc_darwin_mach_dep.s \
$(srcdir)/rs6000_mach_dep.s \
$(srcdir)/sparc_mach_dep.S $(srcdir)/sparc_sunos4_mach_dep.s \
$(srcdir)/ia64_save_regs_in_stack.s \
$(srcdir)/sparc_netbsd_mach_dep.s $(UTILS)
rm -f mach_dep.o
./if_mach SPARC SUNOS5 $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S
./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S
./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_sunos4_mach_dep.s
./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_netbsd_mach_dep.s
./if_mach SPARC "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
......
......@@ -176,7 +176,7 @@ SRCS= $(CSRCS) mips_sgi_mach_dep.S rs6000_mach_dep.s alpha_mach_dep.S \
include/private/solaris_threads.h include/gc_backptr.h \
hpux_test_and_clear.s include/gc_gcj.h \
include/gc_local_alloc.h include/private/dbg_mlc.h \
include/private/specific.h powerpc_darwin_mach_dep.s \
include/private/specific.h \
include/leak_detector.h $(CORD_SRCS)
OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
......@@ -228,16 +228,16 @@ mark.o typd_mlc.o finalize.o: $(srcdir)/include/gc_mark.h
base_lib gc.a: $(OBJS) dyn_load.o $(UTILS)
echo > base_lib
rm -f on_sparc_sunos5_1
./if_mach SPARC SUNOS5 touch on_sparc_sunos5_1
./if_mach SPARC SUNOS5 $(AR) rus gc.a $(OBJS) dyn_load.o
./if_mach SPARC SOLARIS touch on_sparc_sunos5_1
./if_mach SPARC SOLARIS $(AR) rus gc.a $(OBJS) dyn_load.o
./if_not_there on_sparc_sunos5_1 $(AR) ru gc.a $(OBJS) dyn_load.o
-./if_not_there on_sparc_sunos5_1 $(RANLIB) gc.a
# ignore ranlib failure; that usually means it doesn't exist, and isn't needed
cords: $(CORD_OBJS) cord/cordtest$(EXE_SUFFIX) $(UTILS)
rm -f on_sparc_sunos5_3
./if_mach SPARC SUNOS5 touch on_sparc_sunos5_3
./if_mach SPARC SUNOS5 $(AR) rus gc.a $(CORD_OBJS)
./if_mach SPARC SOLARIS touch on_sparc_sunos5_3
./if_mach SPARC SOLARIS $(AR) rus gc.a $(CORD_OBJS)
./if_not_there on_sparc_sunos5_3 $(AR) ru gc.a $(CORD_OBJS)
-./if_not_there on_sparc_sunos5_3 $(RANLIB) gc.a
......@@ -253,8 +253,8 @@ base_lib $(UTILS)
c++: gc_cpp.o $(srcdir)/include/gc_cpp.h test_cpp$(EXE_SUFFIX)
rm -f on_sparc_sunos5_4
./if_mach SPARC SUNOS5 touch on_sparc_sunos5_4
./if_mach SPARC SUNOS5 $(AR) rus gc.a gc_cpp.o
./if_mach SPARC SOLARIS touch on_sparc_sunos5_4
./if_mach SPARC SOLARIS $(AR) rus gc.a gc_cpp.o
./if_not_there on_sparc_sunos5_4 $(AR) ru gc.a gc_cpp.o
-./if_not_there on_sparc_sunos5_4 $(RANLIB) gc.a
./test_cpp$(EXE_SUFFIX) 1
......@@ -284,15 +284,14 @@ liblinuxgc.so: $(OBJS) dyn_load.o
ln liblinuxgc.so libgc.so
mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/mips_sgi_mach_dep.S $(srcdir)/mips_ultrix_mach_dep.s \
$(srcdir)/rs6000_mach_dep.s $(srcdir)/powerpc_darwin_mach_dep.s $(UTILS)
$(srcdir)/rs6000_mach_dep.s $(UTILS)
rm -f mach_dep.o
./if_mach MIPS IRIX5 $(AS) -o mach_dep.o $(srcdir)/mips_sgi_mach_dep.S
./if_mach MIPS RISCOS $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
./if_mach MIPS ULTRIX $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
./if_mach POWERPC AIX $(AS) -o mach_dep.o $(srcdir)/rs6000_mach_dep.s
./if_mach POWERPC MACOSX $(AS) -o mach_dep.o $(srcdir)/powerpc_darwin_mach_dep.s
./if_mach ALPHA "" $(AS) -o mach_dep.o $(srcdir)/alpha_mach_dep.S
./if_mach SPARC SUNOS5 $(AS) -o mach_dep.o $(srcdir)/sparc_mach_dep.S
./if_mach SPARC SOLARIS $(AS) -o mach_dep.o $(srcdir)/sparc_mach_dep.S
./if_mach SPARC SUNOS4 $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
......
......@@ -107,27 +107,22 @@ DIST_COMMON = $(am__configure_deps) $(am__pkginclude_HEADERS_DIST) \
config.guess config.sub depcomp install-sh ltmain.sh missing \
mkinstalldirs
#TESTS += tracetest
#TESTS += tracetest$(EXEEXT)
#check_PROGRAMS += tracetest
#tracetest_SOURCES = tests/trace_test.c
#tracetest_LDADD = $(test_ldadd)
@THREADS_TRUE@am__append_1 = threadleaktest
@THREADS_TRUE@am__append_1 = threadleaktest$(EXEEXT)
@THREADS_TRUE@am__append_2 = threadleaktest
@CPLUSPLUS_TRUE@am__append_3 = test_cpp
@CPLUSPLUS_TRUE@am__append_3 = test_cpp$(EXEEXT)
@CPLUSPLUS_TRUE@am__append_4 = test_cpp
# C Library: Architecture Dependent
# ---------------------------------
@PTHREADS_TRUE@am__append_5 = pthread_support.c pthread_stop_world.c
# CHECK: No solaris_pthreads.c solaris_threads.c in gc7.0alpha2.tar.gz.
#if ARCH_SOLARIS
#libgc_la_SOURCES += solaris_pthreads.c solaris_threads.c
#endif
@POWERPC_DARWIN_TRUE@am__append_6 = powerpc_darwin_mach_dep.s
@DARWIN_THREADS_TRUE@am__append_7 = darwin_stop_world.c
@LURC_THREADS_TRUE@am__append_8 = lurc_support.c
@WIN32_THREADS_TRUE@am__append_9 = win32_threads.c
@DARWIN_THREADS_TRUE@am__append_6 = darwin_stop_world.c
@WIN32_THREADS_TRUE@am__append_7 = win32_threads.c
@USE_INTERNAL_LIBATOMIC_OPS_TRUE@am__append_8 = atomic_ops.c
@NEED_ATOMIC_OPS_ASM_TRUE@am__append_9 = atomic_ops_sysdeps.S
# C++ Interface
# -------------
......@@ -166,14 +161,14 @@ am__libgc_la_SOURCES_DIST = allchblk.c alloc.c blacklst.c checksums.c \
new_hblk.c obj_map.c os_dep.c pcr_interface.c ptr_chck.c \
real_malloc.c reclaim.c specific.c stubborn.c typd_mlc.c \
backgraph.c thread_local_alloc.c pthread_support.c \
pthread_stop_world.c powerpc_darwin_mach_dep.s \
darwin_stop_world.c lurc_support.c win32_threads.c
pthread_stop_world.c darwin_stop_world.c win32_threads.c \
atomic_ops.c atomic_ops_sysdeps.S
@PTHREADS_TRUE@am__objects_1 = pthread_support.lo \
@PTHREADS_TRUE@ pthread_stop_world.lo
@POWERPC_DARWIN_TRUE@am__objects_2 = powerpc_darwin_mach_dep.lo
@DARWIN_THREADS_TRUE@am__objects_3 = darwin_stop_world.lo
@LURC_THREADS_TRUE@am__objects_4 = lurc_support.lo
@WIN32_THREADS_TRUE@am__objects_5 = win32_threads.lo
@DARWIN_THREADS_TRUE@am__objects_2 = darwin_stop_world.lo
@WIN32_THREADS_TRUE@am__objects_3 = win32_threads.lo
@USE_INTERNAL_LIBATOMIC_OPS_TRUE@am__objects_4 = atomic_ops.lo
@NEED_ATOMIC_OPS_ASM_TRUE@am__objects_5 = atomic_ops_sysdeps.lo
am_libgc_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo checksums.lo \
dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \
headers.lo malloc.lo mallocx.lo mark.lo mark_rts.lo misc.lo \
......@@ -194,7 +189,7 @@ libgccpp_la_OBJECTS = $(am_libgccpp_la_OBJECTS)
am_gctest_OBJECTS = tests/test.$(OBJEXT)
gctest_OBJECTS = $(am_gctest_OBJECTS)
am__DEPENDENCIES_2 = $(top_builddir)/libgc.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_leaktest_OBJECTS = tests/leak_test.$(OBJEXT)
leaktest_OBJECTS = $(am_leaktest_OBJECTS)
leaktest_DEPENDENCIES = $(am__DEPENDENCIES_2)
......@@ -220,7 +215,12 @@ LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
$(CCASFLAGS)
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
......@@ -260,7 +260,7 @@ HEADERS = $(dist_noinst_HEADERS) $(include_HEADERS) \
$(pkginclude_HEADERS)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = . @maybe_libatomic_ops@
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -277,8 +277,6 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ARCH_SOLARIS_FALSE = @ARCH_SOLARIS_FALSE@
ARCH_SOLARIS_TRUE = @ARCH_SOLARIS_TRUE@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
......@@ -325,13 +323,12 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LURC_THREADS_FALSE = @LURC_THREADS_FALSE@
LURC_THREADS_TRUE = @LURC_THREADS_TRUE@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MY_CFLAGS = @MY_CFLAGS@
NEED_ATOMIC_OPS_ASM_FALSE = @NEED_ATOMIC_OPS_ASM_FALSE@
NEED_ATOMIC_OPS_ASM_TRUE = @NEED_ATOMIC_OPS_ASM_TRUE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
......@@ -340,8 +337,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POWERPC_DARWIN_FALSE = @POWERPC_DARWIN_FALSE@
POWERPC_DARWIN_TRUE = @POWERPC_DARWIN_TRUE@
PTHREADS_FALSE = @PTHREADS_FALSE@
PTHREADS_TRUE = @PTHREADS_TRUE@
RANLIB = @RANLIB@
......@@ -352,8 +347,8 @@ THREADDLLIBS = @THREADDLLIBS@
THREADS_FALSE = @THREADS_FALSE@
THREADS_TRUE = @THREADS_TRUE@
UNWINDLIBS = @UNWINDLIBS@
USE_INTERNAL_LIBATOMICS_OPS_FALSE = @USE_INTERNAL_LIBATOMICS_OPS_FALSE@
USE_INTERNAL_LIBATOMICS_OPS_TRUE = @USE_INTERNAL_LIBATOMICS_OPS_TRUE@
USE_INTERNAL_LIBATOMIC_OPS_FALSE = @USE_INTERNAL_LIBATOMIC_OPS_FALSE@
USE_INTERNAL_LIBATOMIC_OPS_TRUE = @USE_INTERNAL_LIBATOMIC_OPS_TRUE@
USE_LIBDIR_FALSE = @USE_LIBDIR_FALSE@
USE_LIBDIR_TRUE = @USE_LIBDIR_TRUE@
VERSION = @VERSION@
......@@ -375,6 +370,7 @@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
atomic_ops_libs = @atomic_ops_libs@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
......@@ -395,7 +391,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
maybe_libatomic_ops = @maybe_libatomic_ops@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
......@@ -410,8 +405,19 @@ target_all = @target_all@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
@USE_INTERNAL_LIBATOMICS_OPS_FALSE@SUBDIRS = .
@USE_INTERNAL_LIBATOMICS_OPS_TRUE@SUBDIRS = @maybe_libatomic_ops@ .
# We currently use the source files directly from libatomic_ops, if we
# use the internal version. This is done since libatomic_ops doesn't
# use libtool, since it has no real use for it. But that seems to make
# it hard to use either the resulting object files or libraries.
# Thus there seems too be no real reason to recusively build in the
# libatomic_ops directory.
# if USE_INTERNAL_LIBATOMICS_OPS
# SUBDIRS = @maybe_libatomic_ops@
# else
# SUBDIRS =
# endif
SUBDIRS = .
# Initialize variables so that we can declare files locally.
......@@ -441,7 +447,7 @@ EXTRA_DIST = cord/cordbscs.c cord/cordtest.c cord/de.c cord/cordprnt.c \
mach_dep.c setjmp_t.c threadlibs.c AmigaOS.c \
Mac_files/datastart.c Mac_files/dataend.c \
Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
libtool.m4
include/private/msvc_dbg.h msvc_dbg.c libtool.m4
# C Library
# ---------
......@@ -474,7 +480,8 @@ dist_noinst_HEADERS = include/private/gc_hdrs.h \
include/private/darwin_stop_world.h \
include/private/thread_local_alloc.h include/cord.h \
include/ec.h include/javaxfc.h version.h
TESTS = gctest leaktest middletest $(am__append_1) $(am__append_3)
TESTS = gctest$(EXEEXT) leaktest$(EXEEXT) middletest$(EXEEXT) \
$(am__append_1) $(am__append_3)
pkgconfigdir = $(libdir)/pkgconfig
dist_pkgconfig_DATA = bdw-gc.pc
libcord_la_SOURCES = \
......@@ -487,7 +494,7 @@ libcord_la_SOURCES = \
# Common libs to _LDADD for all tests.
test_ldadd = \
$(top_builddir)/libgc.la \
$(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
$(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
gctest_SOURCES = tests/test.c
gctest_LDADD = $(test_ldadd)
......@@ -553,7 +560,7 @@ libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
libgc_la_DEPENDENCIES = @addobjs@
libgc_la_LDFLAGS = -version-info 1:2:0
EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
mips_sgi_mach_dep.s mips_ultrix_mach_dep.s \
rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
......@@ -575,11 +582,6 @@ AM_CFLAGS = @GC_CFLAGS@
#include/private/pthread_stop_world.h \
#include/gc_mark.h @addincludes@
@COMPILER_XLC_TRUE@ASM_CPP_OPTIONS =
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS)
LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@
dist_noinst_SCRIPTS = callprocs configure.host
# :CHECK: If pc_excludes still around, re-add to EXTRA_DIST.
......@@ -728,6 +730,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/allchblk.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atomic_ops.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backgraph.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blacklst.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checksums.Plo@am__quote@
......@@ -739,7 +742,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gc_dlopen.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcj_mlc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/headers.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lurc_support.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mallocx.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mark.Plo@am__quote@
......
......@@ -6,7 +6,7 @@ MY_CPU=X86
CPU=$(MY_CPU)
!include <ntwin32.mak>
OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj
OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj msvc_dbg.obj
all: gctest.exe cord\de.exe test_cpp.exe
......@@ -16,7 +16,7 @@ all: gctest.exe cord\de.exe test_cpp.exe
.cpp.obj:
$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_BUILD $*.CPP /Fo$*.obj
$(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h
$(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\msvc_dbg.h
gc.lib: $(OBJS)
lib /MACHINE:i386 /out:gc.lib $(OBJS)
......
# Makefile for Windows NT. Assumes Microsoft compiler, and a single thread.
# Makefile for Windows NT. Assumes Microsoft compiler.
# DLLs are included in the root set under NT, but not under win32S.
# Use "nmake nodebug=1 all" for optimized versions of library, gctest and editor.
......@@ -10,21 +10,21 @@ CPU=$(MY_CPU)
# should do, since we only need the headers.
# We assume this was manually unpacked, since I'm not sure there is
# a Windows standard command line tool to do this.
AO_VERSION=1.1
AO_VERSION=1.2
AO_SRC_DIR=libatomic_ops-$(AO_VERSION)/src
AO_INCLUDE_DIR=$(AO_SRC_DIR)
OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj
OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj msvc_dbg.obj
all: gctest.exe cord\de.exe test_cpp.exe
.c.obj:
$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -D__STDC__ -DGC_NOT_DLL -DGC_WIN32_THREADS $*.c /Fo$*.obj
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -D__STDC__ -DGC_NOT_DLL -DGC_WIN32_THREADS $*.c /Fo$*.obj
.cpp.obj:
$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP -DGC_WIN32_THREADS /Fo$*.obj
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP -DGC_WIN32_THREADS /Fo$*.obj
$(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h
$(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\private\msvc_dbg.h
gc.lib: $(OBJS)
lib /MACHINE:i386 /out:gc.lib $(OBJS)
......@@ -44,7 +44,7 @@ cord\de_win.rbj: cord\de_win.res
cord\de.obj cord\de_win.obj: include\cord.h include\private\cord_pos.h cord\de_win.h cord\de_cmds.h
cord\de_win.res: cord\de_win.rc cord\de_win.h cord\de_cmds.h
$(rc) $(rcvars) -r -fo cord\de_win.res $(cvars) cord\de_win.rc
$(rc) $(rcvars) -r -fo cord\de_win.res cord\de_win.rc
# Cord/de is a real win32 gui application.
cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib
......
......@@ -5,6 +5,7 @@
# TARGTYPE "Win32 (x86) Application" 0x0101
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
AO_VERSION=1.2
!IF "$(CFG)" == ""
CFG=gctest - Win32 Release
!MESSAGE No configuration specified. Defaulting to cord - Win32 Debug.
......@@ -108,6 +109,8 @@ CLEAN :
-@erase ".\Release\typd_mlc.sbr"
-@erase ".\Release\win32_threads.obj"
-@erase ".\Release\win32_threads.sbr"
-@erase ".\Release\msvc_dbg.obj"
-@erase ".\Release\msvc_dbg.sbr"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
......@@ -117,7 +120,8 @@ CPP=cl.exe
# ADD CPP /nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "GC_BUILD" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /FR /YX /c
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "GC_BUILD" /D\
"WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D\
"GC_WIN32_THREADS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch" /YX /Fo"$(INTDIR)/" /c
"GC_WIN32_THREADS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch" \
/Ilibatomic_ops-$(AO_VERSION)/src /YX /Fo"$(INTDIR)/" /c
CPP_OBJS=.\Release/
CPP_SBRS=.\Release/
......@@ -173,6 +177,7 @@ BSC32_SBRS= \
".\Release\reclaim.sbr" \
".\Release\stubborn.sbr" \
".\Release\typd_mlc.sbr" \
".\Release\msvc_dbg.sbr" \
".\Release\win32_threads.sbr"
".\Release\gc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
......@@ -211,6 +216,7 @@ LINK32_OBJS= \
".\Release\reclaim.obj" \
".\Release\stubborn.obj" \
".\Release\typd_mlc.obj" \
".\Release\msvc_dbg.obj" \
".\Release\win32_threads.obj"
".\Release\gc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
......@@ -290,6 +296,8 @@ CLEAN :
-@erase ".\Debug\vc40.pdb"
-@erase ".\Debug\win32_threads.obj"
-@erase ".\Debug\win32_threads.sbr"
-@erase ".\Debug\msvc_dbg.obj"
-@erase ".\Debug\msvc_dbg.sbr"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
......@@ -298,9 +306,10 @@ CPP=cl.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG" /D "GC_BUILD" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /FR /YX /c
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG" /D "GC_BUILD"\
/D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D\
/D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" \
/D "GC_ASSERTIONS" /D "__STDC__" /D\
"GC_WIN32_THREADS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch" /YX /Fo"$(INTDIR)/"\
/Fd"$(INTDIR)/" /c
/Ilibatomic_ops-$(AO_VERSION)/src /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\Debug/
......@@ -356,6 +365,7 @@ BSC32_SBRS= \
".\Debug\reclaim.sbr" \
".\Debug\stubborn.sbr" \
".\Debug\typd_mlc.sbr" \
".\Debug\msvc_dbg.sbr" \
".\Debug\win32_threads.sbr"
".\Debug\gc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
......@@ -394,6 +404,7 @@ LINK32_OBJS= \
".\Debug\reclaim.obj" \
".\Debug\stubborn.obj" \
".\Debug\typd_mlc.obj" \
".\Debug\msvc_dbg.obj" \
".\Debug\win32_threads.obj"
".\Debug\gc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
......@@ -433,7 +444,8 @@ CPP=cl.exe
# ADD CPP /nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /YX /c
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
"ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS"\
/Fp"$(INTDIR)/gctest.pch" /YX /Fo"$(INTDIR)/" /c
/Ilibatomic_ops-$(AO_VERSION)/src /Fp"$(INTDIR)/gctest.pch" \
/YX /Fo"$(INTDIR)/" /c
CPP_OBJS=.\gctest\Release/
CPP_SBRS=.\.
......@@ -519,7 +531,7 @@ CPP=cl.exe
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /FR /YX /c
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\
/D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /FR"$(INTDIR)/"\
/Fp"$(INTDIR)/gctest.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
/Ilibatomic_ops-$(AO_VERSION)/src /Fp"$(INTDIR)/gctest.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\gctest\Debug/
CPP_SBRS=.\gctest\Debug/
......@@ -609,7 +621,7 @@ CPP=cl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /YX /c
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "." /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
"ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX /Fo"$(INTDIR)/" /c
/Ilibatomic_ops-$(AO_VERSION)/src "ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX /Fo"$(INTDIR)/" /c
CPP_OBJS=.\cord\Release/
CPP_SBRS=.\.
......@@ -702,7 +714,7 @@ CPP=cl.exe
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /YX /c
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I include /D "_DEBUG" /D "WIN32" /D\
"_WINDOWS" /D "ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX\
/Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
/Ilibatomic_ops-$(AO_VERSION)/src /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\cord\Debug/
CPP_SBRS=.\.
......@@ -1862,6 +1874,56 @@ NODEP_CPP_WIN32=\
".\Debug\win32_threads.sbr" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\msvc_dbg.c
!IF "$(CFG)" == "gc - Win32 Release"
DEP_CPP_WIN32=\
".\include\private\gcconfig.h"\
".\include\gc.h"\
".\include\private\gc_hdrs.h"\