more configure adjustements related to pthreads

svn: r16483
This commit is contained in:
Matthew Flatt 2009-10-30 18:12:18 +00:00
parent f99c5f276c
commit 717e9390df
4 changed files with 12 additions and 7 deletions

7
src/configure vendored
View File

@ -5839,7 +5839,7 @@ case $OS in
EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../mzscheme/include/mzscheme.exp" EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../mzscheme/include/mzscheme.exp"
;; ;;
FreeBSD) FreeBSD)
LIBS="$LIBS -rdynamic" LIBS="$LIBS -rdynamic -pthread"
DYN_CFLAGS="-fPIC" DYN_CFLAGS="-fPIC"
;; ;;
OpenBSD) OpenBSD)
@ -10705,7 +10705,10 @@ fi
if test "${enable_pthread}" = "yes" ; then if test "${enable_pthread}" = "yes" ; then
PREFLAGS="$PREFLAGS -D_THREAD_SAFE" PREFLAGS="$PREFLAGS -D_THREAD_SAFE"
X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread" X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread"
MZOPTIONS="$MZOPTIONS -DASSUME_FIXED_STACK_SIZE -DFIXED_STACK_SIZE=1048576 -DDONT_ITIMER" MZOPTIONS="$MZOPTIONS -DUSE_PTHREAD_INSTEAD_OF_ITIMER"
# Historically needed for FreeBSD, where the initial thread stack was
# only 1MB when pthreads linked in:
# MZOPTIONS="$MZOPTIONS -DASSUME_FIXED_STACK_SIZE -DFIXED_STACK_SIZE=1048576"
GC2OPTIONS="$GC2OPTIONS -DNO_GC_SIGNALS" GC2OPTIONS="$GC2OPTIONS -DNO_GC_SIGNALS"
fi fi

View File

@ -1135,7 +1135,10 @@ fi
if test "${enable_pthread}" = "yes" ; then if test "${enable_pthread}" = "yes" ; then
PREFLAGS="$PREFLAGS -D_THREAD_SAFE" PREFLAGS="$PREFLAGS -D_THREAD_SAFE"
X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread" X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread"
MZOPTIONS="$MZOPTIONS -DASSUME_FIXED_STACK_SIZE -DFIXED_STACK_SIZE=1048576 -DDONT_ITIMER" MZOPTIONS="$MZOPTIONS -DUSE_PTHREAD_INSTEAD_OF_ITIMER"
# Historically needed for FreeBSD, where the initial thread stack was
# only 1MB when pthreads linked in:
# MZOPTIONS="$MZOPTIONS -DASSUME_FIXED_STACK_SIZE -DFIXED_STACK_SIZE=1048576"
GC2OPTIONS="$GC2OPTIONS -DNO_GC_SIGNALS" GC2OPTIONS="$GC2OPTIONS -DNO_GC_SIGNALS"
fi fi

View File

@ -340,8 +340,8 @@
# include "uconfig.h" # include "uconfig.h"
# undef HAS_STANDARD_IOB # undef HAS_STANDARD_IOB
#undef USE_ITIMER # undef USE_ITIMER
#define USE_PTHREAD_THREAD_TIMER # define USE_PTHREAD_THREAD_TIMER
# define HAS_BSD_IOB # define HAS_BSD_IOB

View File

@ -36,8 +36,7 @@
#define USE_GETRUSAGE #define USE_GETRUSAGE
#if defined MZ_USE_PLACES #if defined(MZ_USE_PLACES) || defined(USE_PTHREAD_INSTEAD_OF_ITIMER)
# undef USE_ITIMER
# define USE_PTHREAD_THREAD_TIMER # define USE_PTHREAD_THREAD_TIMER
#else #else
# define USE_ITIMER # define USE_ITIMER