CMUCL commit: src/lisp (Config.x86_linux GNUmakefile)

[Raymond Toy]

    Date: Thursday, July 29, 2010 @ 00:28:50
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/lisp

Modified: Config.x86_linux GNUmakefile

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. 


------------------+
 Config.x86_linux |    2 ++
 GNUmakefile      |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)


Index: src/lisp/Config.x86_linux
diff -u src/lisp/Config.x86_linux:1.1 src/lisp/Config.x86_linux:1.2
--- src/lisp/Config.x86_linux:1.1	Mon Feb  9 13:00:58 2009
+++ src/lisp/Config.x86_linux	Thu Jul 29 00:28:49 2010
@@ -8,3 +8,5 @@
 OS_SRC += Linux-os.c elf.c
 OS_LINK_FLAGS = -m32 -rdynamic -Xlinker --export-dynamic -Xlinker -Map -Xlinker foo
 OS_LIBS = -ldl
+
+EXEC_FINAL_OBJ = exec-final.o
Index: src/lisp/GNUmakefile
diff -u src/lisp/GNUmakefile:1.36 src/lisp/GNUmakefile:1.37
--- src/lisp/GNUmakefile:1.36	Wed Jul 28 21:51:12 2010
+++ src/lisp/GNUmakefile	Thu Jul 29 00:28:49 2010
@@ -1,4 +1,4 @@
-# $Header: /project/cmucl/cvsroot/src/lisp/GNUmakefile,v 1.36 2010-07-29 01:51:12 rtoy Exp $
+# $Header: /project/cmucl/cvsroot/src/lisp/GNUmakefile,v 1.37 2010-07-29 04:28:49 rtoy Exp $
 
 all: lisp.nm
 
@@ -39,7 +39,7 @@
 # builtin_image_flag with the correct value.
 lisp.a:	version.o ${OBJS} ${EXEC_FINAL_OBJ}
 	ar crs lisp.a ${OBJS} version.o
-ifdef FEATURE_SOLARIS
+ifneq (${EXEC_FINAL_OBJ},)
 	ar d lisp.a exec-init.o
 	ar r lisp.a ${EXEC_FINAL_OBJ}
 endif