From a00aa188ea5dc4bd7d7efffaa666918cb4832683 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 13 Nov 2009 17:35:36 +0000 Subject: [PATCH] move FreeBSD stack config flags to sconfig (insteda of configure) svn: r16748 --- src/configure | 2 -- src/mzscheme/configure.ac | 2 -- src/mzscheme/sconfig.h | 5 +++++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/configure b/src/configure index d1f96886de..73b6dbd6a2 100755 --- a/src/configure +++ b/src/configure @@ -5841,8 +5841,6 @@ case $OS in FreeBSD) LIBS="$LIBS -rdynamic -pthread" DYN_CFLAGS="-fPIC" - # With pthreads enabled, initial thread's stack size doesn't use rlimit: - MZOPTIONS="$MZOPTIONS -DASSUME_FIXED_STACK_SIZE -DFIXED_STACK_SIZE=1048576" ;; OpenBSD) LIBS="$LIBS -rdynamic -Wl,--export-dynamic" diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac index 28d1f7031b..3458707ad5 100644 --- a/src/mzscheme/configure.ac +++ b/src/mzscheme/configure.ac @@ -551,8 +551,6 @@ case $OS in FreeBSD) LIBS="$LIBS -rdynamic -pthread" DYN_CFLAGS="-fPIC" - # With pthreads enabled, initial thread's stack size doesn't use rlimit: - MZOPTIONS="$MZOPTIONS -DASSUME_FIXED_STACK_SIZE -DFIXED_STACK_SIZE=1048576" ;; OpenBSD) LIBS="$LIBS -rdynamic -Wl,--export-dynamic" diff --git a/src/mzscheme/sconfig.h b/src/mzscheme/sconfig.h index 7863f4d321..7803067e0e 100644 --- a/src/mzscheme/sconfig.h +++ b/src/mzscheme/sconfig.h @@ -340,9 +340,14 @@ # include "uconfig.h" # undef HAS_STANDARD_IOB +/* pthreads always enabled via configure': */ # undef USE_ITIMER # define USE_PTHREAD_THREAD_TIMER +/* initial pthread's stack size doesn't use rlimit: */ +# define ASSUME_FIXED_STACK_SIZE +# define FIXED_STACK_SIZE 1048576 + # define HAS_BSD_IOB # ifdef FREEBSD_VERSION_2x