Date: Monday, August 2, 2010 @ 17:45:36 Author: rtoy Path: /project/cmucl/cvsroot/src
Modified: lisp/elf.c lisp/mach-o.c lisp/save.c tools/linker-x86.sh
Let the linker remove the object files we created for the Lisp spaces.
lisp/elf.c: lisp/mach-o.c: o Remove obj_cleanup function.
lisp/save.c: o Don't call obj_cleanup anymore (because it doesn't exist.)
toosl/linker-x86.sh: o Remove CORRO.o CORSTA.o CORDYN.o on exit.
---------------------+ lisp/elf.c | 16 +--------------- lisp/mach-o.c | 19 +------------------ lisp/save.c | 5 +---- tools/linker-x86.sh | 4 ++-- 4 files changed, 5 insertions(+), 39 deletions(-)
Index: src/lisp/elf.c diff -u src/lisp/elf.c:1.27 src/lisp/elf.c:1.28 --- src/lisp/elf.c:1.27 Mon Aug 2 02:03:49 2010 +++ src/lisp/elf.c Mon Aug 2 17:45:36 2010 @@ -8,7 +8,7 @@
Above changes put into main CVS branch. 05-Jul-2007.
- $Id: elf.c,v 1.27 2010-08-02 06:03:49 rtoy Exp $ + $Id: elf.c,v 1.28 2010-08-02 21:45:36 rtoy Exp $ */
#include <stdio.h> @@ -313,20 +313,6 @@ return ret; }
-void -obj_cleanup(const char *dirname) -{ - char filename[FILENAME_MAX + 1]; - int i; - - /* Get rid of lisp space files. */ - for(i = 0; i < 3; i++) { - /* Delete core space .o files. */ - sprintf(filename, "%s/%s.o", dirname, section_names[i]); - unlink(filename); - } -} - int obj_run_linker(long init_func_address, char *file) { Index: src/lisp/mach-o.c diff -u src/lisp/mach-o.c:1.5 src/lisp/mach-o.c:1.6 --- src/lisp/mach-o.c:1.5 Sun Aug 1 11:23:28 2010 +++ src/lisp/mach-o.c Mon Aug 2 17:45:36 2010 @@ -1,5 +1,5 @@ /* - * $Header: /project/cmucl/cvsroot/src/lisp/mach-o.c,v 1.5 2010-08-01 15:23:28 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/mach-o.c,v 1.6 2010-08-02 21:45:36 rtoy Exp $ * * This code was written by Raymond Toy as part of CMU Common Lisp and * has been placed in the public domain. @@ -281,23 +281,6 @@ }
/* - * Remove the 3 space files that we created. - */ -void -obj_cleanup(const char *dirname) -{ - char filename[FILENAME_MAX + 1]; - int i; - - /* Get rid of lisp space files. */ - for(i = 0; i < 3; i++) { - /* Delete core space .o files. */ - sprintf(filename, "%s/%s.o", dirname, section_names[i]); - unlink(filename); - } -} - -/* * Link everything together to create the executable. */ int Index: src/lisp/save.c diff -u src/lisp/save.c:1.27 src/lisp/save.c:1.28 --- src/lisp/save.c:1.27 Fri Jul 30 20:03:23 2010 +++ src/lisp/save.c Mon Aug 2 17:45:36 2010 @@ -1,6 +1,6 @@ /*
- $Header: /project/cmucl/cvsroot/src/lisp/save.c,v 1.27 2010-07-31 00:03:23 rtoy Exp $ + $Header: /project/cmucl/cvsroot/src/lisp/save.c,v 1.28 2010-08-02 21:45:36 rtoy Exp $
This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -358,9 +358,6 @@ printf("Linking executable...\n"); fflush(stdout); obj_run_linker(init_function, filename); -#if 0 - obj_cleanup(dir_name); -#endif printf("done.\n"); exit(0); } Index: src/tools/linker-x86.sh diff -u src/tools/linker-x86.sh:1.8 src/tools/linker-x86.sh:1.9 --- src/tools/linker-x86.sh:1.8 Mon Aug 2 10:21:59 2010 +++ src/tools/linker-x86.sh Mon Aug 2 17:45:36 2010 @@ -1,6 +1,6 @@ #!/bin/sh
-# $Id: linker-x86.sh,v 1.8 2010-08-02 14:21:59 rtoy Exp $ +# $Id: linker-x86.sh,v 1.9 2010-08-02 21:45:36 rtoy Exp $
# This file written by Raymond Toy as part of CMU Common Lisp and is # placed in the public domain. @@ -114,7 +114,7 @@ esac
# Remove the C file when we're done. -trap 'rm -f $OUTDIR/$OPT_IFADDR' 0 +trap 'rm -f $OUTDIR/$OPT_IFADDR $OUTDIR/CORRO.o $OUTDIR/CORSTA.o $OUTDIR/CORDYN.o' 0
(cd $OUTDIR echo "long initial_function_addr = $IFADDR;" > $OPT_IFADDR