mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-18 23:32:17 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into 'develop'

Browse source 
Develop



See merge request !24
This commit is contained in:
Daniel Kochmański 2016-05-31 12:22:14 +00:00
commit 9a17eb6ffd
5 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Makefile.in
View file

@ -6,6 +6,7 @@
#
top_srcdir= @top_srcdir@
srcdir = @srcdir@
datarootdir = @datarootdir@
mandir=@mandir@
manext=1
@ -269,7 +270,7 @@ selfbuild:
# like "@si::foo" and "@(defun si::foo".
# This rule is allowed to fail when etags does not exist.
.git/tags:
cd $(srcdir)/../.git && ctags -o tags -R --langmap=c:+.d ../src || true
( cd $(srcdir)/../.git && ctags -o tags -R --langmap=c:+.d ../src ) || true
TAGS:
-if test "x$(ETAGS)" != "x"; then \
srcfiles=`find $(srcdir)/c $(srcdir)/h -name '*.[chd]'` && \

4
src/aclocal.m4 vendored
View file

@ -449,8 +449,8 @@ case "${host_os}" in
SHARED_LDFLAGS="-G -bsvr4 -brtl ${LDFLAGS}"
BUNDLE_LDFLAGS="-G -bsvr4 -brtl ${LDFLAGS}"
ECL_LDRPATH="-Wl,-R~A"
#SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
#SONAME_LDFLAGS="-Wl,-soname,SONAME"
SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
SONAME_LDFLAGS="-bsvr4 -brtl"
;;
*)
thehost="$host_os"

23
src/c/stacks.d
View file

@ -28,16 +28,16 @@ cs_set_size(cl_env_ptr env, cl_index new_size)
{
volatile char foo = 0;
cl_index margin = ecl_option_values[ECL_OPT_C_STACK_SAFETY_AREA];
env->cs_limit_size = new_size - 2*margin;
env->cs_limit_size = new_size - (2*margin);
#ifdef ECL_DOWN_STACK
if (&foo > env->cs_org - new_size + 16) {
env->cs_limit = env->cs_org - new_size + 2*margin;
if (&foo > (env->cs_org - new_size) + 16) {
env->cs_limit = (env->cs_org - new_size) + (2*margin);
if (env->cs_limit < env->cs_barrier)
env->cs_barrier = env->cs_limit;
}
#else
if (&foo < env->cs_org + new_size - 16) {
env->cs_limit = env->cs_org + new_size - 2*margin;
if (&foo < (env->cs_org + new_size) - 16) {
env->cs_limit = (env->cs_org + new_size) - (2*margin);
if (env->cs_limit > env->cs_barrier)
env->cs_barrier = env->cs_limit;
}
@ -96,16 +96,19 @@ ecl_cs_set_org(cl_env_ptr env)
{
struct rlimit rl;
cl_index size;
getrlimit(RLIMIT_STACK, &rl);
if (rl.rlim_cur != RLIM_INFINITY) {
if (!getrlimit(RLIMIT_STACK, &rl) &&
( rl.rlim_cur != RLIM_INFINITY
|| rl.rlim_cur !=RLIM_SAVED_MAX
|| rl.rlim_cur != RLIM_SAVED_CUR) ) {
env->cs_max_size = rl.rlim_cur;
size = rl.rlim_cur / 2;
if (size > (cl_index)ecl_option_values[ECL_OPT_C_STACK_SIZE])
if (size < (cl_index)ecl_option_values[ECL_OPT_C_STACK_SIZE])
ecl_set_option(ECL_OPT_C_STACK_SIZE, size);
#ifdef ECL_DOWN_STACK
env->cs_barrier = env->cs_org - rl.rlim_cur - 1024;
env->cs_barrier = (env->cs_org - rl.rlim_cur) - 1024;
#else
env->cs_barrier = env->cs_org + rl.rlim_cur + 1024;
env->cs_barrier = (env->cs_org + rl.rlim_cur) + 1024;
#endif
}
}

4
src/configure vendored
View file

@ -5060,8 +5060,8 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
SHARED_LDFLAGS="-G -bsvr4 -brtl ${LDFLAGS}"
BUNDLE_LDFLAGS="-G -bsvr4 -brtl ${LDFLAGS}"
ECL_LDRPATH="-Wl,-R~A"
#SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
#SONAME_LDFLAGS="-Wl,-soname,SONAME"
SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
SONAME_LDFLAGS="-bsvr4 -brtl"
;;
*)
thehost="$host_os"

1
src/doc/Makefile.in
View file

@ -6,6 +6,7 @@ exec_prefix=@exec_prefix@
infodir = @infodir@
mandir=@mandir@
docdir=@docdir@
datarootdir = @datarootdir@
manext=1
INFOEXT = @INFOEXT@