~ chicken-core (chicken-5) c413efd7c1f94ce83f27045ce7cb2738519c53f8
commit c413efd7c1f94ce83f27045ce7cb2738519c53f8
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Wed Dec 22 05:08:05 2010 -0500
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Wed Dec 22 05:08:05 2010 -0500
..._LIB_NAME build fixes
diff --git a/Makefile.mingw b/Makefile.mingw
index 34465cbe..7a8eb895 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -166,7 +166,7 @@ endif
echo # define C_INSTALL_LIB_HOME "$(LIBDIR)" >>$@
echo #endif >>$@
echo #ifndef C_INSTALL_LIB_NAME >>$@
- echo # define C_INSTALL_LIB_NAME "$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX))" >>$@
+ echo # define C_INSTALL_LIB_NAME "$(INSTALL_LIB_NAME)" >>$@
echo #endif >>$@
echo #ifndef C_INSTALL_STATIC_LIB_HOME >>$@
echo # define C_INSTALL_STATIC_LIB_HOME "$(LIBDIR)" >>$@
@@ -226,7 +226,7 @@ endif
echo # define C_TARGET_LIB_HOME "$(TARGET_PREFIX)/lib" >>$@
echo #endif >>$@
echo #ifndef C_TARGET_LIB_NAME >>$@
- echo # define C_TARGET_LIB_NAME "$(INSTALL_LIB_NAME)" >>$@
+ echo # define C_TARGET_LIB_NAME "$(TARGET_LIB_NAME)" >>$@
echo #endif >>$@
echo #ifndef C_TARGET_RUN_LIB_HOME >>$@
echo # define C_TARGET_RUN_LIB_HOME "$(TARGET_PREFIX)/lib" >>$@
diff --git a/defaults.make b/defaults.make
index e14752b8..3c395a4c 100644
--- a/defaults.make
+++ b/defaults.make
@@ -83,6 +83,7 @@ ICHICKENLIBDIR = $(CHICKENLIBDIR)
IEGGDIR = $(EGGDIR)
endif
+INSTALL_LIB_NAME = $(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
RUNTIME_LINKER_PATH ?= .
# commands
@@ -140,6 +141,7 @@ TARGET_LIBRARIES ?= $(LIBRARIES)
TARGET_LINKER_OPTIONS ?= $(LINKER_OPTIONS)
TARGET_LINKER_OPTIMIZATION_OPTIONS ?= $(LINKER_OPTIMIZATION_OPTIONS)
TARGET_FEATURES ?=
+TARGET_LIB_NAME ?= $(INSTALL_LIB_NAME)
ifneq ($(TARGET_C_COMPILER),$(C_COMPILER))
CROSS_CHICKEN = 1
@@ -381,7 +383,7 @@ endif
echo "# define C_INSTALL_LIB_HOME \"$(LIBDIR)\"" >>$@
echo "#endif" >>$@
echo "#ifndef C_INSTALL_LIB_NAME" >>$@
- echo "# define C_INSTALL_LIB_NAME \"$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX))\"" >>$@
+ echo "# define C_INSTALL_LIB_NAME \"$(INSTALL_LIB_NAME)\"" >>$@
echo "#endif" >>$@
echo "#ifndef C_INSTALL_STATIC_LIB_HOME" >>$@
echo "# define C_INSTALL_STATIC_LIB_HOME \"$(LIBDIR)\"" >>$@
@@ -441,7 +443,7 @@ endif
echo "# define C_TARGET_LIB_HOME \"$(TARGET_PREFIX)/lib\"" >>$@
echo "#endif" >>$@
echo "#ifndef C_TARGET_LIB_NAME" >>$@
- echo "# define C_TARGET_LIB_NAME \"$(INSTALL_LIB_NAME)\"" >>$@
+ echo "# define C_TARGET_LIB_NAME \"$(TARGET_LIB_NAME)\"" >>$@
echo "#endif" >>$@
echo "#ifndef C_TARGET_RUN_LIB_HOME" >>$@
echo "# define C_TARGET_RUN_LIB_HOME \"$(TARGET_RUN_PREFIX)/lib\"" >>$@
diff --git a/runtime.c b/runtime.c
index 2b37d8cd..1b6205cb 100644
--- a/runtime.c
+++ b/runtime.c
@@ -5790,11 +5790,9 @@ void C_ccall C_apply(C_word c, C_word closure, C_word k, C_word fn, ...)
buf[ 2 ] = k;
C_memcpy(&buf[ 3 ], C_temporary_stack_limit, n * sizeof(C_word));
proc = (void *)C_block_item(fn2, 0);
-# ifdef __GNUC__
C_do_apply_hack(proc, buf, n + 3);
-# else
+#else
C_do_apply(n, fn2, k);
-# endif
#endif
}
diff --git a/tests/lolevel-tests.scm b/tests/lolevel-tests.scm
index 713e5c52..298f0a2f 100644
--- a/tests/lolevel-tests.scm
+++ b/tests/lolevel-tests.scm
@@ -230,28 +230,6 @@
; object-unevict
-; global-ref
-
-(assert (pointer? (global-ref 'some-chunk)))
-
-; global-set!
-
-(global-set! 'some-chunk 34)
-
-(assert (not (pointer? (global-ref 'some-chunk))))
-
-(assert (atom? (global-ref 'some-chunk)))
-
-; global-bound?
-
-(assert (global-bound? 'some-chunk))
-
-; global-make-unbound!
-
-(global-make-unbound! 'some-chunk)
-
-(assert (not (global-bound? 'some-chunk)))
-
; object-become!
(define some-foo '#(1 2 3))
Trap