Commit 8760ca06 authored by rtoy's avatar rtoy
Browse files

Config.x86_linux:

o Define EXEC_FINAL_OBJ for linux, just like we did for Solaris so
  that we have a nice known good address and value for
  builtin_image_flag.

GNUmakefile:
o If EXEC_FINAL_OBJ has a value, remove exec-init.o from the library
  and add exec-final.o.  This makes it independent of the
  architecture.
parent a02cb5b1
...@@ -8,3 +8,5 @@ ASSEM_SRC += linux-stubs.S ...@@ -8,3 +8,5 @@ ASSEM_SRC += linux-stubs.S
OS_SRC += Linux-os.c elf.c OS_SRC += Linux-os.c elf.c
OS_LINK_FLAGS = -m32 -rdynamic -Xlinker --export-dynamic -Xlinker -Map -Xlinker foo OS_LINK_FLAGS = -m32 -rdynamic -Xlinker --export-dynamic -Xlinker -Map -Xlinker foo
OS_LIBS = -ldl OS_LIBS = -ldl
EXEC_FINAL_OBJ = exec-final.o
# $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/GNUmakefile,v 1.36 2010/07/29 01:51:12 rtoy Exp $ # $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/GNUmakefile,v 1.37 2010/07/29 04:28:49 rtoy Exp $
all: lisp.nm all: lisp.nm
...@@ -39,7 +39,7 @@ lisp: ${OBJS} version.o ...@@ -39,7 +39,7 @@ lisp: ${OBJS} version.o
# builtin_image_flag with the correct value. # builtin_image_flag with the correct value.
lisp.a: version.o ${OBJS} ${EXEC_FINAL_OBJ} lisp.a: version.o ${OBJS} ${EXEC_FINAL_OBJ}
ar crs lisp.a ${OBJS} version.o ar crs lisp.a ${OBJS} version.o
ifdef FEATURE_SOLARIS ifneq (${EXEC_FINAL_OBJ},)
ar d lisp.a exec-init.o ar d lisp.a exec-init.o
ar r lisp.a ${EXEC_FINAL_OBJ} ar r lisp.a ${EXEC_FINAL_OBJ}
endif endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment