Commit 2672dc87 authored by Erick's avatar Erick

Going back to a semi stable version of GC (i.e. 7.2alpha2)

parent a4337104
......@@ -180,6 +180,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
RANLIB = @RANLIB@
......
......@@ -13,7 +13,7 @@ instead of the one provided in.
GC: The Boehm's conservative garbage collector for C and C++
============================================================
- Version: 7.1alpha2
- Version: 7.2alpha2
- License: Free (BSD-like)
- Home Page: http://www.hpl.hp.com/personal/Hans_Boehm/gc
......
......@@ -640,6 +640,7 @@ LIBOBJS
ALLOCA
EGREP
GREP
PKGCONFIG
LEXLIB
LEX_OUTPUT_ROOT
LEX
......@@ -4582,6 +4583,44 @@ rm -f conftest.l $LEX_OUTPUT_ROOT.c
fi
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_PKGCONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$PKGCONFIG"; then
ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_PKGCONFIG=""pkg-config""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_prog_PKGCONFIG" && ac_cv_prog_PKGCONFIG=""false""
fi
fi
PKGCONFIG=$ac_cv_prog_PKGCONFIG
if test -n "$PKGCONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5
$as_echo "$PKGCONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
### Checks for header files.
......@@ -6559,7 +6598,11 @@ echo "*****"
echo "***** GC support"
echo "*****"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&5
# Try to determine if libgc is installed
if ${PKGCONFIG} --exists bdw-gc ;then
HAVE_GC="yes"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&5
$as_echo_n "checking for GC_malloc in -lgc... " >&6; }
if test "${ac_cv_lib_gc_GC_malloc+set}" = set; then :
$as_echo_n "(cached) " >&6
......@@ -6601,6 +6644,7 @@ else
HAVE_GC="no"
fi
fi
# Test if the user want to force with our GC lib
......@@ -6619,14 +6663,25 @@ then
--includedir=$prefix/include/stklos \
--enable-threads=$THREADS) || { echo "Cannot configure the GC"; exit; }
GC=gc
GCLIB="../gc/.libs/libgc.a"
GCINC="-I../gc/include"
GCLIB="../gc/.libs/libgc.a"
gcmsg="use provided library"
# MacOs kludge
case `uname -s` in
Darwin*) GC_INC="$GC_INC -D_XOPEN_SOURCE" ;;
*) true;;
esac
else
echo "... Using system libgc library"
GC=""
GCLIB="-lgc"
GCINC=""
if test "$PKGCONFIG" != "false" ;then
GCINC=$(pkg-config bdw-gc --cflags)
GCLIB=$(pkg-config bdw-gc --libs)
else
GCINC=""
GCLIB="-lgc"
fi
$as_echo "#define HAVE_GC 1" >>confdefs.h
......@@ -6634,7 +6689,6 @@ $as_echo "#define HAVE_GC 1" >>confdefs.h
fi
# ----------------------------------------------------------------------
# PCRE support
# ----------------------------------------------------------------------
......@@ -6642,7 +6696,11 @@ echo "*****"
echo "***** Regexp support"
echo "*****"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_fullinfo in -lpcre" >&5
# Try to determine if libpcre is installed
if ${PKGCONFIG} --exists libpcre ;then
HAVE_PCRE="yes"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_fullinfo in -lpcre" >&5
$as_echo_n "checking for pcre_fullinfo in -lpcre... " >&6; }
if test "${ac_cv_lib_pcre_pcre_fullinfo+set}" = set; then :
$as_echo_n "(cached) " >&6
......@@ -6684,6 +6742,7 @@ else
HAVE_PCRE="no"
fi
fi
# Test if the user want to force with our PCRE lib
......@@ -6704,15 +6763,20 @@ then
--prefix=$prefix --disable-shared --disable-cpp) || \
{ echo "Cannot configure PCRE"; exit; }
PCRE=pcre
PCRELIB="../pcre/.libs/libpcreposix.a ../pcre/.libs/libpcre.a"
PCREINC="-I../pcre"
PCRELIB="../pcre/.libs/libpcreposix.a ../pcre/.libs/libpcre.a"
DEF_PCRE=""
pcremsg="use provided library"
else
echo "... Using system libpcre library"
PCRE=""
PCRELIB="-lpcre -lpcreposix"
PCREINC=""
if test "$PKGCONFIG" != "false" ;then
PCREINC="$($PKGCONFIG --cflags libpcre)"
PCRELIB="$($PKGCONFIG --libs libpcre) -lpcreposix"
else
PCREINC=""
PCRELIB="-lpcre -lpcreposix"
fi
DEF_PCRE="#define HAVE_PCRE 1"
pcremsg="use the system library"
fi
......@@ -6725,7 +6789,11 @@ echo "*****"
echo "***** FFI support"
echo "*****"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffi_prep_cif in -lffi" >&5
# Try to determine if libffi is installed
if ${PKGCONFIG} --exists libffi ;then
HAVE_FFI="yes"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffi_prep_cif in -lffi" >&5
$as_echo_n "checking for ffi_prep_cif in -lffi... " >&6; }
if test "${ac_cv_lib_ffi_ffi_prep_cif+set}" = set; then :
$as_echo_n "(cached) " >&6
......@@ -6767,6 +6835,7 @@ else
HAVE_FFI="no"
fi
fi
# Test if the user want to force with our FFI lib
......@@ -6791,8 +6860,13 @@ then
else
echo "... Using system libffi library"
FFI=""
FFIINC="`pkg-config libffi --cflags`"
FFILIB="`pkg-config libffi --libs`"
if test "$PKGCONFIG" != "false" ;then
FFIINC=$($PKGCONFIG libffi --cflags)
FFILIB=$($PKGCONFIG libffi --libs)
else
FFIINC=""
FFILIB="-lffi"
fi
ffimsg="use the system library"
fi
DEF_FFI="#define HAVE_FFI 1" ; # We always want FFI.
......
......@@ -2,7 +2,7 @@
###
### Author: Erick Gallesio [eg@unice.fr]
### Creation date: 28-Dec-1999 21:19 (eg)
### Last file update: 30-Sep-2009 15:51 (eg)
### Last file update: 30-Sep-2009 23:36 (eg)
AC_PREREQ(2.64)
AC_INIT([stklos], [0.99dev])
......@@ -21,6 +21,7 @@ AC_PROG_MAKE_SET
AC_PROG_RANLIB
AC_PROG_LEX
AC_PROG_MKDIR_P
AC_CHECK_PROG(PKGCONFIG, pkg-config, "pkg-config", "false")
### Checks for header files.
AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h malloc.h memory.h netdb.h netinet/in.h nlist.h stdlib.h string.h strings.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h])
......@@ -248,7 +249,12 @@ echo "*****"
echo "***** GC support"
echo "*****"
AC_CHECK_LIB(gc, GC_malloc, HAVE_GC="yes", HAVE_GC="no", $LIBS)
# Try to determine if libgc is installed
if ${PKGCONFIG} --exists bdw-gc ;then
HAVE_GC="yes"
else
AC_CHECK_LIB(gc, GC_malloc, HAVE_GC="yes", HAVE_GC="no", $LIBS)
fi
# Test if the user want to force with our GC lib
AC_ARG_WITH(provided-gc,
......@@ -262,20 +268,30 @@ then
--includedir=$prefix/include/stklos \
--enable-threads=$THREADS) || { echo "Cannot configure the GC"; exit; }
GC=gc
GCLIB="../gc/.libs/libgc.a"
GCINC="-I../gc/include"
GCLIB="../gc/.libs/libgc.a"
gcmsg="use provided library"
# MacOs kludge
case `uname -s` in
Darwin*) GC_INC="$GC_INC -D_XOPEN_SOURCE" ;;
*) true;;
esac
else
echo "... Using system libgc library"
GC=""
GCLIB="-lgc"
GCINC=""
if test "$PKGCONFIG" != "false" ;then
GCINC=$(pkg-config bdw-gc --cflags)
GCLIB=$(pkg-config bdw-gc --libs)
else
GCINC=""
GCLIB="-lgc"
fi
AC_DEFINE(HAVE_GC, 1, [Use system GC])
gcmsg="use the system library"
fi
# ----------------------------------------------------------------------
# PCRE support
# ----------------------------------------------------------------------
......@@ -283,7 +299,12 @@ echo "*****"
echo "***** Regexp support"
echo "*****"
AC_CHECK_LIB(pcre, pcre_fullinfo, HAVE_PCRE="yes", HAVE_PCRE="no", $LIBS)
# Try to determine if libpcre is installed
if ${PKGCONFIG} --exists libpcre ;then
HAVE_PCRE="yes"
else
AC_CHECK_LIB(pcre, pcre_fullinfo, HAVE_PCRE="yes", HAVE_PCRE="no", $LIBS)
fi
# Test if the user want to force with our PCRE lib
AC_ARG_WITH(provided-regexp,
......@@ -299,15 +320,20 @@ then
--prefix=$prefix --disable-shared --disable-cpp) || \
{ echo "Cannot configure PCRE"; exit; }
PCRE=pcre
PCRELIB="../pcre/.libs/libpcreposix.a ../pcre/.libs/libpcre.a"
PCREINC="-I../pcre"
PCRELIB="../pcre/.libs/libpcreposix.a ../pcre/.libs/libpcre.a"
DEF_PCRE=""
pcremsg="use provided library"
else
echo "... Using system libpcre library"
PCRE=""
PCRELIB="-lpcre -lpcreposix"
PCREINC=""
if test "$PKGCONFIG" != "false" ;then
PCREINC="$($PKGCONFIG --cflags libpcre)"
PCRELIB="$($PKGCONFIG --libs libpcre) -lpcreposix"
else
PCREINC=""
PCRELIB="-lpcre -lpcreposix"
fi
DEF_PCRE="#define HAVE_PCRE 1"
pcremsg="use the system library"
fi
......@@ -320,7 +346,12 @@ echo "*****"
echo "***** FFI support"
echo "*****"
AC_CHECK_LIB(ffi, ffi_prep_cif, HAVE_FFI="yes", HAVE_FFI="no", $LIBS)
# Try to determine if libffi is installed
if ${PKGCONFIG} --exists libffi ;then
HAVE_FFI="yes"
else
AC_CHECK_LIB(ffi, ffi_prep_cif, HAVE_FFI="yes", HAVE_FFI="no", $LIBS)
fi
# Test if the user want to force with our FFI lib
AC_ARG_WITH(provided-ffi,
......@@ -340,8 +371,13 @@ then
else
echo "... Using system libffi library"
FFI=""
FFIINC="`pkg-config libffi --cflags`"
FFILIB="`pkg-config libffi --libs`"
if test "$PKGCONFIG" != "false" ;then
FFIINC=$($PKGCONFIG libffi --cflags)
FFILIB=$($PKGCONFIG libffi --libs)
else
FFIINC=""
FFILIB="-lffi"
fi
ffimsg="use the system library"
fi
DEF_FFI="#define HAVE_FFI 1" ; # We always want FFI.
......
......@@ -157,6 +157,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
RANLIB = @RANLIB@
......
......@@ -145,6 +145,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
RANLIB = @RANLIB@
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -130,8 +130,8 @@ gctest.exe: tests/test.o gc.a
# If an optimized setjmp_test generates a segmentation fault,
# odds are your compiler is broken. Gctest may still work.
# Try compiling setjmp_t.c unoptimized.
setjmp_test.exe: $(srcdir)/extra/setjmp_t.c $(srcdir)/gc.h
$(CC) $(CFLAGS) -o setjmp_test.exe $(srcdir)/extra/setjmp_t.c
setjmp_test.exe: $(srcdir)/setjmp_t.c $(srcdir)/gc.h
$(CC) $(CFLAGS) -o setjmp_test.exe $(srcdir)/setjmp_t.c
test: setjmp_test.exe gctest.exe
./setjmp_test
......
......@@ -23,7 +23,7 @@
# 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 recursively build in the
# 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@
......@@ -32,12 +32,6 @@
# endif
SUBDIRS =
AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
if USE_INTERNAL_LIBATOMIC_OPS
AM_CPPFLAGS += -I$(top_builddir)/libatomic_ops/src \
-I$(top_srcdir)/libatomic_ops/src
endif
# Initialize variables so that we can declare files locally.
EXTRA_DIST =
lib_LTLIBRARIES =
......@@ -48,7 +42,7 @@ check_PROGRAMS =
TESTS =
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = bdw-gc.pc
dist_pkgconfig_DATA = bdw-gc.pc
# C Library
# ---------
......@@ -78,16 +72,16 @@ libgc_la_SOURCES += win32_threads.c
endif
if USE_INTERNAL_LIBATOMIC_OPS
nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c
nodist_libgc_la_SOURCES = ./atomic_ops.c
endif
if NEED_ATOMIC_OPS_ASM
nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
nodist_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) $(ATOMIC_OPS_LIBS)
libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
libgc_la_DEPENDENCIES = @addobjs@
libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined
......@@ -167,7 +161,7 @@ EXTRA_DIST += README.QUICK
# other makefiles
# :GOTCHA: deliberately we do not include 'Makefile'
EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE \
EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE NT_THREADS_MAKEFILE \
OS2_MAKEFILE PCR-Makefile digimars.mak EMX_MAKEFILE \
Makefile.direct Makefile.dj Makefile.DLLs SMakefile.amiga \
WCC_MAKEFILE build_atomic_ops.sh build_atomic_ops.sh.cygwin \
......@@ -176,22 +170,26 @@ EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE \
# files used by makefiles other than Makefile.am
#
EXTRA_DIST += extra/add_gc_prefix.c extra/gcname.c extra/if_mach.c \
extra/if_not_there.c hpux_test_and_clear.s gc.mak extra/MacOS.c \
MacProjects.sit.hqx mach_dep.c extra/setjmp_t.c \
extra/threadlibs.c extra/AmigaOS.c \
EXTRA_DIST += add_gc_prefix.c gcname.c if_mach.c if_not_there.c \
hpux_test_and_clear.s gc.mak MacOS.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 \
include/private/msvc_dbg.h extra/msvc_dbg.c
include/private/msvc_dbg.h msvc_dbg.c
# The libatomic_ops library. This is not ideal, since we pick up junk from
# there.
EXTRA_DIST += libatomic_ops
# there. The hard-coded version number should also go.
EXTRA_DIST += libatomic_ops-1.2
# this is an auxiliary shell file used by Makefile and Makefile.direct
#
CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
# :FIXME: why do we distribute this one???
#
EXTRA_DIST += libtool.m4
#
# :GOTCHA: GNU make rule for making .s out of .S is flawed,
# it will not remove dest if building fails
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -6,15 +6,15 @@ 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 extra\msvc_dbg.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
.c.obj:
$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj
$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DALL_INTERIOR_POINTERS -D__STDC__ -DGC_NOT_DLL -DGC_BUILD $*.c /Fo$*.obj
.cpp.obj:
$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP /Fo$*.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 include\private\msvc_dbg.h
......
......@@ -15,18 +15,19 @@ 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_SRC_DIR=libatomic_ops/src
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 extra\msvc_dbg.obj thread_local_alloc.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 thread_local_alloc.obj
all: gctest.exe cord\de.exe test_cpp.exe
.c.obj:
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -D__STDC__ -DGC_NOT_DLL -DGC_WIN32_THREADS -DTHREAD_LOCAL_ALLOC $*.c /Fo$*.obj
.cpp.obj:
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP -DGC_THREADS -DTHREAD_LOCAL_ALLOC /Fo$*.obj
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP -DGC_WIN32_THREADS -DTHREAD_LOCAL_ALLOC /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 include\private\msvc_dbg.h
......
This diff is collapsed.
......@@ -15,21 +15,22 @@ 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_SRC_DIR=libatomic_ops/src
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 extra\msvc_dbg.obj thread_local_alloc.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 thread_local_alloc.obj
all: gctest.exe cord\de.exe test_cpp.exe
.c.obj:
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4701
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -D__STDC__ -DGC_NOT_DLL -DGC_WIN32_THREADS -DTHREAD_LOCAL_ALLOC $*.c /Fo$*.obj /wd4701 -D_CRT_SECURE_NO_DEPRECATE
# Disable "may not be initialized" warnings. They're too approximate.
# Disable crt security warnings, since unfortunately they warn about all sorts
# of safe uses of strncpy. It would be nice to leave the rest enabled.
.cpp.obj:
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.CPP /Fo$*.obj
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP -DGC_WIN32_THREADS -DTHREAD_LOCAL_ALLOC /Fo$*.obj -D_CRT_SECURE_NO_DEPRECATE
$(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
......
# Makefile for Windows NT. Assumes Microsoft compiler.
# modified 2007 August by Friedrich Dominicus:
# - copied from NT_X64_STATIC_THREADS_MAKEFILES
# - checked agaist gc.mak (NT_THREADS_MAKEFILE)
# - checked agaist NT_THREADS_MAKEFILE
# - added changes to integrate the tools
# - currently just with debug information
# problems can be sent to
......@@ -22,20 +22,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_SRC_DIR=libatomic_ops/src
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 extra\msvc_dbg.obj thread_local_alloc.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 thread_local_alloc.obj
all: gc64_dll.dll gctest.exe cord\de.exe test_cpp.exe
.c.obj:
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_DLL -DGC_THREADS -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4701
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_DLL -D__STDC__ -DGC_BUILD -DGC_WIN32_THREADS $*.c /Fo$*.obj /wd4701 -D_CRT_SECURE_NO_DEPRECATE
# Disable "may not be initialized" warnings. They're too approximate.
# Disable crt security warnings, since unfortunately they warn about all sorts # of safe uses of strncpy. It would be nice to leave the rest enabled.
.cpp.obj:
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DALL_INTERIOR_POINTERS -DGC_DLL -DGC_THREADS -D_CRT_SECURE_NO_DEPRECATE $*.CPP /Fo$*.obj
$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL-DALL_INTERIOR_POINTERS -DGC_DLL -D__STDC__ -DGC_BUILD -DGC_WIN32_THREADS $*.CPP /Fo$*.obj -D_CRT_SECURE_NO_DEPRECATE
$(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
......
......@@ -59,10 +59,10 @@ mach_dep.o: mach_dep.c mips_mach_dep.s rs6000_mach_dep.s if_mach if_not_there
./if_mach SPARC SOLARIS as -o mach_dep.o sparc_mach_dep.s
./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) mach_dep.c
if_mach: extra/if_mach.c gcconfig.h
$(CC) $(CFLAGS) -o if_mach extra/if_mach.c
if_mach: if_mach.c gcconfig.h
$(CC) $(CFLAGS) -o if_mach if_mach.c
if_not_there: extra/if_not_there.c
$(CC) $(CFLAGS) -o if_not_there extra/if_not_there.c
if_not_there: if_not_there.c
$(CC) $(CFLAGS) -o if_not_there if_not_there.c
......@@ -28,8 +28,7 @@ INSTALLATION:
Under UN*X, Linux:
Alternative 1 (the old way): type "make test" in this directory.
Link against gc.a. With the most recent GC distributions
you may have to type "make -f Makefile.direct test" or
copy Makefile.direct to Makefile first.
you may have to copy Makefile.direct to Makefile first.
Alternative 2 (the new way): type
"./configure --prefix=<dir>; make; make check; make install".
......
......@@ -99,7 +99,7 @@ allchblk.o : allchblk.c $(INC)
misc.o : misc.c $(INC)
$(CC) misc.c $(SCOPT)
os_dep.o : os_dep.c $(INC) extra/AmigaOS.c
os_dep.o : os_dep.c $(INC) AmigaOS.c
$(CC) os_dep.c $(SCOPT)
mark_rts.o : mark_rts.c $(INC)
......@@ -156,8 +156,8 @@ ptr_chck.o: ptr_chck.c $(INC)
test.o : test.c $(INC)
$(CC) test.c $(SOPT)
setjmp_t: extra/setjmp_t.c gc.h
$(CC) extra/setjmp_t.c $(SOPT)
setjmp_t: setjmp_t.c gc.h
$(CC) setjmp_t.c $(SOPT)
# cords:
......
......@@ -17,7 +17,7 @@
# [0-9]+[.][0-9]+(alpha[0.9]+)?
# in lex syntax; if there is no alpha number, GC_ALPHA_VERSION is empty
#
AC_DEFUN([GC_SET_VERSION], [
AC_DEFUN(GC_SET_VERSION, [
AC_MSG_CHECKING(GC version numbers)
GC_VERSION_MAJOR=`echo $PACKAGE_VERSION | sed 's/^\([[0-9]][[0-9]]*\)[[.]].*$/\1/g'`
GC_VERSION_MINOR=`echo $PACKAGE_VERSION | sed 's/^[[^.]]*[[.]]\([[0-9]][[0-9]]*\).*$/\1/g'`
......@@ -37,13 +37,10 @@ AC_DEFUN([GC_SET_VERSION], [
AC_MSG_ERROR([nonconforming PACKAGE_VERSION='$PACKAGE_VERSION'])
fi
AC_DEFINE_UNQUOTED([GC_VERSION_MAJOR], $GC_VERSION_MAJOR,
[The major version number of this GC release.])
AC_DEFINE_UNQUOTED([GC_VERSION_MINOR], $GC_VERSION_MINOR,
[The minor version number of this GC release.])
AC_DEFINE_UNQUOTED(GC_VERSION_MAJOR, $GC_VERSION_MAJOR)
AC_DEFINE_UNQUOTED(GC_VERSION_MINOR, $GC_VERSION_MINOR)
if test :$GC_ALPHA_VERSION: != :: ; then
AC_DEFINE_UNQUOTED([GC_ALPHA_VERSION], $GC_ALPHA_VERSION,
[The alpha version number, if applicable.])
AC_DEFINE_UNQUOTED(GC_ALPHA_VERSION, $GC_ALPHA_VERSION)
fi
AC_MSG_RESULT(major=$GC_VERSION_MAJOR minor=$GC_VERSION_MINOR \
${GC_ALPHA_VERSION:+alpha=}$GC_ALPHA_VERSION)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.