Date: Wednesday, December 22, 2010 @ 21:14:57 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp
Modified: lisp.c
Solaris/sparc and Solaris/x86 both use the same executable style so get the initial_function from the initial_function_addr, not the address of initial_function_addr.
--------+ lisp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Index: src/lisp/lisp.c diff -u src/lisp/lisp.c:1.78 src/lisp/lisp.c:1.79 --- src/lisp/lisp.c:1.78 Sun Sep 26 16:38:45 2010 +++ src/lisp/lisp.c Wed Dec 22 21:14:57 2010 @@ -1,7 +1,7 @@ /* * main() entry point for a stand alone lisp image. * - * $Header: /project/cmucl/cvsroot/src/lisp/lisp.c,v 1.78 2010-09-26 20:38:45 rtoy Rel $ + * $Header: /project/cmucl/cvsroot/src/lisp/lisp.c,v 1.79 2010-12-23 02:14:57 rtoy Exp $ * */
@@ -452,7 +452,7 @@ lispobj initial_function = 0;
if (builtin_image_flag != 0) { -#if defined(sparc) || (defined(i386) && (defined(__linux__) || defined(DARWIN) || defined(__FreeBSD__))) +#if defined(SOLARIS) || (defined(i386) && (defined(__linux__) || defined(DARWIN) || defined(__FreeBSD__))) initial_function = (lispobj) initial_function_addr; #else initial_function = (lispobj) & initial_function_addr;