From 2a064d2400b19a83551ef0c6f93c589f7a1d52b9 Mon Sep 17 00:00:00 2001 From: agoncharov <agoncharov> Date: Sun, 1 Aug 2010 12:32:11 +0000 Subject: [PATCH] EXECUTABLE for FreeBSD; plus add libmd to the build --- lisp/Config.x86_freebsd | 4 +++- lisp/lisp.c | 6 +++--- tools/make-main-dist.sh | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lisp/Config.x86_freebsd b/lisp/Config.x86_freebsd index b1b2d6f45..a050e50f9 100644 --- a/lisp/Config.x86_freebsd +++ b/lisp/Config.x86_freebsd @@ -4,4 +4,6 @@ include Config.x86_common UNDEFSYMPATTERN = -Xlinker -u -Xlinker & OS_SRC += FreeBSD-os.c elf.c OS_LINK_FLAGS = -dynamic -export-dynamic -OS_LIBS = -lutil +OS_LIBS = -lutil -lmd + +EXEC_FINAL_OBJ = exec-final.o diff --git a/lisp/lisp.c b/lisp/lisp.c index 23c411f8f..5eb8a8b46 100644 --- a/lisp/lisp.c +++ b/lisp/lisp.c @@ -1,7 +1,7 @@ /* * main() entry point for a stand alone lisp image. * - * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/lisp.c,v 1.74 2010/07/31 01:07:15 rtoy Exp $ + * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/lisp.c,v 1.75 2010/08/01 12:32:11 agoncharov Exp $ * */ @@ -439,8 +439,8 @@ main(int argc, const char *argv[], const char *envp[]) lispobj initial_function = 0; if (builtin_image_flag != 0) { -#if defined(sparc) || (defined(i386) && (defined(__linux__) || defined(DARWIN))) - initial_function = (lispobj) initial_function_addr; +#if defined(sparc) || (defined(i386) && (defined(__linux__) || defined(DARWIN) || defined(__FreeBSD__))) + initial_function = (lispobj) initial_function_addr; #else initial_function = (lispobj) & initial_function_addr; #endif diff --git a/tools/make-main-dist.sh b/tools/make-main-dist.sh index 8f4b2f768..f5ee4a73b 100755 --- a/tools/make-main-dist.sh +++ b/tools/make-main-dist.sh @@ -51,7 +51,7 @@ case $ARCH in esac case $OS in - FreeBSD*) + freebsd*) EXECUTABLE=true SCRIPT=FreeBSD ;; -- GitLab