cmucl-cvs

cmucl-cvs@common-lisp.net

1 participants
2915 discussions

[cmucl-cvs] CMUCL commit: src (4 files)
by Raymond Toy 02 Aug '10

02 Aug '10

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

1 0

[cmucl-cvs] CMUCL commit: src/tools (linker-x86.sh)
by Raymond Toy 02 Aug '10

02 Aug '10

Date: Monday, August 2, 2010 @ 10:21:59 Author: rtoy Path: /project/cmucl/cvsroot/src/tools Modified: linker-x86.sh Should work with gcc too. A simple test indicates that the given compiler options will work with gcc and produce a working executable. ---------------+ linker-x86.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) Index: src/tools/linker-x86.sh diff -u src/tools/linker-x86.sh:1.7 src/tools/linker-x86.sh:1.8 --- src/tools/linker-x86.sh:1.7 Sun Aug 1 11:23:28 2010 +++ src/tools/linker-x86.sh Mon Aug 2 10:21:59 2010 @@ -1,6 +1,6 @@ #!/bin/sh -# $Id: linker-x86.sh,v 1.7 2010-08-01 15:23:28 rtoy Exp $ +# $Id: linker-x86.sh,v 1.8 2010-08-02 14:21:59 rtoy Exp $ # This file written by Raymond Toy as part of CMU Common Lisp and is # placed in the public domain. @@ -91,10 +91,12 @@ OS_LIBS= ;; SunOS*) - if [ "$CCOMPILER" != "cc" ]; then - echo Using $CCOMPILER is not currently supported - exit 1 - fi + # A quick test indicates that gcc will accept the following + # options too, so this will work whether we have Sun C or gcc. + # Note, that this probably only works if gcc uses Sun ld and not + # GNU ld. Most (all?) prebuilt versions of gcc for Solaris use + # Sun ld. + # We don't need anything special to set the starting address. # map_core_sections does that for us on sparc.

1 0

[cmucl-cvs] CMUCL commit: src/lisp (elf.c)
by Raymond Toy 02 Aug '10

02 Aug '10

Date: Monday, August 2, 2010 @ 02:03:49 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Modified: elf.c Add a comment. -------+ elf.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) Index: src/lisp/elf.c diff -u src/lisp/elf.c:1.26 src/lisp/elf.c:1.27 --- src/lisp/elf.c:1.26 Sun Aug 1 23:58:59 2010 +++ src/lisp/elf.c Mon Aug 2 02:03:49 2010 @@ -8,7 +8,7 @@ Above changes put into main CVS branch. 05-Jul-2007. - $Id: elf.c,v 1.26 2010-08-02 03:58:59 agoncharov Exp $ + $Id: elf.c,v 1.27 2010-08-02 06:03:49 rtoy Exp $ */ #include <stdio.h> @@ -479,7 +479,16 @@ for (j = 0; j < 3; j++) { if (!strncmp(nambuf, section_names[j], 6)) { os_vm_address_t addr; - + /* + * On Solaris, the section header sets the addr + * field to 0 because the linker script says the + * sections are NOTE sections. Hence, we need to + * look up the section addresses ourselves. + * + * For other systems, we don't care what the + * address is. We infer the address from the + * segment name. + */ addr = section_addr[j]; /* Found a core section. Map it! */ if ((os_vm_address_t) os_map(exec_fd, sh.sh_offset,

1 0

[cmucl-cvs] Testing
by Raymond Toy 01 Aug '10

01 Aug '10

testing

1 0

[cmucl-cvs] testing
by Raymond Toy 01 Aug '10

01 Aug '10

testing

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs