From 50980e2831cd9c941719b78e8668615dc6d3ac18 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 21 Aug 2012 18:21:56 -0600 Subject: [PATCH] fix use of compiled startup code --- src/racket/src/cstartup.inc | 30 +++++++++++++++--------------- src/racket/src/schminc.h | 2 +- src/racket/src/startup.rktl | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/racket/src/cstartup.inc b/src/racket/src/cstartup.inc index a4691432ef..44f07d1599 100644 --- a/src/racket/src/cstartup.inc +++ b/src/racket/src/cstartup.inc @@ -16,12 +16,12 @@ 73,108,101,116,114,101,99,45,118,97,108,117,101,115,66,108,97,109,98,100,97, 1,20,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,45,107,101, 121,61,118,73,100,101,102,105,110,101,45,118,97,108,117,101,115,97,36,11,8, -240,146,86,0,0,95,159,2,17,36,36,159,2,16,36,36,159,2,16,36,36, +240,189,86,0,0,95,159,2,17,36,36,159,2,16,36,36,159,2,16,36,36, 16,20,2,3,2,2,2,4,2,2,2,5,2,2,2,6,2,2,2,7,2, 2,2,8,2,2,2,9,2,2,2,10,2,2,2,11,2,2,2,12,2,2, -97,37,11,8,240,146,86,0,0,93,159,2,16,36,37,16,2,2,13,161,2, -2,37,2,13,2,2,2,13,96,11,11,8,240,146,86,0,0,16,0,96,38, -11,8,240,146,86,0,0,16,0,18,98,64,104,101,114,101,13,16,6,36,2, +97,37,11,8,240,189,86,0,0,93,159,2,16,36,37,16,2,2,13,161,2, +2,37,2,13,2,2,2,13,96,11,11,8,240,189,86,0,0,16,0,96,38, +11,8,240,189,86,0,0,16,0,18,98,64,104,101,114,101,13,16,6,36,2, 14,2,2,11,11,11,8,32,8,31,8,30,8,29,27,248,22,163,4,195,249, 22,156,4,80,158,39,36,251,22,89,2,18,248,22,104,199,12,249,22,79,2, 19,248,22,106,201,27,248,22,163,4,195,249,22,156,4,80,158,39,36,251,22, @@ -30,14 +30,14 @@ 22,81,194,248,22,80,193,249,22,156,4,80,158,39,36,251,22,89,2,18,248, 22,80,199,249,22,79,2,6,248,22,81,201,11,18,100,10,13,16,6,36,2, 14,2,2,11,11,11,8,32,8,31,8,30,8,29,16,4,11,11,2,20,3, -1,8,101,110,118,49,54,57,51,56,16,4,11,11,2,21,3,1,8,101,110, -118,49,54,57,51,57,27,248,22,81,248,22,163,4,196,28,248,22,87,193,20, +1,8,101,110,118,49,54,57,54,52,16,4,11,11,2,21,3,1,8,101,110, +118,49,54,57,54,53,27,248,22,81,248,22,163,4,196,28,248,22,87,193,20, 14,159,37,36,37,28,248,22,87,248,22,81,194,248,22,80,193,249,22,156,4, 80,158,39,36,250,22,89,2,22,248,22,89,249,22,89,248,22,89,2,23,248, 22,80,201,251,22,89,2,18,2,23,2,23,249,22,79,2,7,248,22,81,204, 18,100,11,13,16,6,36,2,14,2,2,11,11,11,8,32,8,31,8,30,8, -29,16,4,11,11,2,20,3,1,8,101,110,118,49,54,57,52,49,16,4,11, -11,2,21,3,1,8,101,110,118,49,54,57,52,50,248,22,163,4,193,27,248, +29,16,4,11,11,2,20,3,1,8,101,110,118,49,54,57,54,55,16,4,11, +11,2,21,3,1,8,101,110,118,49,54,57,54,56,248,22,163,4,193,27,248, 22,163,4,194,249,22,79,248,22,89,248,22,80,196,248,22,81,195,27,248,22, 81,248,22,163,4,23,197,1,249,22,156,4,80,158,39,36,28,248,22,64,248, 22,157,4,248,22,80,23,198,2,27,249,22,2,32,0,88,163,8,36,37,43, @@ -67,8 +67,8 @@ 22,89,2,18,28,249,22,151,9,248,22,157,4,248,22,80,200,64,101,108,115, 101,10,248,22,80,197,250,22,90,2,22,9,248,22,81,200,249,22,79,2,11, 248,22,81,202,99,13,16,6,36,2,14,2,2,11,11,11,8,32,8,31,8, -30,8,29,16,4,11,11,2,20,3,1,8,101,110,118,49,54,57,54,52,16, -4,11,11,2,21,3,1,8,101,110,118,49,54,57,54,53,18,158,94,10,64, +30,8,29,16,4,11,11,2,20,3,1,8,101,110,118,49,54,57,57,48,16, +4,11,11,2,21,3,1,8,101,110,118,49,54,57,57,49,18,158,94,10,64, 118,111,105,100,8,48,27,248,22,81,248,22,163,4,196,249,22,156,4,80,158, 39,36,28,248,22,64,248,22,157,4,248,22,80,197,250,22,89,2,28,248,22, 89,248,22,80,199,248,22,104,198,27,248,22,157,4,248,22,80,197,250,22,89, @@ -362,7 +362,7 @@ 22,164,2,195,88,163,8,36,38,48,11,9,223,3,33,89,28,197,86,94,20, 18,159,11,80,158,42,48,193,20,18,159,11,80,158,42,49,196,86,94,20,18, 159,11,80,158,42,54,193,20,18,159,11,80,158,42,55,196,193,28,193,80,158, -38,48,80,158,38,54,248,22,9,88,163,8,32,37,8,40,8,240,0,120,47, +38,48,80,158,38,54,248,22,8,88,163,8,32,37,8,40,8,240,0,120,47, 0,9,224,1,2,33,90,0,7,35,114,120,34,47,43,34,28,248,22,141,7, 23,195,2,27,249,22,173,15,2,92,196,28,192,28,249,22,191,3,248,22,103, 195,248,22,181,3,248,22,144,7,198,249,22,7,250,22,163,7,199,36,248,22, @@ -375,7 +375,7 @@ 22,103,198,195,249,22,7,250,22,163,7,199,36,248,22,103,198,249,22,79,249, 22,163,7,200,248,22,105,199,197,249,22,7,196,195,90,159,39,11,89,161,39, 36,11,248,22,140,15,23,198,1,28,249,22,151,9,194,2,36,249,22,7,195, -197,249,80,159,45,58,39,194,249,22,79,197,199,32,94,88,163,36,43,8,26, +197,249,80,159,45,58,39,194,249,22,79,197,199,32,94,88,163,36,43,8,27, 11,65,99,108,111,111,112,222,33,103,32,95,88,163,8,36,37,47,11,2,31, 222,33,98,32,96,88,163,36,37,43,11,69,116,111,45,115,116,114,105,110,103, 222,33,97,28,248,22,183,14,193,248,22,187,14,193,192,28,248,22,87,248,22, @@ -397,8 +397,8 @@ 5,22,133,2,23,201,2,250,22,189,7,6,49,49,10,32,32,32,115,117,98, 45,99,111,108,108,101,99,116,105,111,110,58,32,126,115,10,32,32,105,110,32, 112,97,114,101,110,116,32,100,105,114,101,99,116,111,114,105,101,115,58,126,97, -23,201,1,250,22,1,22,164,7,248,22,2,32,0,88,163,8,36,37,45,11, -9,222,33,102,249,2,100,22,133,2,23,207,1,86,95,23,199,1,23,198,1, +23,201,1,249,22,1,22,164,7,249,22,2,32,0,88,163,8,36,37,45,11, +9,222,33,102,249,2,100,22,133,2,23,208,1,86,95,23,199,1,23,198,1, 2,44,27,248,22,80,23,200,2,27,28,248,22,183,14,23,195,2,249,22,137, 15,23,196,1,23,198,2,248,22,134,2,23,195,1,28,28,248,22,183,14,248, 22,80,23,202,2,248,22,132,15,23,194,2,10,27,250,22,1,22,137,15,23, @@ -945,7 +945,7 @@ 111,114,107,11,29,94,2,2,68,35,37,112,97,114,97,109,122,11,29,94,2, 2,74,35,37,112,108,97,99,101,45,115,116,114,117,99,116,11,29,94,2,2, 66,35,37,98,111,111,116,11,29,94,2,2,68,35,37,101,120,112,111,98,115, -11,29,94,2,2,68,35,37,107,101,114,110,101,108,11,97,36,11,8,240,146, +11,29,94,2,2,68,35,37,107,101,114,110,101,108,11,97,36,11,8,240,189, 88,0,0,100,159,2,3,36,36,159,2,4,36,36,159,2,5,36,36,159,2, 6,36,36,159,2,7,36,36,159,2,8,36,36,159,2,9,36,36,159,2,9, 36,36,16,0,159,36,20,113,159,36,16,1,11,16,0,20,26,144,9,2,1, diff --git a/src/racket/src/schminc.h b/src/racket/src/schminc.h index dcccea8bd6..0546ec8a57 100644 --- a/src/racket/src/schminc.h +++ b/src/racket/src/schminc.h @@ -12,7 +12,7 @@ finally, set EXPECTED_PRIM_COUNT to the right value and USE_COMPILED_STARTUP to 1 and `make' again. */ -#define USE_COMPILED_STARTUP 0 +#define USE_COMPILED_STARTUP 1 #define EXPECTED_PRIM_COUNT 1071 #define EXPECTED_UNSAFE_COUNT 79 diff --git a/src/racket/src/startup.rktl b/src/racket/src/startup.rktl index c9905b74b5..f76a2da046 100644 --- a/src/racket/src/startup.rktl +++ b/src/racket/src/startup.rktl @@ -583,7 +583,7 @@ string-append (map (lambda (p) (format "\n ~a" (unbox p))) - (filter box? all-paths)))) + (filter box? all-paths)))) ""))))) (let ([dir (*build-path-rep (car paths) collection)]) (if (*directory-exists? (car paths) dir)