diff --git a/.makefile b/.makefile index 7c0bcef25c..72142901af 100644 --- a/.makefile +++ b/.makefile @@ -266,12 +266,12 @@ bc-base: if [ "$(RACKETBC_SUFFIX)" = "" ] ; \ then $(MAKE) bc-configure MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS) --enable-bcdefault" ; \ else $(MAKE) bc-configure MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS) --disable-bcdefault" ; fi - cd racket/src/build && $(MAKE) bc $(SELF_FLAGS_qq) + cd racket/src/build && $(MAKE) racketbc $(SELF_FLAGS_qq) cd racket/src/build && $(MAKE) install-bc $(INSTALL_SETUP_ARGS) win-bc-base: $(MAKE) win-remove-setup-dlls - cmd /c racket\src\worksp\build-at racket\src\worksp ..\..\..\build\config $(WIN32_BUILD_LEVEL) $(JOB_OPTIONS) _$(RACKETBC_SUFFIX) $(PLT_SETUP_OPTIONS) + cmd /c racket\src\worksp\build-at racket\src\worksp ..\..\..\build\config $(WIN32_BUILD_LEVEL) _$(RACKETBC_SUFFIX) $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS) # Start by removing DLLs that may be loaded by `raco setup` win-remove-setup-dlls: @@ -285,10 +285,10 @@ CONFIG_IN_PLACE_ARGS = --disable-useprefix --enable-origtree BC_CONFIGURE_ARGS == $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS) bc-configure: - $(MAKE) racket/src/build/racket/Makefile + $(MAKE) racket/src/build/bc/Makefile cd racket/src/build && $(MAKE) reconfigure MORE_CONFIGURE_ARGS="$(BC_CONFIGURE_ARGS)" -racket/src/build/racket/Makefile: racket/src/configure racket/src/Makefile.in +racket/src/build/bc/Makefile: racket/src/configure racket/src/Makefile.in mkdir -p racket/src/build cd racket/src/build && ../configure --enable-bc $(CONFIGURE_ARGS_qq) $(BC_CONFIGURE_ARGS) diff --git a/Makefile b/Makefile index 54ac00a8a3..51be5c19fe 100644 --- a/Makefile +++ b/Makefile @@ -222,11 +222,11 @@ win-bc-in-place-setup: $(MAKE) plain-in-place-setup PLAIN_RACKET=racket\racket$(RACKETBC_SUFFIX) IN_PLACE_SETUP_OPTIONS="$(IN_PLACE_SETUP_OPTIONS)" JOB_OPTIONS="$(JOB_OPTIONS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" bc-base: if [ "$(RACKETBC_SUFFIX)" = "" ] ; then $(MAKE) bc-configure MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS) --enable-bcdefault" CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" ; else $(MAKE) bc-configure MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS) --disable-bcdefault" CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" ; fi - cd racket/src/build && $(MAKE) bc SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" + cd racket/src/build && $(MAKE) racketbc SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" cd racket/src/build && $(MAKE) install-bc SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" PLT_SETUP_OPTIONS="$(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" win-bc-base: $(MAKE) win-remove-setup-dlls - cmd /c racket\src\worksp\build-at racket\src\worksp ..\..\..\build\config $(WIN32_BUILD_LEVEL) $(JOB_OPTIONS) _$(RACKETBC_SUFFIX) $(PLT_SETUP_OPTIONS) + cmd /c racket\src\worksp\build-at racket\src\worksp ..\..\..\build\config $(WIN32_BUILD_LEVEL) _$(RACKETBC_SUFFIX) $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS) win-remove-setup-dlls: IF EXIST racket\lib\longdouble.dll cmd /c del racket\lib\longdouble.dll IF EXIST racket\lib\libiconv-2.dll cmd /c del racket\lib\libiconv-2.dll @@ -234,9 +234,9 @@ win-remove-setup-dlls: IF EXIST racket\lib\libeay32.dll cmd /c del racket\lib\libeay32.dll IF EXIST racket\lib\ssleay32.dll cmd /c del racket\lib\ssleay32.dll bc-configure: - $(MAKE) racket/src/build/racket/Makefile CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)" + $(MAKE) racket/src/build/bc/Makefile CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)" cd racket/src/build && $(MAKE) reconfigure MORE_CONFIGURE_ARGS=" $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS)" -racket/src/build/racket/Makefile: racket/src/configure racket/src/Makefile.in +racket/src/build/bc/Makefile: racket/src/configure racket/src/Makefile.in mkdir -p racket/src/build cd racket/src/build && ../configure --enable-bc $(CONFIGURE_ARGS_qq) $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS) native-for-cross: @@ -283,7 +283,7 @@ cs-base: cs-configure: $(MAKE) racket/src/build/cs/c/Makefile CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)" cd racket/src/build/cs/c && $(MAKE) reconfigure MORE_CONFIGURE_ARGS=" $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS)" -racket/src/build/cs/c/Makefile: racket/src/cs/c/configure racket/src/cs/c/Makefile.in racket/src/cfg-cs +racket/src/build/cs/c/Makefile: racket/src/cs/c/configure racket/src/cs/c/Makefile.in racket/src/cfg-cs racket/src/Makefile.in mkdir -p racket/src/build/cs/c cd racket/src/build/cs/c && ../../../cs/c/configure $(CONFIGURE_ARGS_qq) $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS) cd racket/src/build && ../cfg-cs $(CONFIGURE_ARGS_qq) $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS) diff --git a/racket/collects/version/utils.rkt b/racket/collects/version/utils.rkt index c69f5572d7..d0ee119741 100644 --- a/racket/collects/version/utils.rkt +++ b/racket/collects/version/utils.rkt @@ -3,7 +3,7 @@ (define rx:version ;; (this restricts the last component to be below 999 too, which is - ;; not really proper according to the spec in schvers.h) + ;; not really proper according to the spec in "racket_version.h") (pregexp (string-append "^(0|[1-9][0-9]*)[.]" "(0|(0|[1-9][0-9]{0,1})([.](0|[1-9][0-9]{0,2})){0,2}" "(? $(srcdir)/src/schexn.h @@ -316,11 +318,11 @@ MZCONFIGDIR@MINGW@ = "$(srcdir)/../worksp" headers: @RUN_RACKET_CGC@ -cqu $(srcdir)/mkincludes.rkt @DIRCVTPRE@"$(DESTDIR)$(includepltdir)"@DIRCVTPOST@ "$(srcdir)" $(MZCONFIGDIR) - cd ..; cp racket/system.rktd "$(DESTDIR)$(libpltdir)/system.rktd" + cd ..; cp bc/system.rktd "$(DESTDIR)$(libpltdir)/system.rktd" # The `cstartup` target may update "cstartup.inc", either replacing a # stub "cstartup.inc" that redirects to "startup.inc" or rebuilding -# because "startup.inc" or "schvers.h" changed; so, during a CGC +# because "startup.inc" or "racket_version.h" changed; so, during a CGC # build, we try again after building this target to potentially update # the CGC build to a compiled-startup build. A particular `cstartup` # target variant is selected by the `configure` script based on whether @@ -333,7 +335,7 @@ cstartup@STARTUP_AS_AUTO@: # For compiling the startup code to bytecode cstartup@STARTUP_AS_BYTECODE@: - @RUN_RACKET_CGC@ -cu $(srcdir)/src/compile-startup.rkt $(CSTARTUPDEST) cstartup.zo $(srcdir)/src/startup.inc $(srcdir)/src/schvers.h + @RUN_RACKET_CGC@ -cu $(srcdir)/src/compile-startup.rkt $(CSTARTUPDEST) cstartup.zo $(srcdir)/src/startup.inc $(srcdir)/../version/racket_version.h # For compiling the startup code to C cstartup@STARTUP_AS_C@: @@ -346,8 +348,8 @@ cstartup_: # Running "cify-startup.rkt" through "$(SETUP_BOOT)" generates more # dependencies in "cstartup.d" for `$(CSTARTUPDEST)` -$(CSTARTUPDEST): $(srcdir)/src/startup.inc $(srcdir)/src/schvers.h - @RUN_RACKET_CGC@ $(SETUP_BOOT) cstartup.inc cstartup.d $(srcdir)/src/cify-startup.rkt $(srcdir)/src/startup.inc $(srcdir)/src/schvers.h +$(CSTARTUPDEST): $(srcdir)/src/startup.inc $(srcdir)/../version/racket_version.h + @RUN_RACKET_CGC@ $(SETUP_BOOT) cstartup.inc cstartup.d $(srcdir)/src/cify-startup.rkt $(srcdir)/src/startup.inc $(srcdir)/../version/racket_version.h @INCLUDEDEP@ cstartup.d mark: @@ -406,9 +408,9 @@ install-both: unix-install: cd ..; rm -f "$(DESTDIR)@MZINSTALLBINDIR@/racket@CGC_INSTALLED@" cd ..; rm -f "$(DESTDIR)@MZINSTALLBINDIR@/racket@MMM_INSTALLED@" - cd ..; cp racket/starter@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/starter@EXE_SUFFIX@" + cd ..; cp bc/starter@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/starter@EXE_SUFFIX@" cp $(srcdir)/../start/starter-sh . - cd ..; cp racket/starter-sh "$(DESTDIR)$(libpltdir)/starter-sh" + cd ..; cp bc/starter-sh "$(DESTDIR)$(libpltdir)/starter-sh" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/starter@EXE_SUFFIX@" @RUN_RACKET_CGC@ -cu "$(srcdir)/collects-path.rkt" "$(DESTDIR)$(libpltdir)/starter@EXE_SUFFIX@" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ cd ..; echo 'CC=@CC@' > "$(BUILDINFO)" @@ -420,14 +422,14 @@ unix-install: unix-install-cgc: $(MAKE) unix-@INSTALL_LIBS_ENABLE@-libs-cgc - cd ..; $(ICP) racket/racket@CGC@ "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@" + cd ..; $(ICP) bc/racket@CGC@ "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@" - cd ..; cp racket/mzdyn.o "$(DESTDIR)$(libpltdir)/mzdyn.o" + cd ..; cp bc/mzdyn.o "$(DESTDIR)$(libpltdir)/mzdyn.o" @RUN_RACKET_CGC@ -cu "$(srcdir)/collects-path.rkt" "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@@EXE_SUFFIX@" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ unix-install-libs-cgc: - cd ..; $(ICP_LIB) racket/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" - cd ..; $(ICP_LIB) racket/libracket.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket.@LIBSFX@" + cd ..; $(ICP_LIB) bc/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" + cd ..; $(ICP_LIB) bc/libracket.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket.@LIBSFX@" cd ..; $(ICP_STATIC_LIB) rktio/librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@" cd ..; $(STRIP_LIB_DEBUG) "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" cd ..; $(STRIP_LIB_DEBUG) "$(DESTDIR)$(libdir)/libracket.@LIBSFX@" @@ -439,14 +441,14 @@ unix-install-cgc-final: $(NOOP) unix-install-3m: - cd ..; $(ICP) racket/racket@MMM@ "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@" + cd ..; $(ICP) bc/racket@MMM@ "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@" $(MAKE) unix-@INSTALL_LIBS_ENABLE@-libs-3m - cd ..; $(ICP) racket/mzdyn3m.o "$(DESTDIR)$(libpltdir)/mzdyn3m.o" + cd ..; $(ICP) bc/mzdyn3m.o "$(DESTDIR)$(libpltdir)/mzdyn3m.o" @RUN_RACKET_MMM@ -cu "$(srcdir)/collects-path.rkt" "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@@EXE_SUFFIX@" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ unix-install-libs-3m: - cd ..; $(ICP_LIB) racket/libracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@" + cd ..; $(ICP_LIB) bc/libracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@" cd ..; $(ICP_STATIC_LIB) rktio/librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@" cd ..; $(STRIP_LIB_DEBUG) "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@" @@ -461,27 +463,27 @@ unix-install-3m-final: mingw-install: cd ..; rm -f "$(DESTDIR)@MZINSTALLBINDIR@/racket@CGC_INSTALLED@" cd ..; rm -f "$(DESTDIR)@MZINSTALLBINDIR@/racket@MMM_INSTALLED@" - cd ..; cp racket/starter@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/MzStart@EXE_SUFFIX@" - cd ..; cp racket/mrstarter@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/MrStart@EXE_SUFFIX@" + cd ..; cp bc/starter@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/MzStart@EXE_SUFFIX@" + cd ..; cp bc/mrstarter@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/MrStart@EXE_SUFFIX@" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/MzStart@EXE_SUFFIX@" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/MrStart@EXE_SUFFIX@" cp "$(srcdir)/../mzcom/prebuilt/MzCOM.tlb" MzCOM.tlb - cd ..; cp racket/MzCOM.tlb "$(DESTDIR)$(libpltdir)/MzCOM.tlb" + cd ..; cp bc/MzCOM.tlb "$(DESTDIR)$(libpltdir)/MzCOM.tlb" mingw-install-cgc: cd ..; mkdir -p "$(DESTDIR)$(libdir)/gcc" - cd ..; $(ICP) racket/libmzgcxxxxxxx.lib "$(DESTDIR)$(libdir)/gcc/libmzgcxxxxxxx.lib" - cd ..; $(ICP) racket/libmzgcxxxxxxx.exp "$(DESTDIR)$(libdir)/gcc/libmzgcxxxxxxx.exp" - cd ..; $(ICP) racket/libmzgc.def "$(DESTDIR)$(libdir)/libmzgcxxxxxxx.def" - cd ..; $(ICP) racket/libracketxxxxxxx.lib "$(DESTDIR)$(libdir)/gcc/libracketxxxxxxx.lib" - cd ..; $(ICP) racket/libracketxxxxxxx.exp "$(DESTDIR)$(libdir)/gcc/libracketxxxxxxx.exp" - cd ..; $(ICP) racket/libracket.def "$(DESTDIR)$(libdir)/libracketxxxxxxx.def" - cd ..; $(ICP) racket/mzdyncgc.o "$(DESTDIR)$(libdir)/gcc/mzdyn.obj" - cd ..; $(ICP) racket/mzdyncgc.exp "$(DESTDIR)$(libdir)/gcc/mzdyn.exp" - cd ..; $(ICP) racket/lib/libmzgcxxxxxxx.dll "$(DESTDIR)$(libdir)/libmzgcxxxxxxx.dll" - cd ..; $(ICP) racket/lib/libracketxxxxxxx.dll "$(DESTDIR)$(libdir)/libracketxxxxxxx.dll" - cd ..; $(ICP) racket/racket@CGC@@EXE_SUFFIX@ "$(DESTDIR)@MZINSTALLBINDIR@/Racket@CGC_INSTALLED@@EXE_SUFFIX@" - cd ..; $(ICP) racket/mzcom@CGC@@EXE_SUFFIX@ "$(DESTDIR)$(libdir)/MzCOM@CGC_INSTALLED@@EXE_SUFFIX@" + cd ..; $(ICP) bc/libmzgcxxxxxxx.lib "$(DESTDIR)$(libdir)/gcc/libmzgcxxxxxxx.lib" + cd ..; $(ICP) bc/libmzgcxxxxxxx.exp "$(DESTDIR)$(libdir)/gcc/libmzgcxxxxxxx.exp" + cd ..; $(ICP) bc/libmzgc.def "$(DESTDIR)$(libdir)/libmzgcxxxxxxx.def" + cd ..; $(ICP) bc/libracketxxxxxxx.lib "$(DESTDIR)$(libdir)/gcc/libracketxxxxxxx.lib" + cd ..; $(ICP) bc/libracketxxxxxxx.exp "$(DESTDIR)$(libdir)/gcc/libracketxxxxxxx.exp" + cd ..; $(ICP) bc/libracket.def "$(DESTDIR)$(libdir)/libracketxxxxxxx.def" + cd ..; $(ICP) bc/mzdyncgc.o "$(DESTDIR)$(libdir)/gcc/mzdyn.obj" + cd ..; $(ICP) bc/mzdyncgc.exp "$(DESTDIR)$(libdir)/gcc/mzdyn.exp" + cd ..; $(ICP) bc/lib/libmzgcxxxxxxx.dll "$(DESTDIR)$(libdir)/libmzgcxxxxxxx.dll" + cd ..; $(ICP) bc/lib/libracketxxxxxxx.dll "$(DESTDIR)$(libdir)/libracketxxxxxxx.dll" + cd ..; $(ICP) bc/racket@CGC@@EXE_SUFFIX@ "$(DESTDIR)@MZINSTALLBINDIR@/Racket@CGC_INSTALLED@@EXE_SUFFIX@" + cd ..; $(ICP) bc/mzcom@CGC@@EXE_SUFFIX@ "$(DESTDIR)$(libdir)/MzCOM@CGC_INSTALLED@@EXE_SUFFIX@" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libdir)/libmzgcxxxxxxx.dll" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libdir)/libracketxxxxxxx.dll" cd ..; $(STRIP_DEBUG) "$(DESTDIR)@MZINSTALLBINDIR@/Racket@CGC_INSTALLED@@EXE_SUFFIX@" @@ -493,14 +495,14 @@ mingw-install-cgc-final: mingw-install-3m: cd ..; mkdir -p "$(DESTDIR)$(libdir)/gcc" - cd ..; $(ICP) racket/gc2/libracket3mxxxxxxx.lib "$(DESTDIR)$(libdir)/gcc/libracket3mxxxxxxx.lib" - cd ..; $(ICP) racket/gc2/libracket3mxxxxxxx.exp "$(DESTDIR)$(libdir)/gcc/libracket3mxxxxxxx.exp" - cd ..; $(ICP) racket/gc2/libracket3m.def "$(DESTDIR)$(libdir)/libracket3mxxxxxxx.def" - cd ..; $(ICP) racket/mzdyn3m.o "$(DESTDIR)$(libdir)/gcc/mzdyn3m.obj" - cd ..; $(ICP) racket/mzdyn3m.exp "$(DESTDIR)$(libdir)/gcc/mzdyn3m.exp" - cd ..; $(ICP) racket/racket@MMM@@EXE_SUFFIX@ "$(DESTDIR)@MZINSTALLBINDIR@/Racket@MMM_INSTALLED@@EXE_SUFFIX@" - cd ..; $(ICP) racket/mzcom@MMM@@EXE_SUFFIX@ "$(DESTDIR)$(libdir)/MzCOM@MMM_INSTALLED@@EXE_SUFFIX@" - cd ..; $(ICP) racket/lib/libracket3mxxxxxxx.dll "$(DESTDIR)$(libdir)/libracket3mxxxxxxx.dll" + cd ..; $(ICP) bc/gc2/libracket3mxxxxxxx.lib "$(DESTDIR)$(libdir)/gcc/libracket3mxxxxxxx.lib" + cd ..; $(ICP) bc/gc2/libracket3mxxxxxxx.exp "$(DESTDIR)$(libdir)/gcc/libracket3mxxxxxxx.exp" + cd ..; $(ICP) bc/gc2/libracket3m.def "$(DESTDIR)$(libdir)/libracket3mxxxxxxx.def" + cd ..; $(ICP) bc/mzdyn3m.o "$(DESTDIR)$(libdir)/gcc/mzdyn3m.obj" + cd ..; $(ICP) bc/mzdyn3m.exp "$(DESTDIR)$(libdir)/gcc/mzdyn3m.exp" + cd ..; $(ICP) bc/racket@MMM@@EXE_SUFFIX@ "$(DESTDIR)@MZINSTALLBINDIR@/Racket@MMM_INSTALLED@@EXE_SUFFIX@" + cd ..; $(ICP) bc/mzcom@MMM@@EXE_SUFFIX@ "$(DESTDIR)$(libdir)/MzCOM@MMM_INSTALLED@@EXE_SUFFIX@" + cd ..; $(ICP) bc/lib/libracket3mxxxxxxx.dll "$(DESTDIR)$(libdir)/libracket3mxxxxxxx.dll" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libdir)/libracket3mxxxxxxx.dll" cd ..; $(STRIP_DEBUG) "$(DESTDIR)@MZINSTALLBINDIR@/Racket@MMM_INSTALLED@@EXE_SUFFIX@" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libdir)/MzCOM@MMM_INSTALLED@@EXE_SUFFIX@" diff --git a/racket/src/racket/README.txt b/racket/src/bc/README.txt similarity index 98% rename from racket/src/racket/README.txt rename to racket/src/bc/README.txt index 6e9d5debfc..f94f2dacab 100644 --- a/racket/src/racket/README.txt +++ b/racket/src/bc/README.txt @@ -98,9 +98,9 @@ information. If you modify Racket and change any primitive syntax or the collection of built-in identifiers, be sure to update the version number in -"racket/src/schvers.h", so that various tools know to rebuild +"../version/racket_version.h", so that various tools know to rebuild bytecode. If you add or remove primitives, you'll also need to adjust -the counter in "racket/src/schminc.h" . +the counter in "src/schminc.h" . Some general guidelines for modying this code: diff --git a/racket/src/racket/cmdline.inc b/racket/src/bc/cmdline.inc similarity index 100% rename from racket/src/racket/cmdline.inc rename to racket/src/bc/cmdline.inc diff --git a/racket/src/racket/collects-path.rkt b/racket/src/bc/collects-path.rkt similarity index 100% rename from racket/src/racket/collects-path.rkt rename to racket/src/bc/collects-path.rkt diff --git a/racket/src/racket/configure.ac b/racket/src/bc/configure.ac similarity index 97% rename from racket/src/racket/configure.ac rename to racket/src/bc/configure.ac index 93ada590d4..6884ae8a12 100644 --- a/racket/src/racket/configure.ac +++ b/racket/src/bc/configure.ac @@ -20,8 +20,8 @@ # hence PREFLAGS, which is initialized to the original CPPFLAGS. AC_INIT([Racket]) -AC_CONFIG_SRCDIR(racket/src/bignum.c) -AC_CONFIG_HEADERS([racket/mzconfig.h]) +AC_CONFIG_SRCDIR(bc/src/bignum.c) +AC_CONFIG_HEADERS([bc/mzconfig.h]) AC_CONFIG_AUX_DIR(lt) AC_CANONICAL_SYSTEM @@ -142,7 +142,7 @@ m4_include(../ac/path.m4) ###### Make sure GRacket is really there ###### if test "${enable_gracket}" = "yes" ; then - if test ! -d $srcdir/gracket ; then + if test ! -d $srcdir/bc/gracket ; then enable_gracket=no fi fi @@ -549,7 +549,7 @@ case "$host_os" in ;; aix*) enable_cgcdefault="yes" - EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../racket/include/racket.exp" + EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../bc/include/racket.exp" ;; *freebsd*) LIBS="$LIBS -rdynamic" @@ -1286,8 +1286,8 @@ fi ############## Racket for Racket ################ if test "${enable_racket}" = "auto" ; then - enable_racket="`pwd`/local/racket/racket3m" - MAKE_LOCAL_RACKET="local/racket/racket3m" + enable_racket="`pwd`/local/bc/racket3m" + MAKE_LOCAL_RACKET="local/bc/racket3m" fi if test "${enable_racket}" = "" ; then @@ -1343,10 +1343,10 @@ if test "${enable_shared}" = "yes" ; then if test "$INCLUDEDEP" = "-include" ; then plt_lib_version="\$(FWVERSION)" else - VERSION_X=`grep 'define MZSCHEME_VERSION_X ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` - VERSION_Y=`grep 'define MZSCHEME_VERSION_Y ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` - VERSION_Z=`grep 'define MZSCHEME_VERSION_Z ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` - VERSION_W=`grep 'define MZSCHEME_VERSION_W ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` + VERSION_X=`grep 'define MZSCHEME_VERSION_X ' ${srcdir}/bc/src/schvers.h | cut -d ' ' -f 3` + VERSION_Y=`grep 'define MZSCHEME_VERSION_Y ' ${srcdir}/bc/src/schvers.h | cut -d ' ' -f 3` + VERSION_Z=`grep 'define MZSCHEME_VERSION_Z ' ${srcdir}/bc/src/schvers.h | cut -d ' ' -f 3` + VERSION_W=`grep 'define MZSCHEME_VERSION_W ' ${srcdir}/bc/src/schvers.h | cut -d ' ' -f 3` if test "${VERSION_W}" != "0" ; then plt_lib_version="${VERSION_X}.${VERSION_Y}.${VERSION_Z}.${VERSION_W}" @@ -1516,9 +1516,9 @@ mk_needed_dir() } makefiles="Makefile - racket/Makefile - racket/src/Makefile racket/dynsrc/Makefile - racket/sgc/Makefile racket/gc2/Makefile" + bc/Makefile + bc/src/Makefile bc/dynsrc/Makefile + bc/sgc/Makefile bc/gc2/Makefile" # Make sure the --enable-shared default is propagated: if test "${enable_shared}" = "yes" ; then @@ -1541,10 +1541,10 @@ fi FOREIGNTARGET= FOREIGN_IF_USED="FOREIGN_NOT_USED" -if test -d "${srcdir}/foreign" && test "${enable_foreign}" = "yes" ; then +if test -d "${srcdir}/bc/foreign" && test "${enable_foreign}" = "yes" ; then if test "${have_libffi}" != "yes" ; then - AC_CONFIG_AUX_DIR( foreign/libffi ) - AC_CONFIG_SUBDIRS( foreign/libffi ) + AC_CONFIG_AUX_DIR( bc/foreign/libffi ) + AC_CONFIG_SUBDIRS( bc/foreign/libffi ) fi FOREIGNTARGET="foreign-stuff" FOREIGN_IF_USED="FOREIGN_USED" @@ -1552,7 +1552,7 @@ else FOREIGNTARGET="foreign-stub" MZOPTIONS="$MZOPTIONS -DDONT_USE_FOREIGN" fi -makefiles="$makefiles foreign/Makefile" +makefiles="$makefiles bc/foreign/Makefile" AC_CONFIG_SUBDIRS( rktio ) @@ -1579,8 +1579,8 @@ ac_configure_args="$new_configure_args$SUB_CONFIGURE_EXTRAS" if test "${enable_gracket}" = "yes" ; then makefiles="$makefiles - gracket/Makefile - gracket/gc2/Makefile" + bc/gracket/Makefile + bc/gracket/gc2/Makefile" fi AC_OUTPUT($makefiles) diff --git a/racket/src/racket/dynsrc/.gitignore b/racket/src/bc/dynsrc/.gitignore similarity index 100% rename from racket/src/racket/dynsrc/.gitignore rename to racket/src/bc/dynsrc/.gitignore diff --git a/racket/src/racket/dynsrc/Makefile.in b/racket/src/bc/dynsrc/Makefile.in similarity index 92% rename from racket/src/racket/dynsrc/Makefile.in rename to racket/src/bc/dynsrc/Makefile.in index 2f6e6aa923..da7872d8ca 100644 --- a/racket/src/racket/dynsrc/Makefile.in +++ b/racket/src/bc/dynsrc/Makefile.in @@ -21,7 +21,7 @@ CC = @CC@ PLAIN_CC = @PLAIN_CC@ CFLAGS = @CFLAGS@ @COMPFLAGS@ CPPFLAGS = @PREFLAGS@ -ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -I$(builddir)/.. -I$(srcdir)/../include -I$(srcdir)/../src -I$(srcdir)/../../start @MZOPTIONS@ +ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -I$(builddir)/.. -I$(srcdir)/../include -I$(srcdir)/../src -I$(srcdir)/../../version -I$(srcdir)/../../start @MZOPTIONS@ dynlib@NOT_MINGW@: $(MAKE) ../mzdyn.o @@ -45,14 +45,14 @@ HEADERS = $(builddir)/../mzconfig.h \ $(srcdir)/../include/scheme.h $(srcdir)/../src/schemef.h \ $(srcdir)/../sconfig.h $(srcdir)/../uconfig.h \ $(srcdir)/../include/escheme.h $(srcdir)/../src/stypes.h \ - $(srcdir)/../src/schemex.h $(srcdir)/../src/schemexm.h $(srcdir)/../src/schvers.h + $(srcdir)/../src/schemex.h $(srcdir)/../src/schemexm.h $(srcdir)/../../version/racket_version.h MZDYNDEP = ../mzdyn.o $(srcdir)/../include/ext.exp $(srcdir)/../include/racket.exp -../mzdyn.o: $(srcdir)/mzdyn.c $(srcdir)/../src/schvers.h $(HEADERS) +../mzdyn.o: $(srcdir)/mzdyn.c $(srcdir)/../../version/racket_version.h $(HEADERS) $(PLAIN_CC) @DYN_CFLAGS@ $(ALL_CFLAGS) -c $(srcdir)/mzdyn.c -o ../mzdyn.o -../mzdyn3m.o: $(srcdir)/mzdyn.c $(srcdir)/../src/schvers.h $(HEADERS) +../mzdyn3m.o: $(srcdir)/mzdyn.c $(srcdir)/../../version/racket_version.h $(HEADERS) $(PLAIN_CC) @DYN_CFLAGS@ $(ALL_CFLAGS) -DMZ_PRECISE_GC -c $(srcdir)/mzdyn.c -o ../mzdyn3m.o ../dynexmpl.so: dynexmpl.o $(MZDYNDEP) diff --git a/racket/src/racket/dynsrc/dynexmpl.c b/racket/src/bc/dynsrc/dynexmpl.c similarity index 100% rename from racket/src/racket/dynsrc/dynexmpl.c rename to racket/src/bc/dynsrc/dynexmpl.c diff --git a/racket/src/racket/dynsrc/fixup.c b/racket/src/bc/dynsrc/fixup.c similarity index 100% rename from racket/src/racket/dynsrc/fixup.c rename to racket/src/bc/dynsrc/fixup.c diff --git a/racket/src/racket/dynsrc/init.cc b/racket/src/bc/dynsrc/init.cc similarity index 100% rename from racket/src/racket/dynsrc/init.cc rename to racket/src/bc/dynsrc/init.cc diff --git a/racket/src/racket/dynsrc/mkbordyn.bat b/racket/src/bc/dynsrc/mkbordyn.bat similarity index 100% rename from racket/src/racket/dynsrc/mkbordyn.bat rename to racket/src/bc/dynsrc/mkbordyn.bat diff --git a/racket/src/racket/dynsrc/mkmzdyn.bat b/racket/src/bc/dynsrc/mkmzdyn.bat similarity index 100% rename from racket/src/racket/dynsrc/mkmzdyn.bat rename to racket/src/bc/dynsrc/mkmzdyn.bat diff --git a/racket/src/racket/dynsrc/mzdyn.c b/racket/src/bc/dynsrc/mzdyn.c similarity index 91% rename from racket/src/racket/dynsrc/mzdyn.c rename to racket/src/bc/dynsrc/mzdyn.c index 775f7ec7e6..b1741f994e 100644 --- a/racket/src/racket/dynsrc/mzdyn.c +++ b/racket/src/bc/dynsrc/mzdyn.c @@ -3,9 +3,9 @@ #include "escheme.h" #ifdef INCLUDE_WITHOUT_PATHS -# include "schvers.h" +# include "racket_version.h" #else -# include "../src/schvers.h" +# include "../../version/racket_version.h" #endif #ifdef MZ_PRECISE_GC diff --git a/racket/src/racket/dynsrc/mzdyn.def b/racket/src/bc/dynsrc/mzdyn.def similarity index 100% rename from racket/src/racket/dynsrc/mzdyn.def rename to racket/src/bc/dynsrc/mzdyn.def diff --git a/racket/src/racket/dynsrc/mzdynb.def b/racket/src/bc/dynsrc/mzdynb.def similarity index 100% rename from racket/src/racket/dynsrc/mzdynb.def rename to racket/src/bc/dynsrc/mzdynb.def diff --git a/racket/src/foreign/Makefile.in b/racket/src/bc/foreign/Makefile.in similarity index 68% rename from racket/src/foreign/Makefile.in rename to racket/src/bc/foreign/Makefile.in index cfa09b82bf..e9ab225ca3 100644 --- a/racket/src/foreign/Makefile.in +++ b/racket/src/bc/foreign/Makefile.in @@ -9,9 +9,9 @@ LIBFFI_LOCAL_INCLUDE_OFF = CFLAGS = @CFLAGS@ @COMPFLAGS@ @PROFFLAGS@ CPPFLAGS = @PREFLAGS@ ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ \ - -I$(builddir)/../racket \ - -I$(srcdir)/../racket/include -I$(srcdir)/../racket/src \ - -I$(srcdir)/../rktio -I$(builddir)/../rktio \ + -I$(builddir)/.. \ + -I$(srcdir)/../include -I$(srcdir)/../src \ + -I$(srcdir)/../../rktio -I$(builddir)/../../rktio \ $(LIBFFI_LOCAL_INCLUDE_@OWN_LIBFFI@) ARFLAGS = @ARFLAGS@ NOOP = : @@ -37,12 +37,12 @@ libffi/libffi@FOREIGN_CONVENIENCE@.la: cd libffi; $(MAKE) libffi@FOREIGN_CONVENIENCE@.la foreign.@LTO@: $(srcdir)/foreign.c \ - $(srcdir)/../racket/sconfig.h \ - $(srcdir)/../racket/include/scheme.h \ - $(srcdir)/../racket/include/schthread.h \ - $(srcdir)/../racket/src/schemef.h \ - $(srcdir)/../racket/src/stypes.h \ - $(srcdir)/../racket/src/schpriv.h + $(srcdir)/../sconfig.h \ + $(srcdir)/../include/scheme.h \ + $(srcdir)/../include/schthread.h \ + $(srcdir)/../src/schemef.h \ + $(srcdir)/../src/stypes.h \ + $(srcdir)/../src/schpriv.h $(CC) $(ALL_CFLAGS) -c $(srcdir)/foreign.c -o foreign.@LTO@ clean: diff --git a/racket/src/foreign/README b/racket/src/bc/foreign/README similarity index 100% rename from racket/src/foreign/README rename to racket/src/bc/foreign/README diff --git a/racket/src/foreign/foreign.c b/racket/src/bc/foreign/foreign.c similarity index 99% rename from racket/src/foreign/foreign.c rename to racket/src/bc/foreign/foreign.c index 5eaa3bc3db..9341df9a14 100644 --- a/racket/src/foreign/foreign.c +++ b/racket/src/bc/foreign/foreign.c @@ -5361,8 +5361,8 @@ void scheme_init_foreign(Scheme_Startup_Env *env) int scheme_is_cpointer(Scheme_Object *cp) { return (SCHEME_FALSEP(cp) - || SCHEME_CPTRP(x) - || SCHEME_BYTE_STRINGP(x) + || SCHEME_CPTRP(cp) + || SCHEME_BYTE_STRINGP(cp) || (SCHEME_CHAPERONE_STRUCTP(cp) && scheme_struct_type_property_ref(scheme_cpointer_property, cp))); } diff --git a/racket/src/foreign/foreign.rktc b/racket/src/bc/foreign/foreign.rktc similarity index 100% rename from racket/src/foreign/foreign.rktc rename to racket/src/bc/foreign/foreign.rktc diff --git a/racket/src/foreign/libffi/.gitignore b/racket/src/bc/foreign/libffi/.gitignore similarity index 100% rename from racket/src/foreign/libffi/.gitignore rename to racket/src/bc/foreign/libffi/.gitignore diff --git a/racket/src/foreign/libffi/.travis.yml b/racket/src/bc/foreign/libffi/.travis.yml similarity index 100% rename from racket/src/foreign/libffi/.travis.yml rename to racket/src/bc/foreign/libffi/.travis.yml diff --git a/racket/src/foreign/libffi/ChangeLog b/racket/src/bc/foreign/libffi/ChangeLog similarity index 100% rename from racket/src/foreign/libffi/ChangeLog rename to racket/src/bc/foreign/libffi/ChangeLog diff --git a/racket/src/foreign/libffi/ChangeLog.libffi b/racket/src/bc/foreign/libffi/ChangeLog.libffi similarity index 100% rename from racket/src/foreign/libffi/ChangeLog.libffi rename to racket/src/bc/foreign/libffi/ChangeLog.libffi diff --git a/racket/src/foreign/libffi/ChangeLog.libffi-3.1 b/racket/src/bc/foreign/libffi/ChangeLog.libffi-3.1 similarity index 100% rename from racket/src/foreign/libffi/ChangeLog.libffi-3.1 rename to racket/src/bc/foreign/libffi/ChangeLog.libffi-3.1 diff --git a/racket/src/foreign/libffi/ChangeLog.libgcj b/racket/src/bc/foreign/libffi/ChangeLog.libgcj similarity index 100% rename from racket/src/foreign/libffi/ChangeLog.libgcj rename to racket/src/bc/foreign/libffi/ChangeLog.libgcj diff --git a/racket/src/foreign/libffi/ChangeLog.v1 b/racket/src/bc/foreign/libffi/ChangeLog.v1 similarity index 100% rename from racket/src/foreign/libffi/ChangeLog.v1 rename to racket/src/bc/foreign/libffi/ChangeLog.v1 diff --git a/racket/src/foreign/libffi/LICENSE b/racket/src/bc/foreign/libffi/LICENSE similarity index 100% rename from racket/src/foreign/libffi/LICENSE rename to racket/src/bc/foreign/libffi/LICENSE diff --git a/racket/src/foreign/libffi/Makefile.am b/racket/src/bc/foreign/libffi/Makefile.am similarity index 100% rename from racket/src/foreign/libffi/Makefile.am rename to racket/src/bc/foreign/libffi/Makefile.am diff --git a/racket/src/foreign/libffi/Makefile.in b/racket/src/bc/foreign/libffi/Makefile.in similarity index 100% rename from racket/src/foreign/libffi/Makefile.in rename to racket/src/bc/foreign/libffi/Makefile.in diff --git a/racket/src/foreign/libffi/README b/racket/src/bc/foreign/libffi/README similarity index 100% rename from racket/src/foreign/libffi/README rename to racket/src/bc/foreign/libffi/README diff --git a/racket/src/foreign/libffi/acinclude.m4 b/racket/src/bc/foreign/libffi/acinclude.m4 similarity index 100% rename from racket/src/foreign/libffi/acinclude.m4 rename to racket/src/bc/foreign/libffi/acinclude.m4 diff --git a/racket/src/foreign/libffi/aclocal.m4 b/racket/src/bc/foreign/libffi/aclocal.m4 similarity index 100% rename from racket/src/foreign/libffi/aclocal.m4 rename to racket/src/bc/foreign/libffi/aclocal.m4 diff --git a/racket/src/foreign/libffi/compile b/racket/src/bc/foreign/libffi/compile similarity index 100% rename from racket/src/foreign/libffi/compile rename to racket/src/bc/foreign/libffi/compile diff --git a/racket/src/foreign/libffi/config.guess b/racket/src/bc/foreign/libffi/config.guess similarity index 100% rename from racket/src/foreign/libffi/config.guess rename to racket/src/bc/foreign/libffi/config.guess diff --git a/racket/src/foreign/libffi/config.sub b/racket/src/bc/foreign/libffi/config.sub similarity index 100% rename from racket/src/foreign/libffi/config.sub rename to racket/src/bc/foreign/libffi/config.sub diff --git a/racket/src/foreign/libffi/configure b/racket/src/bc/foreign/libffi/configure similarity index 100% rename from racket/src/foreign/libffi/configure rename to racket/src/bc/foreign/libffi/configure diff --git a/racket/src/foreign/libffi/configure.ac b/racket/src/bc/foreign/libffi/configure.ac similarity index 100% rename from racket/src/foreign/libffi/configure.ac rename to racket/src/bc/foreign/libffi/configure.ac diff --git a/racket/src/foreign/libffi/depcomp b/racket/src/bc/foreign/libffi/depcomp similarity index 100% rename from racket/src/foreign/libffi/depcomp rename to racket/src/bc/foreign/libffi/depcomp diff --git a/racket/src/foreign/libffi/doc/libffi.info b/racket/src/bc/foreign/libffi/doc/libffi.info similarity index 100% rename from racket/src/foreign/libffi/doc/libffi.info rename to racket/src/bc/foreign/libffi/doc/libffi.info diff --git a/racket/src/foreign/libffi/doc/libffi.texi b/racket/src/bc/foreign/libffi/doc/libffi.texi similarity index 100% rename from racket/src/foreign/libffi/doc/libffi.texi rename to racket/src/bc/foreign/libffi/doc/libffi.texi diff --git a/racket/src/foreign/libffi/doc/stamp-vti b/racket/src/bc/foreign/libffi/doc/stamp-vti similarity index 100% rename from racket/src/foreign/libffi/doc/stamp-vti rename to racket/src/bc/foreign/libffi/doc/stamp-vti diff --git a/racket/src/foreign/libffi/doc/version.texi b/racket/src/bc/foreign/libffi/doc/version.texi similarity index 100% rename from racket/src/foreign/libffi/doc/version.texi rename to racket/src/bc/foreign/libffi/doc/version.texi diff --git a/racket/src/foreign/libffi/fficonfig.h.in b/racket/src/bc/foreign/libffi/fficonfig.h.in similarity index 100% rename from racket/src/foreign/libffi/fficonfig.h.in rename to racket/src/bc/foreign/libffi/fficonfig.h.in diff --git a/racket/src/foreign/libffi/generate-darwin-source-and-headers.py b/racket/src/bc/foreign/libffi/generate-darwin-source-and-headers.py similarity index 100% rename from racket/src/foreign/libffi/generate-darwin-source-and-headers.py rename to racket/src/bc/foreign/libffi/generate-darwin-source-and-headers.py diff --git a/racket/src/foreign/libffi/include/Makefile.am b/racket/src/bc/foreign/libffi/include/Makefile.am similarity index 100% rename from racket/src/foreign/libffi/include/Makefile.am rename to racket/src/bc/foreign/libffi/include/Makefile.am diff --git a/racket/src/foreign/libffi/include/Makefile.in b/racket/src/bc/foreign/libffi/include/Makefile.in similarity index 100% rename from racket/src/foreign/libffi/include/Makefile.in rename to racket/src/bc/foreign/libffi/include/Makefile.in diff --git a/racket/src/foreign/libffi/include/ffi.h.in b/racket/src/bc/foreign/libffi/include/ffi.h.in similarity index 100% rename from racket/src/foreign/libffi/include/ffi.h.in rename to racket/src/bc/foreign/libffi/include/ffi.h.in diff --git a/racket/src/foreign/libffi/include/ffi_common.h b/racket/src/bc/foreign/libffi/include/ffi_common.h similarity index 100% rename from racket/src/foreign/libffi/include/ffi_common.h rename to racket/src/bc/foreign/libffi/include/ffi_common.h diff --git a/racket/src/foreign/libffi/install-sh b/racket/src/bc/foreign/libffi/install-sh similarity index 100% rename from racket/src/foreign/libffi/install-sh rename to racket/src/bc/foreign/libffi/install-sh diff --git a/racket/src/foreign/libffi/libffi.pc.in b/racket/src/bc/foreign/libffi/libffi.pc.in similarity index 100% rename from racket/src/foreign/libffi/libffi.pc.in rename to racket/src/bc/foreign/libffi/libffi.pc.in diff --git a/racket/src/foreign/libffi/libffi.xcodeproj/project.pbxproj b/racket/src/bc/foreign/libffi/libffi.xcodeproj/project.pbxproj similarity index 100% rename from racket/src/foreign/libffi/libffi.xcodeproj/project.pbxproj rename to racket/src/bc/foreign/libffi/libffi.xcodeproj/project.pbxproj diff --git a/racket/src/foreign/libffi/libtool-ldflags b/racket/src/bc/foreign/libffi/libtool-ldflags similarity index 100% rename from racket/src/foreign/libffi/libtool-ldflags rename to racket/src/bc/foreign/libffi/libtool-ldflags diff --git a/racket/src/foreign/libffi/libtool-version b/racket/src/bc/foreign/libffi/libtool-version similarity index 100% rename from racket/src/foreign/libffi/libtool-version rename to racket/src/bc/foreign/libffi/libtool-version diff --git a/racket/src/foreign/libffi/ltmain.sh b/racket/src/bc/foreign/libffi/ltmain.sh similarity index 100% rename from racket/src/foreign/libffi/ltmain.sh rename to racket/src/bc/foreign/libffi/ltmain.sh diff --git a/racket/src/foreign/libffi/m4/asmcfi.m4 b/racket/src/bc/foreign/libffi/m4/asmcfi.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/asmcfi.m4 rename to racket/src/bc/foreign/libffi/m4/asmcfi.m4 diff --git a/racket/src/foreign/libffi/m4/ax_append_flag.m4 b/racket/src/bc/foreign/libffi/m4/ax_append_flag.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/ax_append_flag.m4 rename to racket/src/bc/foreign/libffi/m4/ax_append_flag.m4 diff --git a/racket/src/foreign/libffi/m4/ax_cc_maxopt.m4 b/racket/src/bc/foreign/libffi/m4/ax_cc_maxopt.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/ax_cc_maxopt.m4 rename to racket/src/bc/foreign/libffi/m4/ax_cc_maxopt.m4 diff --git a/racket/src/foreign/libffi/m4/ax_cflags_warn_all.m4 b/racket/src/bc/foreign/libffi/m4/ax_cflags_warn_all.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/ax_cflags_warn_all.m4 rename to racket/src/bc/foreign/libffi/m4/ax_cflags_warn_all.m4 diff --git a/racket/src/foreign/libffi/m4/ax_check_compile_flag.m4 b/racket/src/bc/foreign/libffi/m4/ax_check_compile_flag.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/ax_check_compile_flag.m4 rename to racket/src/bc/foreign/libffi/m4/ax_check_compile_flag.m4 diff --git a/racket/src/foreign/libffi/m4/ax_compiler_vendor.m4 b/racket/src/bc/foreign/libffi/m4/ax_compiler_vendor.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/ax_compiler_vendor.m4 rename to racket/src/bc/foreign/libffi/m4/ax_compiler_vendor.m4 diff --git a/racket/src/foreign/libffi/m4/ax_configure_args.m4 b/racket/src/bc/foreign/libffi/m4/ax_configure_args.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/ax_configure_args.m4 rename to racket/src/bc/foreign/libffi/m4/ax_configure_args.m4 diff --git a/racket/src/foreign/libffi/m4/ax_enable_builddir.m4 b/racket/src/bc/foreign/libffi/m4/ax_enable_builddir.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/ax_enable_builddir.m4 rename to racket/src/bc/foreign/libffi/m4/ax_enable_builddir.m4 diff --git a/racket/src/foreign/libffi/m4/ax_gcc_archflag.m4 b/racket/src/bc/foreign/libffi/m4/ax_gcc_archflag.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/ax_gcc_archflag.m4 rename to racket/src/bc/foreign/libffi/m4/ax_gcc_archflag.m4 diff --git a/racket/src/foreign/libffi/m4/ax_gcc_x86_cpuid.m4 b/racket/src/bc/foreign/libffi/m4/ax_gcc_x86_cpuid.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/ax_gcc_x86_cpuid.m4 rename to racket/src/bc/foreign/libffi/m4/ax_gcc_x86_cpuid.m4 diff --git a/racket/src/foreign/libffi/m4/libtool.m4 b/racket/src/bc/foreign/libffi/m4/libtool.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/libtool.m4 rename to racket/src/bc/foreign/libffi/m4/libtool.m4 diff --git a/racket/src/foreign/libffi/m4/ltoptions.m4 b/racket/src/bc/foreign/libffi/m4/ltoptions.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/ltoptions.m4 rename to racket/src/bc/foreign/libffi/m4/ltoptions.m4 diff --git a/racket/src/foreign/libffi/m4/ltsugar.m4 b/racket/src/bc/foreign/libffi/m4/ltsugar.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/ltsugar.m4 rename to racket/src/bc/foreign/libffi/m4/ltsugar.m4 diff --git a/racket/src/foreign/libffi/m4/ltversion.m4 b/racket/src/bc/foreign/libffi/m4/ltversion.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/ltversion.m4 rename to racket/src/bc/foreign/libffi/m4/ltversion.m4 diff --git a/racket/src/foreign/libffi/m4/lt~obsolete.m4 b/racket/src/bc/foreign/libffi/m4/lt~obsolete.m4 similarity index 100% rename from racket/src/foreign/libffi/m4/lt~obsolete.m4 rename to racket/src/bc/foreign/libffi/m4/lt~obsolete.m4 diff --git a/racket/src/foreign/libffi/man/Makefile.am b/racket/src/bc/foreign/libffi/man/Makefile.am similarity index 100% rename from racket/src/foreign/libffi/man/Makefile.am rename to racket/src/bc/foreign/libffi/man/Makefile.am diff --git a/racket/src/foreign/libffi/man/Makefile.in b/racket/src/bc/foreign/libffi/man/Makefile.in similarity index 100% rename from racket/src/foreign/libffi/man/Makefile.in rename to racket/src/bc/foreign/libffi/man/Makefile.in diff --git a/racket/src/foreign/libffi/man/ffi.3 b/racket/src/bc/foreign/libffi/man/ffi.3 similarity index 100% rename from racket/src/foreign/libffi/man/ffi.3 rename to racket/src/bc/foreign/libffi/man/ffi.3 diff --git a/racket/src/foreign/libffi/man/ffi_call.3 b/racket/src/bc/foreign/libffi/man/ffi_call.3 similarity index 100% rename from racket/src/foreign/libffi/man/ffi_call.3 rename to racket/src/bc/foreign/libffi/man/ffi_call.3 diff --git a/racket/src/foreign/libffi/man/ffi_prep_cif.3 b/racket/src/bc/foreign/libffi/man/ffi_prep_cif.3 similarity index 100% rename from racket/src/foreign/libffi/man/ffi_prep_cif.3 rename to racket/src/bc/foreign/libffi/man/ffi_prep_cif.3 diff --git a/racket/src/foreign/libffi/man/ffi_prep_cif_var.3 b/racket/src/bc/foreign/libffi/man/ffi_prep_cif_var.3 similarity index 100% rename from racket/src/foreign/libffi/man/ffi_prep_cif_var.3 rename to racket/src/bc/foreign/libffi/man/ffi_prep_cif_var.3 diff --git a/racket/src/foreign/libffi/mdate-sh b/racket/src/bc/foreign/libffi/mdate-sh similarity index 100% rename from racket/src/foreign/libffi/mdate-sh rename to racket/src/bc/foreign/libffi/mdate-sh diff --git a/racket/src/foreign/libffi/missing b/racket/src/bc/foreign/libffi/missing similarity index 100% rename from racket/src/foreign/libffi/missing rename to racket/src/bc/foreign/libffi/missing diff --git a/racket/src/foreign/libffi/msvcc.sh b/racket/src/bc/foreign/libffi/msvcc.sh similarity index 100% rename from racket/src/foreign/libffi/msvcc.sh rename to racket/src/bc/foreign/libffi/msvcc.sh diff --git a/racket/src/foreign/libffi/src/aarch64/ffi.c b/racket/src/bc/foreign/libffi/src/aarch64/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/aarch64/ffi.c rename to racket/src/bc/foreign/libffi/src/aarch64/ffi.c diff --git a/racket/src/foreign/libffi/src/aarch64/ffitarget.h b/racket/src/bc/foreign/libffi/src/aarch64/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/aarch64/ffitarget.h rename to racket/src/bc/foreign/libffi/src/aarch64/ffitarget.h diff --git a/racket/src/foreign/libffi/src/aarch64/sysv.S b/racket/src/bc/foreign/libffi/src/aarch64/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/aarch64/sysv.S rename to racket/src/bc/foreign/libffi/src/aarch64/sysv.S diff --git a/racket/src/foreign/libffi/src/alpha/ffi.c b/racket/src/bc/foreign/libffi/src/alpha/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/alpha/ffi.c rename to racket/src/bc/foreign/libffi/src/alpha/ffi.c diff --git a/racket/src/foreign/libffi/src/alpha/ffitarget.h b/racket/src/bc/foreign/libffi/src/alpha/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/alpha/ffitarget.h rename to racket/src/bc/foreign/libffi/src/alpha/ffitarget.h diff --git a/racket/src/foreign/libffi/src/alpha/osf.S b/racket/src/bc/foreign/libffi/src/alpha/osf.S similarity index 100% rename from racket/src/foreign/libffi/src/alpha/osf.S rename to racket/src/bc/foreign/libffi/src/alpha/osf.S diff --git a/racket/src/foreign/libffi/src/arc/arcompact.S b/racket/src/bc/foreign/libffi/src/arc/arcompact.S similarity index 100% rename from racket/src/foreign/libffi/src/arc/arcompact.S rename to racket/src/bc/foreign/libffi/src/arc/arcompact.S diff --git a/racket/src/foreign/libffi/src/arc/ffi.c b/racket/src/bc/foreign/libffi/src/arc/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/arc/ffi.c rename to racket/src/bc/foreign/libffi/src/arc/ffi.c diff --git a/racket/src/foreign/libffi/src/arc/ffitarget.h b/racket/src/bc/foreign/libffi/src/arc/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/arc/ffitarget.h rename to racket/src/bc/foreign/libffi/src/arc/ffitarget.h diff --git a/racket/src/foreign/libffi/src/arm/ffi.c b/racket/src/bc/foreign/libffi/src/arm/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/arm/ffi.c rename to racket/src/bc/foreign/libffi/src/arm/ffi.c diff --git a/racket/src/foreign/libffi/src/arm/ffitarget.h b/racket/src/bc/foreign/libffi/src/arm/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/arm/ffitarget.h rename to racket/src/bc/foreign/libffi/src/arm/ffitarget.h diff --git a/racket/src/foreign/libffi/src/arm/gentramp.sh b/racket/src/bc/foreign/libffi/src/arm/gentramp.sh similarity index 100% rename from racket/src/foreign/libffi/src/arm/gentramp.sh rename to racket/src/bc/foreign/libffi/src/arm/gentramp.sh diff --git a/racket/src/foreign/libffi/src/arm/sysv.S b/racket/src/bc/foreign/libffi/src/arm/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/arm/sysv.S rename to racket/src/bc/foreign/libffi/src/arm/sysv.S diff --git a/racket/src/foreign/libffi/src/arm/trampoline.S b/racket/src/bc/foreign/libffi/src/arm/trampoline.S similarity index 100% rename from racket/src/foreign/libffi/src/arm/trampoline.S rename to racket/src/bc/foreign/libffi/src/arm/trampoline.S diff --git a/racket/src/foreign/libffi/src/avr32/ffi.c b/racket/src/bc/foreign/libffi/src/avr32/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/avr32/ffi.c rename to racket/src/bc/foreign/libffi/src/avr32/ffi.c diff --git a/racket/src/foreign/libffi/src/avr32/ffitarget.h b/racket/src/bc/foreign/libffi/src/avr32/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/avr32/ffitarget.h rename to racket/src/bc/foreign/libffi/src/avr32/ffitarget.h diff --git a/racket/src/foreign/libffi/src/avr32/sysv.S b/racket/src/bc/foreign/libffi/src/avr32/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/avr32/sysv.S rename to racket/src/bc/foreign/libffi/src/avr32/sysv.S diff --git a/racket/src/foreign/libffi/src/bfin/ffi.c b/racket/src/bc/foreign/libffi/src/bfin/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/bfin/ffi.c rename to racket/src/bc/foreign/libffi/src/bfin/ffi.c diff --git a/racket/src/foreign/libffi/src/bfin/ffitarget.h b/racket/src/bc/foreign/libffi/src/bfin/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/bfin/ffitarget.h rename to racket/src/bc/foreign/libffi/src/bfin/ffitarget.h diff --git a/racket/src/foreign/libffi/src/bfin/sysv.S b/racket/src/bc/foreign/libffi/src/bfin/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/bfin/sysv.S rename to racket/src/bc/foreign/libffi/src/bfin/sysv.S diff --git a/racket/src/foreign/libffi/src/closures.c b/racket/src/bc/foreign/libffi/src/closures.c similarity index 100% rename from racket/src/foreign/libffi/src/closures.c rename to racket/src/bc/foreign/libffi/src/closures.c diff --git a/racket/src/foreign/libffi/src/cris/ffi.c b/racket/src/bc/foreign/libffi/src/cris/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/cris/ffi.c rename to racket/src/bc/foreign/libffi/src/cris/ffi.c diff --git a/racket/src/foreign/libffi/src/cris/ffitarget.h b/racket/src/bc/foreign/libffi/src/cris/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/cris/ffitarget.h rename to racket/src/bc/foreign/libffi/src/cris/ffitarget.h diff --git a/racket/src/foreign/libffi/src/cris/sysv.S b/racket/src/bc/foreign/libffi/src/cris/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/cris/sysv.S rename to racket/src/bc/foreign/libffi/src/cris/sysv.S diff --git a/racket/src/foreign/libffi/src/debug.c b/racket/src/bc/foreign/libffi/src/debug.c similarity index 100% rename from racket/src/foreign/libffi/src/debug.c rename to racket/src/bc/foreign/libffi/src/debug.c diff --git a/racket/src/foreign/libffi/src/dlmalloc.c b/racket/src/bc/foreign/libffi/src/dlmalloc.c similarity index 100% rename from racket/src/foreign/libffi/src/dlmalloc.c rename to racket/src/bc/foreign/libffi/src/dlmalloc.c diff --git a/racket/src/foreign/libffi/src/frv/eabi.S b/racket/src/bc/foreign/libffi/src/frv/eabi.S similarity index 100% rename from racket/src/foreign/libffi/src/frv/eabi.S rename to racket/src/bc/foreign/libffi/src/frv/eabi.S diff --git a/racket/src/foreign/libffi/src/frv/ffi.c b/racket/src/bc/foreign/libffi/src/frv/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/frv/ffi.c rename to racket/src/bc/foreign/libffi/src/frv/ffi.c diff --git a/racket/src/foreign/libffi/src/frv/ffitarget.h b/racket/src/bc/foreign/libffi/src/frv/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/frv/ffitarget.h rename to racket/src/bc/foreign/libffi/src/frv/ffitarget.h diff --git a/racket/src/foreign/libffi/src/ia64/ffi.c b/racket/src/bc/foreign/libffi/src/ia64/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/ia64/ffi.c rename to racket/src/bc/foreign/libffi/src/ia64/ffi.c diff --git a/racket/src/foreign/libffi/src/ia64/ffitarget.h b/racket/src/bc/foreign/libffi/src/ia64/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/ia64/ffitarget.h rename to racket/src/bc/foreign/libffi/src/ia64/ffitarget.h diff --git a/racket/src/foreign/libffi/src/ia64/ia64_flags.h b/racket/src/bc/foreign/libffi/src/ia64/ia64_flags.h similarity index 100% rename from racket/src/foreign/libffi/src/ia64/ia64_flags.h rename to racket/src/bc/foreign/libffi/src/ia64/ia64_flags.h diff --git a/racket/src/foreign/libffi/src/ia64/unix.S b/racket/src/bc/foreign/libffi/src/ia64/unix.S similarity index 100% rename from racket/src/foreign/libffi/src/ia64/unix.S rename to racket/src/bc/foreign/libffi/src/ia64/unix.S diff --git a/racket/src/foreign/libffi/src/java_raw_api.c b/racket/src/bc/foreign/libffi/src/java_raw_api.c similarity index 100% rename from racket/src/foreign/libffi/src/java_raw_api.c rename to racket/src/bc/foreign/libffi/src/java_raw_api.c diff --git a/racket/src/foreign/libffi/src/m32r/ffi.c b/racket/src/bc/foreign/libffi/src/m32r/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/m32r/ffi.c rename to racket/src/bc/foreign/libffi/src/m32r/ffi.c diff --git a/racket/src/foreign/libffi/src/m32r/ffitarget.h b/racket/src/bc/foreign/libffi/src/m32r/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/m32r/ffitarget.h rename to racket/src/bc/foreign/libffi/src/m32r/ffitarget.h diff --git a/racket/src/foreign/libffi/src/m32r/sysv.S b/racket/src/bc/foreign/libffi/src/m32r/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/m32r/sysv.S rename to racket/src/bc/foreign/libffi/src/m32r/sysv.S diff --git a/racket/src/foreign/libffi/src/m68k/ffi.c b/racket/src/bc/foreign/libffi/src/m68k/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/m68k/ffi.c rename to racket/src/bc/foreign/libffi/src/m68k/ffi.c diff --git a/racket/src/foreign/libffi/src/m68k/ffitarget.h b/racket/src/bc/foreign/libffi/src/m68k/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/m68k/ffitarget.h rename to racket/src/bc/foreign/libffi/src/m68k/ffitarget.h diff --git a/racket/src/foreign/libffi/src/m68k/sysv.S b/racket/src/bc/foreign/libffi/src/m68k/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/m68k/sysv.S rename to racket/src/bc/foreign/libffi/src/m68k/sysv.S diff --git a/racket/src/foreign/libffi/src/m88k/ffi.c b/racket/src/bc/foreign/libffi/src/m88k/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/m88k/ffi.c rename to racket/src/bc/foreign/libffi/src/m88k/ffi.c diff --git a/racket/src/foreign/libffi/src/m88k/ffitarget.h b/racket/src/bc/foreign/libffi/src/m88k/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/m88k/ffitarget.h rename to racket/src/bc/foreign/libffi/src/m88k/ffitarget.h diff --git a/racket/src/foreign/libffi/src/m88k/obsd.S b/racket/src/bc/foreign/libffi/src/m88k/obsd.S similarity index 100% rename from racket/src/foreign/libffi/src/m88k/obsd.S rename to racket/src/bc/foreign/libffi/src/m88k/obsd.S diff --git a/racket/src/foreign/libffi/src/metag/ffi.c b/racket/src/bc/foreign/libffi/src/metag/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/metag/ffi.c rename to racket/src/bc/foreign/libffi/src/metag/ffi.c diff --git a/racket/src/foreign/libffi/src/metag/ffitarget.h b/racket/src/bc/foreign/libffi/src/metag/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/metag/ffitarget.h rename to racket/src/bc/foreign/libffi/src/metag/ffitarget.h diff --git a/racket/src/foreign/libffi/src/metag/sysv.S b/racket/src/bc/foreign/libffi/src/metag/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/metag/sysv.S rename to racket/src/bc/foreign/libffi/src/metag/sysv.S diff --git a/racket/src/foreign/libffi/src/microblaze/ffi.c b/racket/src/bc/foreign/libffi/src/microblaze/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/microblaze/ffi.c rename to racket/src/bc/foreign/libffi/src/microblaze/ffi.c diff --git a/racket/src/foreign/libffi/src/microblaze/ffitarget.h b/racket/src/bc/foreign/libffi/src/microblaze/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/microblaze/ffitarget.h rename to racket/src/bc/foreign/libffi/src/microblaze/ffitarget.h diff --git a/racket/src/foreign/libffi/src/microblaze/sysv.S b/racket/src/bc/foreign/libffi/src/microblaze/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/microblaze/sysv.S rename to racket/src/bc/foreign/libffi/src/microblaze/sysv.S diff --git a/racket/src/foreign/libffi/src/mips/ffi.c b/racket/src/bc/foreign/libffi/src/mips/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/mips/ffi.c rename to racket/src/bc/foreign/libffi/src/mips/ffi.c diff --git a/racket/src/foreign/libffi/src/mips/ffitarget.h b/racket/src/bc/foreign/libffi/src/mips/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/mips/ffitarget.h rename to racket/src/bc/foreign/libffi/src/mips/ffitarget.h diff --git a/racket/src/foreign/libffi/src/mips/n32.S b/racket/src/bc/foreign/libffi/src/mips/n32.S similarity index 100% rename from racket/src/foreign/libffi/src/mips/n32.S rename to racket/src/bc/foreign/libffi/src/mips/n32.S diff --git a/racket/src/foreign/libffi/src/mips/o32.S b/racket/src/bc/foreign/libffi/src/mips/o32.S similarity index 100% rename from racket/src/foreign/libffi/src/mips/o32.S rename to racket/src/bc/foreign/libffi/src/mips/o32.S diff --git a/racket/src/foreign/libffi/src/moxie/eabi.S b/racket/src/bc/foreign/libffi/src/moxie/eabi.S similarity index 100% rename from racket/src/foreign/libffi/src/moxie/eabi.S rename to racket/src/bc/foreign/libffi/src/moxie/eabi.S diff --git a/racket/src/foreign/libffi/src/moxie/ffi.c b/racket/src/bc/foreign/libffi/src/moxie/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/moxie/ffi.c rename to racket/src/bc/foreign/libffi/src/moxie/ffi.c diff --git a/racket/src/foreign/libffi/src/moxie/ffitarget.h b/racket/src/bc/foreign/libffi/src/moxie/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/moxie/ffitarget.h rename to racket/src/bc/foreign/libffi/src/moxie/ffitarget.h diff --git a/racket/src/foreign/libffi/src/nios2/ffi.c b/racket/src/bc/foreign/libffi/src/nios2/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/nios2/ffi.c rename to racket/src/bc/foreign/libffi/src/nios2/ffi.c diff --git a/racket/src/foreign/libffi/src/nios2/ffitarget.h b/racket/src/bc/foreign/libffi/src/nios2/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/nios2/ffitarget.h rename to racket/src/bc/foreign/libffi/src/nios2/ffitarget.h diff --git a/racket/src/foreign/libffi/src/nios2/sysv.S b/racket/src/bc/foreign/libffi/src/nios2/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/nios2/sysv.S rename to racket/src/bc/foreign/libffi/src/nios2/sysv.S diff --git a/racket/src/foreign/libffi/src/pa/ffi.c b/racket/src/bc/foreign/libffi/src/pa/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/pa/ffi.c rename to racket/src/bc/foreign/libffi/src/pa/ffi.c diff --git a/racket/src/foreign/libffi/src/pa/ffitarget.h b/racket/src/bc/foreign/libffi/src/pa/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/pa/ffitarget.h rename to racket/src/bc/foreign/libffi/src/pa/ffitarget.h diff --git a/racket/src/foreign/libffi/src/pa/hpux32.S b/racket/src/bc/foreign/libffi/src/pa/hpux32.S similarity index 100% rename from racket/src/foreign/libffi/src/pa/hpux32.S rename to racket/src/bc/foreign/libffi/src/pa/hpux32.S diff --git a/racket/src/foreign/libffi/src/pa/linux.S b/racket/src/bc/foreign/libffi/src/pa/linux.S similarity index 100% rename from racket/src/foreign/libffi/src/pa/linux.S rename to racket/src/bc/foreign/libffi/src/pa/linux.S diff --git a/racket/src/foreign/libffi/src/powerpc/aix.S b/racket/src/bc/foreign/libffi/src/powerpc/aix.S similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/aix.S rename to racket/src/bc/foreign/libffi/src/powerpc/aix.S diff --git a/racket/src/foreign/libffi/src/powerpc/aix_closure.S b/racket/src/bc/foreign/libffi/src/powerpc/aix_closure.S similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/aix_closure.S rename to racket/src/bc/foreign/libffi/src/powerpc/aix_closure.S diff --git a/racket/src/foreign/libffi/src/powerpc/asm.h b/racket/src/bc/foreign/libffi/src/powerpc/asm.h similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/asm.h rename to racket/src/bc/foreign/libffi/src/powerpc/asm.h diff --git a/racket/src/foreign/libffi/src/powerpc/darwin.S b/racket/src/bc/foreign/libffi/src/powerpc/darwin.S similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/darwin.S rename to racket/src/bc/foreign/libffi/src/powerpc/darwin.S diff --git a/racket/src/foreign/libffi/src/powerpc/darwin_closure.S b/racket/src/bc/foreign/libffi/src/powerpc/darwin_closure.S similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/darwin_closure.S rename to racket/src/bc/foreign/libffi/src/powerpc/darwin_closure.S diff --git a/racket/src/foreign/libffi/src/powerpc/ffi.c b/racket/src/bc/foreign/libffi/src/powerpc/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/ffi.c rename to racket/src/bc/foreign/libffi/src/powerpc/ffi.c diff --git a/racket/src/foreign/libffi/src/powerpc/ffi_darwin.c b/racket/src/bc/foreign/libffi/src/powerpc/ffi_darwin.c similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/ffi_darwin.c rename to racket/src/bc/foreign/libffi/src/powerpc/ffi_darwin.c diff --git a/racket/src/foreign/libffi/src/powerpc/ffi_linux64.c b/racket/src/bc/foreign/libffi/src/powerpc/ffi_linux64.c similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/ffi_linux64.c rename to racket/src/bc/foreign/libffi/src/powerpc/ffi_linux64.c diff --git a/racket/src/foreign/libffi/src/powerpc/ffi_powerpc.h b/racket/src/bc/foreign/libffi/src/powerpc/ffi_powerpc.h similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/ffi_powerpc.h rename to racket/src/bc/foreign/libffi/src/powerpc/ffi_powerpc.h diff --git a/racket/src/foreign/libffi/src/powerpc/ffi_sysv.c b/racket/src/bc/foreign/libffi/src/powerpc/ffi_sysv.c similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/ffi_sysv.c rename to racket/src/bc/foreign/libffi/src/powerpc/ffi_sysv.c diff --git a/racket/src/foreign/libffi/src/powerpc/ffitarget.h b/racket/src/bc/foreign/libffi/src/powerpc/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/ffitarget.h rename to racket/src/bc/foreign/libffi/src/powerpc/ffitarget.h diff --git a/racket/src/foreign/libffi/src/powerpc/linux64.S b/racket/src/bc/foreign/libffi/src/powerpc/linux64.S similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/linux64.S rename to racket/src/bc/foreign/libffi/src/powerpc/linux64.S diff --git a/racket/src/foreign/libffi/src/powerpc/linux64_closure.S b/racket/src/bc/foreign/libffi/src/powerpc/linux64_closure.S similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/linux64_closure.S rename to racket/src/bc/foreign/libffi/src/powerpc/linux64_closure.S diff --git a/racket/src/foreign/libffi/src/powerpc/ppc_closure.S b/racket/src/bc/foreign/libffi/src/powerpc/ppc_closure.S similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/ppc_closure.S rename to racket/src/bc/foreign/libffi/src/powerpc/ppc_closure.S diff --git a/racket/src/foreign/libffi/src/powerpc/sysv.S b/racket/src/bc/foreign/libffi/src/powerpc/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/powerpc/sysv.S rename to racket/src/bc/foreign/libffi/src/powerpc/sysv.S diff --git a/racket/src/foreign/libffi/src/prep_cif.c b/racket/src/bc/foreign/libffi/src/prep_cif.c similarity index 100% rename from racket/src/foreign/libffi/src/prep_cif.c rename to racket/src/bc/foreign/libffi/src/prep_cif.c diff --git a/racket/src/foreign/libffi/src/raw_api.c b/racket/src/bc/foreign/libffi/src/raw_api.c similarity index 100% rename from racket/src/foreign/libffi/src/raw_api.c rename to racket/src/bc/foreign/libffi/src/raw_api.c diff --git a/racket/src/foreign/libffi/src/s390/ffi.c b/racket/src/bc/foreign/libffi/src/s390/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/s390/ffi.c rename to racket/src/bc/foreign/libffi/src/s390/ffi.c diff --git a/racket/src/foreign/libffi/src/s390/ffitarget.h b/racket/src/bc/foreign/libffi/src/s390/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/s390/ffitarget.h rename to racket/src/bc/foreign/libffi/src/s390/ffitarget.h diff --git a/racket/src/foreign/libffi/src/s390/sysv.S b/racket/src/bc/foreign/libffi/src/s390/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/s390/sysv.S rename to racket/src/bc/foreign/libffi/src/s390/sysv.S diff --git a/racket/src/foreign/libffi/src/sh/ffi.c b/racket/src/bc/foreign/libffi/src/sh/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/sh/ffi.c rename to racket/src/bc/foreign/libffi/src/sh/ffi.c diff --git a/racket/src/foreign/libffi/src/sh/ffitarget.h b/racket/src/bc/foreign/libffi/src/sh/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/sh/ffitarget.h rename to racket/src/bc/foreign/libffi/src/sh/ffitarget.h diff --git a/racket/src/foreign/libffi/src/sh/sysv.S b/racket/src/bc/foreign/libffi/src/sh/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/sh/sysv.S rename to racket/src/bc/foreign/libffi/src/sh/sysv.S diff --git a/racket/src/foreign/libffi/src/sh64/ffi.c b/racket/src/bc/foreign/libffi/src/sh64/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/sh64/ffi.c rename to racket/src/bc/foreign/libffi/src/sh64/ffi.c diff --git a/racket/src/foreign/libffi/src/sh64/ffitarget.h b/racket/src/bc/foreign/libffi/src/sh64/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/sh64/ffitarget.h rename to racket/src/bc/foreign/libffi/src/sh64/ffitarget.h diff --git a/racket/src/foreign/libffi/src/sh64/sysv.S b/racket/src/bc/foreign/libffi/src/sh64/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/sh64/sysv.S rename to racket/src/bc/foreign/libffi/src/sh64/sysv.S diff --git a/racket/src/foreign/libffi/src/sparc/ffi.c b/racket/src/bc/foreign/libffi/src/sparc/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/sparc/ffi.c rename to racket/src/bc/foreign/libffi/src/sparc/ffi.c diff --git a/racket/src/foreign/libffi/src/sparc/ffitarget.h b/racket/src/bc/foreign/libffi/src/sparc/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/sparc/ffitarget.h rename to racket/src/bc/foreign/libffi/src/sparc/ffitarget.h diff --git a/racket/src/foreign/libffi/src/sparc/v8.S b/racket/src/bc/foreign/libffi/src/sparc/v8.S similarity index 100% rename from racket/src/foreign/libffi/src/sparc/v8.S rename to racket/src/bc/foreign/libffi/src/sparc/v8.S diff --git a/racket/src/foreign/libffi/src/sparc/v9.S b/racket/src/bc/foreign/libffi/src/sparc/v9.S similarity index 100% rename from racket/src/foreign/libffi/src/sparc/v9.S rename to racket/src/bc/foreign/libffi/src/sparc/v9.S diff --git a/racket/src/foreign/libffi/src/tile/ffi.c b/racket/src/bc/foreign/libffi/src/tile/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/tile/ffi.c rename to racket/src/bc/foreign/libffi/src/tile/ffi.c diff --git a/racket/src/foreign/libffi/src/tile/ffitarget.h b/racket/src/bc/foreign/libffi/src/tile/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/tile/ffitarget.h rename to racket/src/bc/foreign/libffi/src/tile/ffitarget.h diff --git a/racket/src/foreign/libffi/src/tile/tile.S b/racket/src/bc/foreign/libffi/src/tile/tile.S similarity index 100% rename from racket/src/foreign/libffi/src/tile/tile.S rename to racket/src/bc/foreign/libffi/src/tile/tile.S diff --git a/racket/src/foreign/libffi/src/types.c b/racket/src/bc/foreign/libffi/src/types.c similarity index 100% rename from racket/src/foreign/libffi/src/types.c rename to racket/src/bc/foreign/libffi/src/types.c diff --git a/racket/src/foreign/libffi/src/vax/elfbsd.S b/racket/src/bc/foreign/libffi/src/vax/elfbsd.S similarity index 100% rename from racket/src/foreign/libffi/src/vax/elfbsd.S rename to racket/src/bc/foreign/libffi/src/vax/elfbsd.S diff --git a/racket/src/foreign/libffi/src/vax/ffi.c b/racket/src/bc/foreign/libffi/src/vax/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/vax/ffi.c rename to racket/src/bc/foreign/libffi/src/vax/ffi.c diff --git a/racket/src/foreign/libffi/src/vax/ffitarget.h b/racket/src/bc/foreign/libffi/src/vax/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/vax/ffitarget.h rename to racket/src/bc/foreign/libffi/src/vax/ffitarget.h diff --git a/racket/src/foreign/libffi/src/x86/darwin.S b/racket/src/bc/foreign/libffi/src/x86/darwin.S similarity index 100% rename from racket/src/foreign/libffi/src/x86/darwin.S rename to racket/src/bc/foreign/libffi/src/x86/darwin.S diff --git a/racket/src/foreign/libffi/src/x86/darwin64.S b/racket/src/bc/foreign/libffi/src/x86/darwin64.S similarity index 100% rename from racket/src/foreign/libffi/src/x86/darwin64.S rename to racket/src/bc/foreign/libffi/src/x86/darwin64.S diff --git a/racket/src/foreign/libffi/src/x86/ffi.c b/racket/src/bc/foreign/libffi/src/x86/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/x86/ffi.c rename to racket/src/bc/foreign/libffi/src/x86/ffi.c diff --git a/racket/src/foreign/libffi/src/x86/ffi64.c b/racket/src/bc/foreign/libffi/src/x86/ffi64.c similarity index 100% rename from racket/src/foreign/libffi/src/x86/ffi64.c rename to racket/src/bc/foreign/libffi/src/x86/ffi64.c diff --git a/racket/src/foreign/libffi/src/x86/ffitarget.h b/racket/src/bc/foreign/libffi/src/x86/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/x86/ffitarget.h rename to racket/src/bc/foreign/libffi/src/x86/ffitarget.h diff --git a/racket/src/foreign/libffi/src/x86/freebsd.S b/racket/src/bc/foreign/libffi/src/x86/freebsd.S similarity index 100% rename from racket/src/foreign/libffi/src/x86/freebsd.S rename to racket/src/bc/foreign/libffi/src/x86/freebsd.S diff --git a/racket/src/foreign/libffi/src/x86/sysv.S b/racket/src/bc/foreign/libffi/src/x86/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/x86/sysv.S rename to racket/src/bc/foreign/libffi/src/x86/sysv.S diff --git a/racket/src/foreign/libffi/src/x86/unix64.S b/racket/src/bc/foreign/libffi/src/x86/unix64.S similarity index 100% rename from racket/src/foreign/libffi/src/x86/unix64.S rename to racket/src/bc/foreign/libffi/src/x86/unix64.S diff --git a/racket/src/foreign/libffi/src/x86/win32.S b/racket/src/bc/foreign/libffi/src/x86/win32.S similarity index 100% rename from racket/src/foreign/libffi/src/x86/win32.S rename to racket/src/bc/foreign/libffi/src/x86/win32.S diff --git a/racket/src/foreign/libffi/src/x86/win64.S b/racket/src/bc/foreign/libffi/src/x86/win64.S similarity index 100% rename from racket/src/foreign/libffi/src/x86/win64.S rename to racket/src/bc/foreign/libffi/src/x86/win64.S diff --git a/racket/src/foreign/libffi/src/xtensa/ffi.c b/racket/src/bc/foreign/libffi/src/xtensa/ffi.c similarity index 100% rename from racket/src/foreign/libffi/src/xtensa/ffi.c rename to racket/src/bc/foreign/libffi/src/xtensa/ffi.c diff --git a/racket/src/foreign/libffi/src/xtensa/ffitarget.h b/racket/src/bc/foreign/libffi/src/xtensa/ffitarget.h similarity index 100% rename from racket/src/foreign/libffi/src/xtensa/ffitarget.h rename to racket/src/bc/foreign/libffi/src/xtensa/ffitarget.h diff --git a/racket/src/foreign/libffi/src/xtensa/sysv.S b/racket/src/bc/foreign/libffi/src/xtensa/sysv.S similarity index 100% rename from racket/src/foreign/libffi/src/xtensa/sysv.S rename to racket/src/bc/foreign/libffi/src/xtensa/sysv.S diff --git a/racket/src/foreign/libffi/stamp-h.in b/racket/src/bc/foreign/libffi/stamp-h.in similarity index 100% rename from racket/src/foreign/libffi/stamp-h.in rename to racket/src/bc/foreign/libffi/stamp-h.in diff --git a/racket/src/foreign/libffi/testsuite/Makefile.am b/racket/src/bc/foreign/libffi/testsuite/Makefile.am similarity index 100% rename from racket/src/foreign/libffi/testsuite/Makefile.am rename to racket/src/bc/foreign/libffi/testsuite/Makefile.am diff --git a/racket/src/foreign/libffi/testsuite/Makefile.in b/racket/src/bc/foreign/libffi/testsuite/Makefile.in similarity index 100% rename from racket/src/foreign/libffi/testsuite/Makefile.in rename to racket/src/bc/foreign/libffi/testsuite/Makefile.in diff --git a/racket/src/foreign/libffi/testsuite/config/default.exp b/racket/src/bc/foreign/libffi/testsuite/config/default.exp similarity index 100% rename from racket/src/foreign/libffi/testsuite/config/default.exp rename to racket/src/bc/foreign/libffi/testsuite/config/default.exp diff --git a/racket/src/foreign/libffi/testsuite/lib/libffi.exp b/racket/src/bc/foreign/libffi/testsuite/lib/libffi.exp similarity index 100% rename from racket/src/foreign/libffi/testsuite/lib/libffi.exp rename to racket/src/bc/foreign/libffi/testsuite/lib/libffi.exp diff --git a/racket/src/foreign/libffi/testsuite/lib/target-libpath.exp b/racket/src/bc/foreign/libffi/testsuite/lib/target-libpath.exp similarity index 100% rename from racket/src/foreign/libffi/testsuite/lib/target-libpath.exp rename to racket/src/bc/foreign/libffi/testsuite/lib/target-libpath.exp diff --git a/racket/src/foreign/libffi/testsuite/lib/wrapper.exp b/racket/src/bc/foreign/libffi/testsuite/lib/wrapper.exp similarity index 100% rename from racket/src/foreign/libffi/testsuite/lib/wrapper.exp rename to racket/src/bc/foreign/libffi/testsuite/lib/wrapper.exp diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/call.exp b/racket/src/bc/foreign/libffi/testsuite/libffi.call/call.exp similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/call.exp rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/call.exp diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/closure_fn0.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn0.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/closure_fn0.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn0.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/closure_fn1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/closure_fn1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/closure_fn2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/closure_fn2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/closure_fn3.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn3.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/closure_fn3.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn3.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/closure_fn4.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn4.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/closure_fn4.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn4.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/closure_fn5.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn5.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/closure_fn5.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn5.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/closure_fn6.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn6.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/closure_fn6.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_fn6.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/closure_loc_fn0.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_loc_fn0.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/closure_loc_fn0.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_loc_fn0.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/closure_simple.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_simple.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/closure_simple.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/closure_simple.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_12byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_12byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_12byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_12byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_16byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_16byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_16byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_16byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_18byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_18byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_18byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_18byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_19byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_19byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_19byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_19byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_1_1byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_1_1byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_1_1byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_1_1byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_20byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_20byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_20byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_20byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_20byte1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_20byte1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_20byte1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_20byte1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_24byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_24byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_24byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_24byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_2byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_2byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_2byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_2byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_3_1byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_3_1byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_3_1byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_3_1byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_3byte1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_3byte1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_3byte1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_3byte1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_3byte2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_3byte2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_3byte2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_3byte2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_4_1byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_4_1byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_4_1byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_4_1byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_4byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_4byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_4byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_4byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_5_1_byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_5_1_byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_5_1_byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_5_1_byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_5byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_5byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_5byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_5byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_64byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_64byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_64byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_64byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_6_1_byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_6_1_byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_6_1_byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_6_1_byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_6byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_6byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_6byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_6byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_7_1_byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_7_1_byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_7_1_byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_7_1_byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_7byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_7byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_7byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_7byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_8byte.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_8byte.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_8byte.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_8byte.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_9byte1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_9byte1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_9byte1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_9byte1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_9byte2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_9byte2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_9byte2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_9byte2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_align_double.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_double.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_align_double.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_double.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_align_float.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_float.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_align_float.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_float.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_align_longdouble.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_longdouble.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_align_longdouble.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_longdouble.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_align_longdouble_split.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_longdouble_split.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_align_longdouble_split.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_longdouble_split.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_align_pointer.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_pointer.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_align_pointer.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_pointer.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_align_sint16.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_sint16.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_align_sint16.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_sint16.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_align_sint32.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_sint32.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_align_sint32.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_sint32.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_align_sint64.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_sint64.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_align_sint64.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_sint64.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_align_uint16.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_uint16.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_align_uint16.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_uint16.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_align_uint32.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_uint32.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_align_uint32.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_uint32.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_align_uint64.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_uint64.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_align_uint64.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_align_uint64.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_dbls_struct.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_dbls_struct.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_dbls_struct.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_dbls_struct.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_double.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_double.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_double.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_double.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_double_va.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_double_va.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_double_va.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_double_va.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_float.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_float.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_float.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_float.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_longdouble.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_longdouble.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_longdouble.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_longdouble.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_longdouble_va.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_longdouble_va.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_longdouble_va.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_longdouble_va.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_multi_schar.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_multi_schar.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_multi_schar.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_multi_schar.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_multi_sshort.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_multi_sshort.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_multi_sshort.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_multi_sshort.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_multi_sshortchar.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_multi_sshortchar.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_multi_sshortchar.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_multi_sshortchar.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_multi_uchar.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_multi_uchar.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_multi_uchar.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_multi_uchar.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_multi_ushort.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_multi_ushort.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_multi_ushort.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_multi_ushort.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_multi_ushortchar.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_multi_ushortchar.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_multi_ushortchar.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_multi_ushortchar.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_pointer.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_pointer.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_pointer.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_pointer.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_pointer_stack.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_pointer_stack.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_pointer_stack.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_pointer_stack.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_schar.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_schar.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_schar.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_schar.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_sint.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_sint.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_sint.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_sint.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_sshort.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_sshort.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_sshort.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_sshort.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_struct_va1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_struct_va1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_struct_va1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_struct_va1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_uchar.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_uchar.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_uchar.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_uchar.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_uchar_va.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_uchar_va.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_uchar_va.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_uchar_va.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_uint.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_uint.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_uint.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_uint.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_uint_va.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_uint_va.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_uint_va.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_uint_va.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_ulong_va.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_ulong_va.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_ulong_va.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_ulong_va.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_ulonglong.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_ulonglong.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_ulonglong.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_ulonglong.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_ushort.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_ushort.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_ushort.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_ushort.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/cls_ushort_va.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_ushort_va.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/cls_ushort_va.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/cls_ushort_va.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/err_bad_abi.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/err_bad_abi.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/err_bad_abi.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/err_bad_abi.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/err_bad_typedef.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/err_bad_typedef.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/err_bad_typedef.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/err_bad_typedef.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/ffitest.h b/racket/src/bc/foreign/libffi/testsuite/libffi.call/ffitest.h similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/ffitest.h rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/ffitest.h diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/float.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/float.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/float.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/float.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/float1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/float1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/float1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/float1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/float2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/float2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/float2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/float2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/float3.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/float3.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/float3.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/float3.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/float4.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/float4.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/float4.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/float4.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/float_va.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/float_va.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/float_va.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/float_va.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/huge_struct.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/huge_struct.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/huge_struct.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/huge_struct.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/many.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/many.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/many.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/many.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/many2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/many2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/many2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/many2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/negint.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/negint.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/negint.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/negint.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/nested_struct.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/nested_struct.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/nested_struct1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/nested_struct1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/nested_struct10.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct10.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/nested_struct10.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct10.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/nested_struct11.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct11.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/nested_struct11.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct11.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/nested_struct2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/nested_struct2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/nested_struct3.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct3.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/nested_struct3.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct3.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/nested_struct4.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct4.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/nested_struct4.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct4.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/nested_struct5.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct5.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/nested_struct5.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct5.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/nested_struct6.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct6.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/nested_struct6.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct6.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/nested_struct7.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct7.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/nested_struct7.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct7.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/nested_struct8.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct8.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/nested_struct8.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct8.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/nested_struct9.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct9.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/nested_struct9.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/nested_struct9.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/problem1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/problem1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/problem1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/problem1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/promotion.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/promotion.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/promotion.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/promotion.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/pyobjc-tc.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/pyobjc-tc.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/pyobjc-tc.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/pyobjc-tc.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_dbl.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_dbl.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_dbl.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_dbl.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_dbl1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_dbl1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_dbl1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_dbl1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_dbl2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_dbl2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_dbl2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_dbl2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_fl.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_fl.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_fl.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_fl.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_fl1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_fl1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_fl1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_fl1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_fl2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_fl2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_fl2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_fl2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_fl3.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_fl3.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_fl3.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_fl3.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_ldl.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_ldl.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_ldl.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_ldl.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_ll.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_ll.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_ll.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_ll.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_ll1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_ll1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_ll1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_ll1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_sc.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_sc.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_sc.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_sc.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_sl.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_sl.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_sl.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_sl.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_uc.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_uc.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_uc.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_uc.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/return_ul.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/return_ul.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/return_ul.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/return_ul.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/stret_large.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/stret_large.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/stret_large.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/stret_large.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/stret_large2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/stret_large2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/stret_large2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/stret_large2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/stret_medium.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/stret_medium.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/stret_medium.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/stret_medium.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/stret_medium2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/stret_medium2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/stret_medium2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/stret_medium2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/strlen.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/strlen.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/strlen.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/strlen.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/strlen2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/strlen2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/strlen2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/strlen2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/strlen3.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/strlen3.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/strlen3.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/strlen3.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/strlen4.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/strlen4.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/strlen4.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/strlen4.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/struct1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/struct1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/struct1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/struct1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/struct2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/struct2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/struct2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/struct2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/struct3.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/struct3.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/struct3.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/struct3.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/struct4.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/struct4.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/struct4.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/struct4.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/struct5.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/struct5.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/struct5.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/struct5.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/struct6.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/struct6.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/struct6.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/struct6.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/struct7.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/struct7.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/struct7.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/struct7.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/struct8.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/struct8.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/struct8.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/struct8.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/struct9.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/struct9.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/struct9.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/struct9.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/testclosure.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/testclosure.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/testclosure.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/testclosure.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/uninitialized.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/uninitialized.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/uninitialized.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/uninitialized.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/unwindtest.cc b/racket/src/bc/foreign/libffi/testsuite/libffi.call/unwindtest.cc similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/unwindtest.cc rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/unwindtest.cc diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/unwindtest_ffi_call.cc b/racket/src/bc/foreign/libffi/testsuite/libffi.call/unwindtest_ffi_call.cc similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/unwindtest_ffi_call.cc rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/unwindtest_ffi_call.cc diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/va_1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/va_1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/va_1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/va_1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/va_struct1.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/va_struct1.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/va_struct1.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/va_struct1.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/va_struct2.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/va_struct2.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/va_struct2.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/va_struct2.c diff --git a/racket/src/foreign/libffi/testsuite/libffi.call/va_struct3.c b/racket/src/bc/foreign/libffi/testsuite/libffi.call/va_struct3.c similarity index 100% rename from racket/src/foreign/libffi/testsuite/libffi.call/va_struct3.c rename to racket/src/bc/foreign/libffi/testsuite/libffi.call/va_struct3.c diff --git a/racket/src/foreign/libffi/texinfo.tex b/racket/src/bc/foreign/libffi/texinfo.tex similarity index 100% rename from racket/src/foreign/libffi/texinfo.tex rename to racket/src/bc/foreign/libffi/texinfo.tex diff --git a/racket/src/foreign/rktc-utils.rkt b/racket/src/bc/foreign/rktc-utils.rkt similarity index 100% rename from racket/src/foreign/rktc-utils.rkt rename to racket/src/bc/foreign/rktc-utils.rkt diff --git a/racket/src/racket/gc2/Makefile.in b/racket/src/bc/gc2/Makefile.in similarity index 97% rename from racket/src/racket/gc2/Makefile.in rename to racket/src/bc/gc2/Makefile.in index 7e0ee58b6f..34eded29dc 100644 --- a/racket/src/racket/gc2/Makefile.in +++ b/racket/src/bc/gc2/Makefile.in @@ -25,11 +25,11 @@ RANLIB = @RANLIB@ CFLAGS = @CFLAGS@ @COMPFLAGS@ @PROFFLAGS@ CPPFLAGS = @PREFLAGS@ RKTIO_INC = -I$(srcdir)/../../rktio -I../../rktio -ALL_CPPFLAGS = -I$(builddir)/.. -I$(srcdir)/../include $(RKTIO_INC) $(CPPFLAGS) @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@ +ALL_CPPFLAGS = -I$(builddir)/.. -I$(srcdir)/../include -I$(srcdir)/../../version $(RKTIO_INC) $(CPPFLAGS) @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@ ALL_CFLAGS = $(CFLAGS) $(ALL_CPPFLAGS) LIBS = @LIBS@ -LIBFFI_INCLUDE_ON = -I../../foreign/libffi/include +LIBFFI_INCLUDE_ON = -I../foreign/libffi/include LIBFFI_INCLUDE_OFF = ARLIBFLAGS = @LDFLAGS@ $(LIBS) @@ -187,7 +187,7 @@ xobjects: $(OBJS) main.@LTO@ # These headers have only preprocessor definitions, so they're not # picked up in ".sdep": -QUIET_DEPS = $(srcdir)/../src/schvers.h $(srcdir)/../sconfig.h ../mzconfig.h +QUIET_DEPS = $(srcdir)/../../version/racket_version.h $(srcdir)/../sconfig.h ../mzconfig.h XFORMDEP_NOPRE = $(srcdir)/xform-mod.rkt $(QUIET_DEPS) XFORMDEP = $(XFORMDEP_NOPRE) $(XSRCDIR)/precomp.h @@ -315,7 +315,7 @@ $(XSRCDIR)/validate.c: $(XFORMDEP) $(XSRCDIR)/vector.c: $(XFORMDEP) $(XFORM) $(XSRCDIR)/vector.c $(SRCDIR)/vector.c $(XSRCDIR)/foreign.c: $(XFORMDEP) - $(XFORM_SETUP) --cpp "$(CPP) $(ALL_CPPFLAGS) $(LIBFFI_INCLUDE_@OWN_LIBFFI@) -I${SRCDIR}/../../racket/src" @XFORMFLAGS@ -o ++out $(XSRCDIR)/foreign.c $(SRCDIR)/../../foreign/foreign.c + $(XFORM_SETUP) --cpp "$(CPP) $(ALL_CPPFLAGS) $(LIBFFI_INCLUDE_@OWN_LIBFFI@) -I${SRCDIR}/../src" @XFORMFLAGS@ -o ++out $(XSRCDIR)/foreign.c $(SRCDIR)/../foreign/foreign.c $(XSRCDIR)/main.c: $(XFORMDEP) $(XFORM_NOPRECOMP) $(XSRCDIR)/main.c $(DEF_C_DIRS) $(srcdir)/../main.c @@ -559,8 +559,8 @@ gc2.@LTO@: \ $(srcdir)/weak.c $(CC) $(ALL_CFLAGS) -I$(builddir)/.. -c $(srcdir)/gc2.c -o gc2.@LTO@ -FOREIGN_OBJS_ON = ../../foreign/libffi/src/*.@LTO@ ../../foreign/libffi/src/*/*.@LTO@ -FOREIGN_LIB_ON = ../../foreign/libffi/libffi@FOREIGN_CONVENIENCE@.la +FOREIGN_OBJS_ON = ../foreign/libffi/src/*.@LTO@ ../foreign/libffi/src/*/*.@LTO@ +FOREIGN_LIB_ON = ../foreign/libffi/libffi@FOREIGN_CONVENIENCE@.la FOREIGN_OBJS_OFF = FOREIGN_LIB_OFF = FOREIGN_OBJS = $(FOREIGN_OBJS_@OWN_LIBFFI@) diff --git a/racket/src/racket/gc2/README b/racket/src/bc/gc2/README similarity index 100% rename from racket/src/racket/gc2/README rename to racket/src/bc/gc2/README diff --git a/racket/src/racket/gc2/alloc_cache.c b/racket/src/bc/gc2/alloc_cache.c similarity index 100% rename from racket/src/racket/gc2/alloc_cache.c rename to racket/src/bc/gc2/alloc_cache.c diff --git a/racket/src/racket/gc2/backtrace.c b/racket/src/bc/gc2/backtrace.c similarity index 100% rename from racket/src/racket/gc2/backtrace.c rename to racket/src/bc/gc2/backtrace.c diff --git a/racket/src/racket/gc2/block_cache.c b/racket/src/bc/gc2/block_cache.c similarity index 100% rename from racket/src/racket/gc2/block_cache.c rename to racket/src/bc/gc2/block_cache.c diff --git a/racket/src/racket/gc2/check-sdep.rkt b/racket/src/bc/gc2/check-sdep.rkt similarity index 100% rename from racket/src/racket/gc2/check-sdep.rkt rename to racket/src/bc/gc2/check-sdep.rkt diff --git a/racket/src/racket/gc2/commongc_internal.h b/racket/src/bc/gc2/commongc_internal.h similarity index 100% rename from racket/src/racket/gc2/commongc_internal.h rename to racket/src/bc/gc2/commongc_internal.h diff --git a/racket/src/racket/gc2/fnls.c b/racket/src/bc/gc2/fnls.c similarity index 100% rename from racket/src/racket/gc2/fnls.c rename to racket/src/bc/gc2/fnls.c diff --git a/racket/src/racket/gc2/gc.h b/racket/src/bc/gc2/gc.h similarity index 100% rename from racket/src/racket/gc2/gc.h rename to racket/src/bc/gc2/gc.h diff --git a/racket/src/racket/gc2/gc2.c b/racket/src/bc/gc2/gc2.c similarity index 100% rename from racket/src/racket/gc2/gc2.c rename to racket/src/bc/gc2/gc2.c diff --git a/racket/src/racket/gc2/gc2.h b/racket/src/bc/gc2/gc2.h similarity index 100% rename from racket/src/racket/gc2/gc2.h rename to racket/src/bc/gc2/gc2.h diff --git a/racket/src/racket/gc2/gc2_dump.h b/racket/src/bc/gc2/gc2_dump.h similarity index 100% rename from racket/src/racket/gc2/gc2_dump.h rename to racket/src/bc/gc2/gc2_dump.h diff --git a/racket/src/racket/gc2/gc2_obj.h b/racket/src/bc/gc2/gc2_obj.h similarity index 100% rename from racket/src/racket/gc2/gc2_obj.h rename to racket/src/bc/gc2/gc2_obj.h diff --git a/racket/src/racket/gc2/gclist.h b/racket/src/bc/gc2/gclist.h similarity index 100% rename from racket/src/racket/gc2/gclist.h rename to racket/src/bc/gc2/gclist.h diff --git a/racket/src/racket/gc2/immobile_boxes.c b/racket/src/bc/gc2/immobile_boxes.c similarity index 100% rename from racket/src/racket/gc2/immobile_boxes.c rename to racket/src/bc/gc2/immobile_boxes.c diff --git a/racket/src/racket/gc2/mem_account.c b/racket/src/bc/gc2/mem_account.c similarity index 100% rename from racket/src/racket/gc2/mem_account.c rename to racket/src/bc/gc2/mem_account.c diff --git a/racket/src/racket/gc2/msgprint.c b/racket/src/bc/gc2/msgprint.c similarity index 100% rename from racket/src/racket/gc2/msgprint.c rename to racket/src/bc/gc2/msgprint.c diff --git a/racket/src/racket/gc2/my_qsort.c b/racket/src/bc/gc2/my_qsort.c similarity index 100% rename from racket/src/racket/gc2/my_qsort.c rename to racket/src/bc/gc2/my_qsort.c diff --git a/racket/src/racket/gc2/newgc.c b/racket/src/bc/gc2/newgc.c similarity index 100% rename from racket/src/racket/gc2/newgc.c rename to racket/src/bc/gc2/newgc.c diff --git a/racket/src/racket/gc2/newgc.h b/racket/src/bc/gc2/newgc.h similarity index 100% rename from racket/src/racket/gc2/newgc.h rename to racket/src/bc/gc2/newgc.h diff --git a/racket/src/racket/gc2/page_range.c b/racket/src/bc/gc2/page_range.c similarity index 100% rename from racket/src/racket/gc2/page_range.c rename to racket/src/bc/gc2/page_range.c diff --git a/racket/src/racket/gc2/places_gc.c b/racket/src/bc/gc2/places_gc.c similarity index 100% rename from racket/src/racket/gc2/places_gc.c rename to racket/src/bc/gc2/places_gc.c diff --git a/racket/src/racket/gc2/platforms.h b/racket/src/bc/gc2/platforms.h similarity index 100% rename from racket/src/racket/gc2/platforms.h rename to racket/src/bc/gc2/platforms.h diff --git a/racket/src/racket/gc2/precomp.c b/racket/src/bc/gc2/precomp.c similarity index 100% rename from racket/src/racket/gc2/precomp.c rename to racket/src/bc/gc2/precomp.c diff --git a/racket/src/racket/gc2/rlimit_heapsize.c b/racket/src/bc/gc2/rlimit_heapsize.c similarity index 100% rename from racket/src/racket/gc2/rlimit_heapsize.c rename to racket/src/bc/gc2/rlimit_heapsize.c diff --git a/racket/src/racket/gc2/roots.c b/racket/src/bc/gc2/roots.c similarity index 100% rename from racket/src/racket/gc2/roots.c rename to racket/src/bc/gc2/roots.c diff --git a/racket/src/racket/gc2/sighand.c b/racket/src/bc/gc2/sighand.c similarity index 100% rename from racket/src/racket/gc2/sighand.c rename to racket/src/bc/gc2/sighand.c diff --git a/racket/src/racket/gc2/stack_comp.c b/racket/src/bc/gc2/stack_comp.c similarity index 100% rename from racket/src/racket/gc2/stack_comp.c rename to racket/src/bc/gc2/stack_comp.c diff --git a/racket/src/racket/gc2/testing.c b/racket/src/bc/gc2/testing.c similarity index 100% rename from racket/src/racket/gc2/testing.c rename to racket/src/bc/gc2/testing.c diff --git a/racket/src/racket/gc2/var_stack.c b/racket/src/bc/gc2/var_stack.c similarity index 100% rename from racket/src/racket/gc2/var_stack.c rename to racket/src/bc/gc2/var_stack.c diff --git a/racket/src/racket/gc2/vm.c b/racket/src/bc/gc2/vm.c similarity index 100% rename from racket/src/racket/gc2/vm.c rename to racket/src/bc/gc2/vm.c diff --git a/racket/src/racket/gc2/vm_memalign.c b/racket/src/bc/gc2/vm_memalign.c similarity index 100% rename from racket/src/racket/gc2/vm_memalign.c rename to racket/src/bc/gc2/vm_memalign.c diff --git a/racket/src/racket/gc2/vm_mmap.c b/racket/src/bc/gc2/vm_mmap.c similarity index 100% rename from racket/src/racket/gc2/vm_mmap.c rename to racket/src/bc/gc2/vm_mmap.c diff --git a/racket/src/racket/gc2/vm_osk.c b/racket/src/bc/gc2/vm_osk.c similarity index 100% rename from racket/src/racket/gc2/vm_osk.c rename to racket/src/bc/gc2/vm_osk.c diff --git a/racket/src/racket/gc2/vm_osx.c b/racket/src/bc/gc2/vm_osx.c similarity index 100% rename from racket/src/racket/gc2/vm_osx.c rename to racket/src/bc/gc2/vm_osx.c diff --git a/racket/src/racket/gc2/vm_win.c b/racket/src/bc/gc2/vm_win.c similarity index 100% rename from racket/src/racket/gc2/vm_win.c rename to racket/src/bc/gc2/vm_win.c diff --git a/racket/src/racket/gc2/weak.c b/racket/src/bc/gc2/weak.c similarity index 100% rename from racket/src/racket/gc2/weak.c rename to racket/src/bc/gc2/weak.c diff --git a/racket/src/racket/gc2/xform-mod.rkt b/racket/src/bc/gc2/xform-mod.rkt similarity index 100% rename from racket/src/racket/gc2/xform-mod.rkt rename to racket/src/bc/gc2/xform-mod.rkt diff --git a/racket/src/gracket/Makefile.in b/racket/src/bc/gracket/Makefile.in similarity index 67% rename from racket/src/gracket/Makefile.in rename to racket/src/bc/gracket/Makefile.in index 9728c6d5bc..c95e1270f9 100644 --- a/racket/src/gracket/Makefile.in +++ b/racket/src/bc/gracket/Makefile.in @@ -18,20 +18,20 @@ collectsdir = @collectsdir@ builddir = @builddir@ # for version.mak: -mainsrcdir = @srcdir@/.. -@INCLUDEDEP@ @srcdir@/../racket/version.mak +mainsrcdir = @srcdir@/../.. +@INCLUDEDEP@ @srcdir@/../version.mak WXDIR = $(srcdir)/../wxxt -PLTSRCDIR = $(srcdir)/.. -PLTBUILDDIR = $(builddir)/.. +PLTSRCDIR = $(srcdir)/../.. +PLTBUILDDIR = $(builddir)/../.. NOOP = : # See ../Makefile about RUN_RACKET_, which # typically redirects to RUN_THIS_RACKET_: -RUN_THIS_RACKET_CGC = ../racket/racket@CGC@ -RUN_THIS_RACKET_MMM = ../racket/racket@MMM@ +RUN_THIS_RACKET_CGC = ../racket@CGC@ +RUN_THIS_RACKET_MMM = ../racket@MMM@ ########################### # Common Macros # @@ -48,8 +48,8 @@ GCDIRECTORY = @GCDIR@ WBUILD = @WBUILD@ WXVARIANT = @WXVARIANT@ -NOGCINC = $(WXINC) -I$(PLTBUILDDIR)/racket/ -I$(PLTSRCDIR)/racket/include/ -INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC) +NOGCINC = $(WXINC) -I$(PLTBUILDDIR)/bc/ -I$(PLTSRCDIR)/bc/include/ -I$(PLTSRCDIR)/version/ +INC = -I$(PLTSRCDIR)/bc/$(GCDIRECTORY) $(NOGCINC) CFLAGS = @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ CPPFLAGS = @PREFLAGS@ ALL_CFLAGS = $(INC) $(OPTIONS) -D$(WXVARIANT) $(CFLAGS) $(CPPFLAGS) @@ -59,26 +59,26 @@ ARLIBFLAGS = $(LDFLAGS) $(LDLIBS) GRACKETLINKER = @MZLINKER@ -LIBRKTIO = ../rktio/librktio.@LTA@ +LIBRKTIO = ../../rktio/librktio.@LTA@ LIBRKTIO_a = $(LIBRKTIO) LIBRKTIO_la = -GRACKETLDLIBS@NOT_MINGW@ = ../racket/libracket.@LIBSFX@ ../racket/libmzgc.@LIBSFX@ $(LIBRKTIO_@LIBSFX@) $(LDLIBS) -GRACKETLDLIBS@MINGW@ = ../racket/libracket.dll.a ../racket/libmzgc.dll.a $(LDLIBS) -ldelayimp -static-libgcc -GRACKETLDFLAGS = $(LDFLAGS) -L../racket +GRACKETLDLIBS@NOT_MINGW@ = ../libracket.@LIBSFX@ ../libmzgc.@LIBSFX@ $(LIBRKTIO_@LIBSFX@) $(LDLIBS) +GRACKETLDLIBS@MINGW@ = ../libracket.dll.a ../libmzgc.dll.a $(LDLIBS) -ldelayimp -static-libgcc +GRACKETLDFLAGS = $(LDFLAGS) -L.. GRACKETRES@NOT_MINGW@ = GRACKETRESDEP@NOT_MINGW@ = -GRACKETRES@MINGW@ = -mwindows gres.o ../racket/MemoryModule.@LTO@ -GRACKETRESDEP@MINGW@ = gres.o ../racket/MemoryModule.@LTO@ +GRACKETRES@MINGW@ = -mwindows gres.o ../MemoryModule.@LTO@ +GRACKETRESDEP@MINGW@ = gres.o ../MemoryModule.@LTO@ LOCALFLAGS_wx_xt = @WX_MMD_FLAG@ -LOCALFLAGS_wx_mac = -I$(srcdir)/../mac/racket -MMD -DWX_CARBON +LOCALFLAGS_wx_mac = -I$(srcdir)/../../mac/racket -MMD -DWX_CARBON LOCALFLAGS = $(LOCALFLAGS_@WXVARIANT@) GRACKETOBJECTS = grmain.@LTO@ -RACKETDEPS = ../racket/libracket.@LIBSFX@ ../racket/libmzgc.@LIBSFX@ +RACKETDEPS = ../libracket.@LIBSFX@ ../libmzgc.@LIBSFX@ MRSTATIC = MRSTATIC_STUB = @@ -89,7 +89,7 @@ LINKRESULT_wx_xt = gracket@CGC@@EXE_SUFFIX@ LINKRESULT_wx_mac = GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@ LINKRESULT = $(LINKRESULT_@WXVARIANT@) -SETUP_BOOT = -O "info@compiler/cm" -l- setup @BOOT_MODE@ $(srcdir)/../setup-go.rkt ../compiled +SETUP_BOOT = -O "info@compiler/cm" -l- setup @BOOT_MODE@ $(srcdir)/../../setup-go.rkt ../../compiled # Incremented each time the binaries change: DOWNLOAD_BIN_VERSION = 1 @@ -112,8 +112,8 @@ gracket@CGC@ : $(RACKETDEPS) grmain.@LTO@ $(GRACKETOBJECTS) $(MRSTATIC_STUB) $(G $(GRACKETLINKER) $(GRACKETLDFLAGS) $(MRSTATIC) -o gracket@CGC@ $(GRACKETOBJECTS) $(GRACKETRES) $(GRACKETLDLIBS) $(MRSTATIC_STUB) @POST_LINKER@ gracket@CGC@ -gres.o : $(srcdir)/../worksp/gracket/gracket.rc - @WINDRES@ -i $(srcdir)/../worksp/gracket/gracket.rc -o gres.o +gres.o : $(srcdir)/../../worksp/gracket/gracket.rc + @WINDRES@ -i $(srcdir)/../../worksp/gracket/gracket.rc -o gres.o resources@NOT_MINGW@ : $(NOOP) @@ -125,15 +125,15 @@ MRFW = Racket.framework/Versions/$(FWVERSION)/Racket MRAPPSKEL = GRacket@CGC@.app/Contents/Info.plist # Depending on MACLIBRKT_LINK_MODE, use Framework or statically link the framework's code: -MACLIBRKT_LINK_fw = -F../racket -framework Racket -MACLIBRKT_LINK_static = ../racket/libracket.@LIBSFX@ ../racket/libmzgc.@LIBSFX@ $(LIBRKTIO) $(LDLIBS) +MACLIBRKT_LINK_fw = -F.. -framework Racket +MACLIBRKT_LINK_static = ../libracket.@LIBSFX@ ../libmzgc.@LIBSFX@ $(LIBRKTIO) $(LDLIBS) GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@: $(MZFW) $(MRAPPSKEL) grmain.@LTO@ $(GRACKETLINKER) $(GRACKETLDFLAGS) -o GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@ grmain.@LTO@ -Wl,-headerpad_max_install_names $(MACLIBRKT_LINK_@MACLIBRKT_LINK_MODE@) -framework CoreFoundation @PROFFLAGS@ - /usr/bin/install_name_tool -change "Racket.framework/Versions/$(FWVERSION)/Racket" "@executable_path/../../../../racket/Racket.framework/Versions/$(FWVERSION)/Racket" GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@ + /usr/bin/install_name_tool -change "Racket.framework/Versions/$(FWVERSION)/Racket" "@executable_path/../../../../Racket.framework/Versions/$(FWVERSION)/Racket" GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@ -$(MRAPPSKEL): $(srcdir)/../mac/osx_appl.rkt $(srcdir)/../racket/src/schvers.h $(srcdir)/../mac/icon/GRacket.icns - env BUILDBASE=.. @RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) $(SETUP_BOOT) $(MRAPPSKEL) mrappskel.d $(srcdir)/../mac/osx_appl.rkt $(srcdir)/.. "@CGC@" +$(MRAPPSKEL): $(srcdir)/../../mac/osx_appl.rkt $(srcdir)/../../version/racket_version.h $(srcdir)/../../mac/icon/GRacket.icns + env BUILDBASE=../.. @RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) $(SETUP_BOOT) $(MRAPPSKEL) mrappskel.d $(srcdir)/../../mac/osx_appl.rkt $(srcdir)/../.. "@CGC@" @INCLUDEDEP@ mrappskel.d ee-app: gracket grmain_ee.@LTO@ @@ -148,13 +148,13 @@ solaris-static: linux-static: $(MAKE) gracket MRSTATIC=--static LDNONSTATICLIBS='-ldl' -DEF_COLLECTS_DIR = -DINITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../collects; @PWD@`"'"' -DEF_CONFIG_DIR = -DINITIAL_CONFIG_DIRECTORY='"'"`cd $(srcdir)/../..; @PWD@`/etc"'"' +DEF_COLLECTS_DIR = -DINITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../../collects; @PWD@`"'"' +DEF_CONFIG_DIR = -DINITIAL_CONFIG_DIRECTORY='"'"`cd $(srcdir)/../../..; @PWD@`/etc"'"' DEF_C_DIRS = $(DEF_COLLECTS_DIR) $(DEF_CONFIG_DIR) -grmain.@LTO@ : $(srcdir)/grmain.c $(srcdir)/../racket/main.c \ - $(srcdir)/../racket/cmdline.inc $(srcdir)/../racket/src/stypes.h \ - $(srcdir)/../racket/include/scheme.h +grmain.@LTO@ : $(srcdir)/grmain.c $(srcdir)/../main.c \ + $(srcdir)/../cmdline.inc $(srcdir)/../src/stypes.h \ + $(srcdir)/../include/scheme.h $(CC) $(LOCALFLAGS) $(ALL_CFLAGS) $(DEF_C_DIRS) -c $(srcdir)/grmain.c -o grmain.@LTO@ grmain_ee.@LTO@ : gracket.@LTO@ @@ -224,7 +224,7 @@ install-wx_xt-cgc: $(MAKE) @MRLIBINSTALL@-cgc-wx_xt cd ..; $(ICP) gracket/gracket@CGC@@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@CGC_INSTALLED@@EXE_SUFFIX@" cd ..; @STRIP_DEBUG@ "$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@CGC_INSTALLED@@EXE_SUFFIX@" - @RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../racket/collects-path.rkt" @DIRCVTPRE@"$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@CGC_INSTALLED@@EXE_SUFFIX@"@DIRCVTPOST@ @GUI_COLLECTS_PATH@ @GUI_CONFIG_PATH@ + @RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../collects-path.rkt" @DIRCVTPRE@"$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@CGC_INSTALLED@@EXE_SUFFIX@"@DIRCVTPOST@ @GUI_COLLECTS_PATH@ @GUI_CONFIG_PATH@ install-wx_xt-cgc-final: $(NOOP) @@ -239,7 +239,7 @@ install-wx_xt-3m: $(MAKE) @MRLIBINSTALL@-3m-wx_xt cd ..; $(ICP) gracket/gracket@MMM@@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@MMM_INSTALLED@@EXE_SUFFIX@" cd ..; @STRIP_DEBUG@ "$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@MMM_INSTALLED@@EXE_SUFFIX@" - @RUN_RACKET_MMM@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../racket/collects-path.rkt" @DIRCVTPRE@"$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@MMM_INSTALLED@@EXE_SUFFIX@"@DIRCVTPOST@ @GUI_COLLECTS_PATH@ @GUI_CONFIG_PATH@ + @RUN_RACKET_MMM@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../collects-path.rkt" @DIRCVTPRE@"$(DESTDIR)$(libpltdir)/$(GRACKET_NAME)@MMM_INSTALLED@@EXE_SUFFIX@"@DIRCVTPOST@ @GUI_COLLECTS_PATH@ @GUI_CONFIG_PATH@ install-wx_xt-3m-final: $(NOOP) @@ -259,9 +259,9 @@ install-wx_mac: install-wx_mac-cgc: cd ..; $(ICP) -r gracket/GRacket@CGC@.app $(DESTDIR)"$(libpltdir)/GRacket@CGC_CAP_INSTALLED@.app" - @RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) $(INSTALL_SETUP_BOOT) "$(srcdir)/../mac/rename-app.rkt" $(DESTDIR)"$(libpltdir)/GRacket@CGC_CAP_INSTALLED@.app" "GRacket@CGC@" "GRacket@CGC_CAP_INSTALLED@" - /usr/bin/install_name_tool -change "@executable_path/../../../../racket/Racket.framework/Versions/$(FWVERSION)/Racket" "@FRAMEWORK_PREFIX@Racket.framework/Versions/$(FWVERSION)/Racket" $(DESTDIR)"$(libpltdir)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" - @RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../racket/collects-path.rkt" $(DESTDIR)"$(libpltdir)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" @GR_APP_COLLECTS_PATH@ @GR_APP_CONFIG_PATH@ + @RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) $(INSTALL_SETUP_BOOT) "$(srcdir)/../../mac/rename-app.rkt" $(DESTDIR)"$(libpltdir)/GRacket@CGC_CAP_INSTALLED@.app" "GRacket@CGC@" "GRacket@CGC_CAP_INSTALLED@" + /usr/bin/install_name_tool -change "@executable_path/../../../../Racket.framework/Versions/$(FWVERSION)/Racket" "@FRAMEWORK_PREFIX@Racket.framework/Versions/$(FWVERSION)/Racket" $(DESTDIR)"$(libpltdir)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" + @RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../collects-path.rkt" $(DESTDIR)"$(libpltdir)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" @GR_APP_COLLECTS_PATH@ @GR_APP_CONFIG_PATH@ @STRIP_DEBUG@ $(DESTDIR)"$(libpltdir)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" install-wx_mac-cgc-final: @@ -269,9 +269,9 @@ install-wx_mac-cgc-final: install-wx_mac-3m: cd ..; $(ICP) -r "gracket/GRacket@MMM@.app" $(DESTDIR)"$(libpltdir)/GRacket@MMM_CAP_INSTALLED@.app" - @RUN_RACKET_MMM@ $(SELF_RACKET_FLAGS) $(INSTALL_SETUP_BOOT) "$(srcdir)/../mac/rename-app.rkt" $(DESTDIR)"$(libpltdir)/GRacket@MMM_CAP_INSTALLED@.app" "GRacket@MMM@" "GRacket@MMM_CAP_INSTALLED@" - /usr/bin/install_name_tool -change "@executable_path/../../../../racket/Racket.framework/Versions/$(FWVERSION)_3m/Racket" "@FRAMEWORK_PREFIX@Racket.framework/Versions/$(FWVERSION)_3m/Racket" $(DESTDIR)"$(libpltdir)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" - @RUN_RACKET_MMM@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../racket/collects-path.rkt" $(DESTDIR)"$(libpltdir)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" @GR_APP_COLLECTS_PATH@ @GR_APP_CONFIG_PATH@ + @RUN_RACKET_MMM@ $(SELF_RACKET_FLAGS) $(INSTALL_SETUP_BOOT) "$(srcdir)/../../mac/rename-app.rkt" $(DESTDIR)"$(libpltdir)/GRacket@MMM_CAP_INSTALLED@.app" "GRacket@MMM@" "GRacket@MMM_CAP_INSTALLED@" + /usr/bin/install_name_tool -change "@executable_path/../../../../Racket.framework/Versions/$(FWVERSION)_3m/Racket" "@FRAMEWORK_PREFIX@Racket.framework/Versions/$(FWVERSION)_3m/Racket" $(DESTDIR)"$(libpltdir)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" + @RUN_RACKET_MMM@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../collects-path.rkt" $(DESTDIR)"$(libpltdir)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" @GR_APP_COLLECTS_PATH@ @GR_APP_CONFIG_PATH@ @STRIP_DEBUG@ $(DESTDIR)"$(libpltdir)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" install-wx_mac-3m-final: diff --git a/racket/src/gracket/README b/racket/src/bc/gracket/README similarity index 100% rename from racket/src/gracket/README rename to racket/src/bc/gracket/README diff --git a/racket/src/gracket/gc2/Makefile.in b/racket/src/bc/gracket/gc2/Makefile.in similarity index 54% rename from racket/src/gracket/gc2/Makefile.in rename to racket/src/bc/gracket/gc2/Makefile.in index 3eb2888005..1722cfe74b 100644 --- a/racket/src/gracket/gc2/Makefile.in +++ b/racket/src/bc/gracket/gc2/Makefile.in @@ -13,11 +13,11 @@ sharepltdir = @sharepltdir@ collectsdir = @collectsdir@ # for version.mak: -mainsrcdir = @srcdir@/../.. -@INCLUDEDEP@ @srcdir@/../../racket/version.mak +mainsrcdir = @srcdir@/../../.. +@INCLUDEDEP@ @srcdir@/../../version.mak -PLTSRCDIR = $(srcdir)/../.. -PLTBUILDDIR = $(builddir)/../.. +PLTSRCDIR = $(srcdir)/../../.. +PLTBUILDDIR = $(builddir)/../../.. ########################### # Common Macros # @@ -34,8 +34,8 @@ GCDIRECTORY = @GCDIR@ WBUILD = @WBUILD@ WXVARIANT = @WXVARIANT@ -NOGCINC = -I$(PLTBUILDDIR)/racket/ -I$(PLTSRCDIR)/racket/include/ -INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC) +NOGCINC = -I$(PLTBUILDDIR)/bc/ -I$(PLTSRCDIR)/bc/include/ -I$(PLTSRCDIR)/version +INC = -I$(PLTSRCDIR)/bc/$(GCDIRECTORY) $(NOGCINC) CFLAGS = @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ CPPFLAGS = @PREFLAGS@ ALL_CFLAGS = $(INC) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ $(CFLAGS) $(CPPFLAGS) @@ -50,24 +50,24 @@ XFORM_INC_wx_mac = -Dwx_mac -DOS_X -MMD -DWX_CARBON # See ../../Makefile about RUN_RACKET_MMM, which # typically redirects to RUN_THIS_RACKET_MMM: -RUN_THIS_RACKET_MMM = ../../racket/racket@MMM@ +RUN_THIS_RACKET_MMM = ../../racket@MMM@ MZMMM_wx_xt = @RUN_RACKET_MMM@ MZMMM_wx_mac = @RUN_RACKET_MMM@ MZMMM = $(MZMMM_@WXVARIANT@) -SETUP_BOOT = -O "info@compiler/cm error" -l- setup @BOOT_MODE@ $(srcdir)/../../setup-go.rkt ../../compiled +SETUP_BOOT = -O "info@compiler/cm error" -l- setup @BOOT_MODE@ $(srcdir)/../../../setup-go.rkt ../../../compiled -XFORM_CMD = $(MZMMM) $(SELF_RACKET_FLAGS) $(SETUP_BOOT) --tag ++out $(srcdir)/../../racket/gc2/xform-mod.rkt -XFORM_CPP_ARGS = -I$(srcdir)/../../racket/gc2 $(NOGCINC) $(OPTIONS) @PREFLAGS@ $(XFORM_INC_@WXVARIANT@) +XFORM_CMD = $(MZMMM) $(SELF_RACKET_FLAGS) $(SETUP_BOOT) --tag ++out $(srcdir)/../../gc2/xform-mod.rkt +XFORM_CPP_ARGS = -I$(srcdir)/../../gc2 $(NOGCINC) $(OPTIONS) @PREFLAGS@ $(XFORM_INC_@WXVARIANT@) XFORM = $(XFORM_CMD) --cpp "$(CPP) $(XFORM_CPP_ARGS)" @XFORMFLAGS@ -o ++out -XFORMDEP = $(srcdir)/../../racket/gc2/xform-mod.rkt $(srcdir)/../../racket/gc2/gc2.h +XFORMDEP = $(srcdir)/../../gc2/xform-mod.rkt $(srcdir)/../../gc2/gc2.h GRACKETLDFLAGS = $(LDFLAGS) -L../../racket -DEF_COLLECTS_DIR = +D INITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../../collects; @PWD@`"'"' -DEF_CONFIG_DIR = +D INITIAL_CONFIG_DIRECTORY='"'"`cd $(srcdir)/../../..; @PWD@`/etc"'"' +DEF_COLLECTS_DIR = +D INITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../../../collects; @PWD@`"'"' +DEF_CONFIG_DIR = +D INITIAL_CONFIG_DIRECTORY='"'"`cd $(srcdir)/../../../..; @PWD@`/etc"'"' DEF_C_DIRS = $(DEF_COLLECTS_DIR) $(DEF_CONFIG_DIR) XFORMWP = $(XFORM) @@ -76,7 +76,7 @@ xsrc/grmain.c: $(srcdir)/../grmain.c $(XFORMDEP) $(XFORMWP) xsrc/grmain.c $(DEF_C_DIRS) $(srcdir)/../grmain.c @INCLUDEDEP@ grmain.d -GCPREINC = -include $(srcdir)/../../racket/gc2/gc2.h +GCPREINC = -include $(srcdir)/../../gc2/gc2.h POSTFLAGS = $(OPTIONS) wx_xt_EXTRAFLAGS = @@ -93,7 +93,7 @@ wx_mac_LIBS = -framework CoreFoundation GRACKETLINKER = @MZLINKER@ -LIBRKTIO = ../../rktio/librktio.@LTA@ +LIBRKTIO = ../../../rktio/librktio.@LTA@ LIBRKTIO_a = $(LIBRKTO) LIBRKTIO_la = @@ -102,29 +102,29 @@ GRACKETLIBS_la = GRACKETMZOBJS_a = $(MZOBJS) $(LIBRKTIO) GRACKETMZOBJS_la = -../gracket@MMM@@NOT_OSX@@NOT_MINGW@: grmain.@LTO@ ../../racket/libracket3m.@LIBSFX@ $(LIBRKTIO_@LIBSFX@) - $(GRACKETLINKER) $(GRACKETLDFLAGS) -o ../gracket@MMM@ grmain.@LTO@ ../../racket/libracket3m.@LIBSFX@ $(GRACKETMZOBJS_@LIBSFX@) $(GRACKETLIBS_@LIBSFX@) +../gracket@MMM@@NOT_OSX@@NOT_MINGW@: grmain.@LTO@ ../../libracket3m.@LIBSFX@ $(LIBRKTIO_@LIBSFX@) + $(GRACKETLINKER) $(GRACKETLDFLAGS) -o ../gracket@MMM@ grmain.@LTO@ ../../libracket3m.@LIBSFX@ $(GRACKETMZOBJS_@LIBSFX@) $(GRACKETLIBS_@LIBSFX@) @POST_LINKER@ ../gracket@MMM@ -../gracket@MMM@@EXE_SUFFIX@@MINGW@: grmain.@LTO@ ../../racket/MemoryModule.@LTO@ ../../racket/gc2/libracket3m.dll.a ../gres.o - $(GRACKETLINKER) -mwindows $(GRACKETLDFLAGS) -o ../gracket@MMM@@EXE_SUFFIX@ grmain.@LTO@ ../../racket/MemoryModule.@LTO@ ../gres.o ../../racket/gc2/libracket3m.dll.a $(GRACKETMZOBJS_@LIBSFX@) $(GRACKETLIBS_@LIBSFX@) -l delayimp -static-libgcc +../gracket@MMM@@EXE_SUFFIX@@MINGW@: grmain.@LTO@ ../../MemoryModule.@LTO@ ../../gc2/libracket3m.dll.a ../gres.o + $(GRACKETLINKER) -mwindows $(GRACKETLDFLAGS) -o ../gracket@MMM@@EXE_SUFFIX@ grmain.@LTO@ ../../MemoryModule.@LTO@ ../gres.o ../../gc2/libracket3m.dll.a $(GRACKETMZOBJS_@LIBSFX@) $(GRACKETLIBS_@LIBSFX@) -l delayimp -static-libgcc -MZFW = ../../racket/Racket.framework/Versions/$(FWVERSION)_3m/Racket +MZFW = ../../Racket.framework/Versions/$(FWVERSION)_3m/Racket MRAPPSKEL = ../GRacket@MMM@.app/Contents/Info.plist # Depending on MACLIBRKT_LINK_MODE, use Framework or statically link the framework's code: -MACLIBRKT_LINK_fw = -F../../racket/gc2 -framework Racket -MACLIBRKT_LINK_static = ../../racket/libracket3m.@LIBSFX@ $(LIBRKTIO) $(LDLIBS) +MACLIBRKT_LINK_fw = -F../../gc2 -framework Racket +MACLIBRKT_LINK_static = ../../libracket3m.@LIBSFX@ $(LIBRKTIO) $(LDLIBS) ../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@: $(MRAPPSKEL) $(MZFW) grmain.@LTO@ $(GRACKETLINKER) $(LDFLAGS) -o ../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@ grmain.@LTO@ -Wl,-headerpad_max_install_names $(MACLIBRKT_LINK_@MACLIBRKT_LINK_MODE@) -framework CoreFoundation - /usr/bin/install_name_tool -change "Racket.framework/Versions/$(FWVERSION)_3m/Racket" "@executable_path/../../../../racket/Racket.framework/Versions/$(FWVERSION)_3m/Racket" "../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@" + /usr/bin/install_name_tool -change "Racket.framework/Versions/$(FWVERSION)_3m/Racket" "@executable_path/../../../../Racket.framework/Versions/$(FWVERSION)_3m/Racket" "../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@" -$(MRFW) : $(XOBJS) $(@WXVARIANT@_PLAIN_OBJS) ../../racket/libracket3m.@LIBSFX@ wx_font.o wx_file_dialog.o $(MRFWRES) - $(GRACKETLINKER) $(LDFLAGS) -dynamiclib -o $(MRFW) -Wl,-headerpad_max_install_names $(XOBJS) $(@WXVARIANT@_PLAIN_OBJS) ../../racket/libracket3m.@LIBSFX@ $(@WXVARIANT@_LIBS) @X_EXTRA_LIBS@ wx_font.o wx_file_dialog.o +$(MRFW) : $(XOBJS) $(@WXVARIANT@_PLAIN_OBJS) ../../libracket3m.@LIBSFX@ wx_font.o wx_file_dialog.o $(MRFWRES) + $(GRACKETLINKER) $(LDFLAGS) -dynamiclib -o $(MRFW) -Wl,-headerpad_max_install_names $(XOBJS) $(@WXVARIANT@_PLAIN_OBJS) ../../libracket3m.@LIBSFX@ $(@WXVARIANT@_LIBS) @X_EXTRA_LIBS@ wx_font.o wx_file_dialog.o -$(MRAPPSKEL): $(srcdir)/../../mac/osx_appl.rkt $(srcdir)/../../racket/src/schvers.h $(srcdir)/../../mac/icon/GRacket.icns - env BUILDBASE=../.. BUILDING_3M=yes @RUN_RACKET_MMM@ $(SELF_RACKET_FLAGS) $(SETUP_BOOT) $(MRAPPSKEL) mrappskel.d $(srcdir)/../../mac/osx_appl.rkt $(srcdir)/../.. "@MMM@" +$(MRAPPSKEL): $(srcdir)/../../../mac/osx_appl.rkt $(srcdir)/../../../version/racket_version.h $(srcdir)/../../../mac/icon/GRacket.icns + env BUILDBASE=../../.. BUILDING_3M=yes @RUN_RACKET_MMM@ $(SELF_RACKET_FLAGS) $(SETUP_BOOT) $(MRAPPSKEL) mrappskel.d $(srcdir)/../../../mac/osx_appl.rkt $(srcdir)/../../.. "@MMM@" @INCLUDEDEP@ mrappskel.d ../gracket@MMM@@OSX@ : @@ -141,19 +141,19 @@ xsrc: ######################################## GRMAIN_DEPS = $(srcdir)/../grmain.c \ - $(srcdir)/../../racket/main.c \ - $(srcdir)/../../racket/include/scheme.h \ - $(srcdir)/../../racket/include/../sconfig.h \ - ../../racket/mzconfig.h \ - $(srcdir)/../../racket/include/../uconfig.h \ - $(srcdir)/../../racket/include/../src/stypes.h \ - $(srcdir)/../../racket/include/../gc2/gc2_obj.h \ - $(srcdir)/../../racket/include/schthread.h \ - $(srcdir)/../../racket/include/../src/schexn.h \ - $(srcdir)/../../racket/include/../gc2/gc2.h \ - $(srcdir)/../../racket/include/../gc2/../include/schthread.h \ - $(srcdir)/../../racket/include/../src/schemef.h \ - $(srcdir)/../../racket/cmdline.inc + $(srcdir)/../../main.c \ + $(srcdir)/../../include/scheme.h \ + $(srcdir)/../../include/../sconfig.h \ + ../../mzconfig.h \ + $(srcdir)/../../include/../uconfig.h \ + $(srcdir)/../../include/../src/stypes.h \ + $(srcdir)/../../include/../gc2/gc2_obj.h \ + $(srcdir)/../../include/schthread.h \ + $(srcdir)/../../include/../src/schexn.h \ + $(srcdir)/../../include/../gc2/gc2.h \ + $(srcdir)/../../include/../gc2/../include/schthread.h \ + $(srcdir)/../../include/../src/schemef.h \ + $(srcdir)/../../cmdline.inc xsrc/grmain.c: $(GRMAIN_DEPS) diff --git a/racket/src/gracket/grmain.c b/racket/src/bc/gracket/grmain.c similarity index 97% rename from racket/src/gracket/grmain.c rename to racket/src/bc/gracket/grmain.c index 0278a613a5..75406cf46e 100644 --- a/racket/src/gracket/grmain.c +++ b/racket/src/bc/gracket/grmain.c @@ -51,7 +51,7 @@ static void pre_filter_cmdline_arguments(int *argc, char ***argv); # define INITIAL_CONFIG_DIRECTORY "../etc" #endif -# include "../racket/main.c" +# include "../main.c" /***********************************************************************/ /* Win32 handling */ @@ -63,7 +63,7 @@ static void pre_filter_cmdline_arguments(int *argc, char ***argv); START_XFORM_SKIP; # endif -# include "../start/win_single.inc" +# include "../../start/win_single.inc" static void pre_filter_cmdline_arguments(int *argc, char ***argv) { @@ -156,4 +156,4 @@ END_XFORM_SKIP; #endif -#include "../start/gui_filter.inc" +#include "../../start/gui_filter.inc" diff --git a/racket/src/racket/include/cgc2.h b/racket/src/bc/include/cgc2.h similarity index 100% rename from racket/src/racket/include/cgc2.h rename to racket/src/bc/include/cgc2.h diff --git a/racket/src/racket/include/escheme.h b/racket/src/bc/include/escheme.h similarity index 100% rename from racket/src/racket/include/escheme.h rename to racket/src/bc/include/escheme.h diff --git a/racket/src/racket/include/ext.exp b/racket/src/bc/include/ext.exp similarity index 100% rename from racket/src/racket/include/ext.exp rename to racket/src/bc/include/ext.exp diff --git a/racket/src/racket/include/gmzwin.def b/racket/src/bc/include/gmzwin.def similarity index 100% rename from racket/src/racket/include/gmzwin.def rename to racket/src/bc/include/gmzwin.def diff --git a/racket/src/racket/include/mzscheme.exp b/racket/src/bc/include/mzscheme.exp similarity index 100% rename from racket/src/racket/include/mzscheme.exp rename to racket/src/bc/include/mzscheme.exp diff --git a/racket/src/racket/include/mzscheme3m.exp b/racket/src/bc/include/mzscheme3m.exp similarity index 100% rename from racket/src/racket/include/mzscheme3m.exp rename to racket/src/bc/include/mzscheme3m.exp diff --git a/racket/src/racket/include/mzwin.def b/racket/src/bc/include/mzwin.def similarity index 100% rename from racket/src/racket/include/mzwin.def rename to racket/src/bc/include/mzwin.def diff --git a/racket/src/racket/include/mzwin3m.def b/racket/src/bc/include/mzwin3m.def similarity index 100% rename from racket/src/racket/include/mzwin3m.def rename to racket/src/bc/include/mzwin3m.def diff --git a/racket/src/racket/include/racket.exp b/racket/src/bc/include/racket.exp similarity index 100% rename from racket/src/racket/include/racket.exp rename to racket/src/bc/include/racket.exp diff --git a/racket/src/racket/include/racket3m.exp b/racket/src/bc/include/racket3m.exp similarity index 100% rename from racket/src/racket/include/racket3m.exp rename to racket/src/bc/include/racket3m.exp diff --git a/racket/src/racket/include/scheme.h b/racket/src/bc/include/scheme.h similarity index 100% rename from racket/src/racket/include/scheme.h rename to racket/src/bc/include/scheme.h diff --git a/racket/src/racket/include/schthread.h b/racket/src/bc/include/schthread.h similarity index 100% rename from racket/src/racket/include/schthread.h rename to racket/src/bc/include/schthread.h diff --git a/racket/src/racket/main.c b/racket/src/bc/main.c similarity index 100% rename from racket/src/racket/main.c rename to racket/src/bc/main.c diff --git a/racket/src/racket/mk-gdbinit.rkt b/racket/src/bc/mk-gdbinit.rkt similarity index 100% rename from racket/src/racket/mk-gdbinit.rkt rename to racket/src/bc/mk-gdbinit.rkt diff --git a/racket/src/racket/mkincludes.rkt b/racket/src/bc/mkincludes.rkt similarity index 95% rename from racket/src/racket/mkincludes.rkt rename to racket/src/bc/mkincludes.rkt index dc08f8628d..30c6796bad 100644 --- a/racket/src/racket/mkincludes.rkt +++ b/racket/src/bc/mkincludes.rkt @@ -62,7 +62,8 @@ "#define INCLUDE_WITHOUT_PATHS")) (copy-if-newer mzsrcdir "include/schthread.h") (copy-if-newer mzsrcdir "src/schemef.h") - (copy-if-newer mzsrcdir "src/schvers.h") + (copy-if-newer mzsrcdir "../version/racket_version.h") + (copy-if-newer mzsrcdir "../version/racket_version.h" "schvers.h") ; for compatibility (copy-if-newer mzsrcdir "src/stypes.h") (copy-if-newer mzsrcdir "src/schemex.h") (copy-if-newer mzsrcdir "src/schemexm.h") diff --git a/racket/src/racket/mksystem.rkt b/racket/src/bc/mksystem.rkt similarity index 100% rename from racket/src/racket/mksystem.rkt rename to racket/src/bc/mksystem.rkt diff --git a/racket/src/racket/mzconfig.h.in b/racket/src/bc/mzconfig.h.in similarity index 100% rename from racket/src/racket/mzconfig.h.in rename to racket/src/bc/mzconfig.h.in diff --git a/racket/src/racket/sconfig.h b/racket/src/bc/sconfig.h similarity index 100% rename from racket/src/racket/sconfig.h rename to racket/src/bc/sconfig.h diff --git a/racket/src/racket/sgc/Makefile.in b/racket/src/bc/sgc/Makefile.in similarity index 100% rename from racket/src/racket/sgc/Makefile.in rename to racket/src/bc/sgc/Makefile.in diff --git a/racket/src/racket/sgc/README b/racket/src/bc/sgc/README similarity index 100% rename from racket/src/racket/sgc/README rename to racket/src/bc/sgc/README diff --git a/racket/src/racket/sgc/autostat.inc b/racket/src/bc/sgc/autostat.inc similarity index 100% rename from racket/src/racket/sgc/autostat.inc rename to racket/src/bc/sgc/autostat.inc diff --git a/racket/src/racket/sgc/checkreg b/racket/src/bc/sgc/checkreg similarity index 100% rename from racket/src/racket/sgc/checkreg rename to racket/src/bc/sgc/checkreg diff --git a/racket/src/racket/sgc/collect.inc b/racket/src/bc/sgc/collect.inc similarity index 100% rename from racket/src/racket/sgc/collect.inc rename to racket/src/bc/sgc/collect.inc diff --git a/racket/src/racket/sgc/gc.h b/racket/src/bc/sgc/gc.h similarity index 100% rename from racket/src/racket/sgc/gc.h rename to racket/src/bc/sgc/gc.h diff --git a/racket/src/racket/sgc/sgc.c b/racket/src/bc/sgc/sgc.c similarity index 100% rename from racket/src/racket/sgc/sgc.c rename to racket/src/bc/sgc/sgc.c diff --git a/racket/src/racket/sgc/sgc.h b/racket/src/bc/sgc/sgc.h similarity index 100% rename from racket/src/racket/sgc/sgc.h rename to racket/src/bc/sgc/sgc.h diff --git a/racket/src/racket/sgc/sgcdiff b/racket/src/bc/sgc/sgcdiff similarity index 100% rename from racket/src/racket/sgc/sgcdiff rename to racket/src/bc/sgc/sgcdiff diff --git a/racket/src/racket/sgc/test.c b/racket/src/bc/sgc/test.c similarity index 100% rename from racket/src/racket/sgc/test.c rename to racket/src/bc/sgc/test.c diff --git a/racket/src/racket/src/Makefile.in b/racket/src/bc/src/Makefile.in similarity index 96% rename from racket/src/racket/src/Makefile.in rename to racket/src/bc/src/Makefile.in index b0c71f931c..1bd2d72317 100644 --- a/racket/src/racket/src/Makefile.in +++ b/racket/src/bc/src/Makefile.in @@ -12,7 +12,7 @@ MZSRC = $(srcdir) CFLAGS = @CFLAGS@ @COMPFLAGS@ @PROFFLAGS@ CPPFLAGS = @PREFLAGS@ RKTIO_INC = -I$(srcdir)/../../rktio -I../../rktio -ALL_CFLAGS = $(CFLAGS) -I$(builddir)/.. -I$(srcdir)/../include $(RKTIO_INC) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ +ALL_CFLAGS = $(CFLAGS) -I$(builddir)/.. -I$(srcdir)/../include -I$(srcdir)/../../version $(RKTIO_INC) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ LTO=@LTO@ # Need for replacement of EXTRA_GMP_OBJ which carries the variable OBJS = salloc.@LTO@ \ @@ -349,7 +349,7 @@ complex.@LTO@: $(COMMON_HEADERS) \ $(srcdir)/stypes.h dynext.@LTO@: $(COMMON_HEADERS) \ $(srcdir)/stypes.h $(srcdir)/schemef.h \ - $(srcdir)/schvers.h + $(srcdir)/../../version/racket_version.h env.@LTO@: $(COMMON_HEADERS) \ $(srcdir)/stypes.h $(srcdir)/schminc.h $(srcdir)/mzmark_env.inc error.@LTO@: $(COMMON_HEADERS) \ @@ -405,17 +405,17 @@ place.@LTO@: $(COMMON_HEADERS) $(RKTIO_HEADERS) \ $(srcdir)/stypes.h $(srcdir)/mzmark_place.inc port.@LTO@: $(COMMON_HEADERS) $(RKTIO_HEADERS) \ $(srcdir)/stypes.h $(srcdir)/mzmark_port.inc -portfun.@LTO@: $(COMMON_HEADERS) $(RKTIO_HEADERS) $(srcdir)/schvers.h \ +portfun.@LTO@: $(COMMON_HEADERS) $(RKTIO_HEADERS) $(srcdir)/../../version/racket_version.h \ $(srcdir)/stypes.h $(srcdir)/mzmark_portfun.inc print.@LTO@: $(COMMON_HEADERS) $(srcdir)/stypes.h $(srcdir)/schcpt.h \ - $(srcdir)/schvers.h $(SCONFIG) $(srcdir)/mzmark_print.inc \ + $(srcdir)/../../version/racket_version.h $(SCONFIG) $(srcdir)/mzmark_print.inc \ $(srcdir)/print_vector.inc thread.@LTO@: $(COMMON_HEADERS) $(RKTIO_HEADERS) \ $(srcdir)/stypes.h $(srcdir)/mzmark_thread.inc rational.@LTO@: $(COMMON_HEADERS) \ $(srcdir)/stypes.h read.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/schcpt.h $(srcdir)/schvers.h $(srcdir)/schminc.h \ + $(srcdir)/schcpt.h $(srcdir)/../../version/racket_version.h $(srcdir)/schminc.h \ $(srcdir)/stypes.h $(srcdir)/mzmark_read.inc regexp.@LTO@: $(COMMON_HEADERS) \ $(srcdir)/stypes.h $(srcdir)/mzmark_regexp.inc $(srcdir)/schrx.h @@ -427,11 +427,11 @@ sfs.@LTO@: $(COMMON_HEADERS) \ $(srcdir)/stypes.h $(srcdir)/mzmark_sfs.inc sort.@LTO@: $(COMMON_HEADERS) \ $(srcdir)/stypes.h -startup.@LTO@: $(COMMON_HEADERS) $(srcdir)/schvers.h \ +startup.@LTO@: $(COMMON_HEADERS) $(srcdir)/../../version/racket_version.h \ $(srcdir)/stypes.h $(srcdir)/schminc.h $(srcdir)/startup.inc ../cstartup.inc \ $(srcdir)/startup-glue.inc string.@LTO@: $(COMMON_HEADERS) $(RKTIO_HEADERS) \ - $(srcdir)/stypes.h $(srcdir)/schvers.h $(srcdir)/mzmark_string.inc $(srcdir)/strops.inc \ + $(srcdir)/stypes.h $(srcdir)/../../version/racket_version.h $(srcdir)/mzmark_string.inc $(srcdir)/strops.inc \ $(srcdir)/schustr.inc $(srcdir)/systype.inc struct.@LTO@: $(COMMON_HEADERS) \ $(srcdir)/stypes.h $(srcdir)/mzmark_struct.inc diff --git a/racket/src/racket/src/bgnfloat.inc b/racket/src/bc/src/bgnfloat.inc similarity index 100% rename from racket/src/racket/src/bgnfloat.inc rename to racket/src/bc/src/bgnfloat.inc diff --git a/racket/src/racket/src/bignum.c b/racket/src/bc/src/bignum.c similarity index 100% rename from racket/src/racket/src/bignum.c rename to racket/src/bc/src/bignum.c diff --git a/racket/src/racket/src/bool.c b/racket/src/bc/src/bool.c similarity index 100% rename from racket/src/racket/src/bool.c rename to racket/src/bc/src/bool.c diff --git a/racket/src/racket/src/char.c b/racket/src/bc/src/char.c similarity index 100% rename from racket/src/racket/src/char.c rename to racket/src/bc/src/char.c diff --git a/racket/src/racket/src/cify-check.rkt b/racket/src/bc/src/cify-check.rkt similarity index 100% rename from racket/src/racket/src/cify-check.rkt rename to racket/src/bc/src/cify-check.rkt diff --git a/racket/src/racket/src/cify-startup.rkt b/racket/src/bc/src/cify-startup.rkt similarity index 100% rename from racket/src/racket/src/cify-startup.rkt rename to racket/src/bc/src/cify-startup.rkt diff --git a/racket/src/racket/src/codetab.inc b/racket/src/bc/src/codetab.inc similarity index 100% rename from racket/src/racket/src/codetab.inc rename to racket/src/bc/src/codetab.inc diff --git a/racket/src/racket/src/compenv.c b/racket/src/bc/src/compenv.c similarity index 100% rename from racket/src/racket/src/compenv.c rename to racket/src/bc/src/compenv.c diff --git a/racket/src/racket/src/compile-startup.rkt b/racket/src/bc/src/compile-startup.rkt similarity index 100% rename from racket/src/racket/src/compile-startup.rkt rename to racket/src/bc/src/compile-startup.rkt diff --git a/racket/src/racket/src/compile.c b/racket/src/bc/src/compile.c similarity index 100% rename from racket/src/racket/src/compile.c rename to racket/src/bc/src/compile.c diff --git a/racket/src/racket/src/complex.c b/racket/src/bc/src/complex.c similarity index 100% rename from racket/src/racket/src/complex.c rename to racket/src/bc/src/complex.c diff --git a/racket/src/racket/src/dlcompat.inc b/racket/src/bc/src/dlcompat.inc similarity index 100% rename from racket/src/racket/src/dlcompat.inc rename to racket/src/bc/src/dlcompat.inc diff --git a/racket/src/racket/src/dynext.c b/racket/src/bc/src/dynext.c similarity index 99% rename from racket/src/racket/src/dynext.c rename to racket/src/bc/src/dynext.c index 6ebcbe4caf..1830471deb 100644 --- a/racket/src/racket/src/dynext.c +++ b/racket/src/bc/src/dynext.c @@ -4,7 +4,7 @@ #endif #include "schpriv.h" -#include "schvers.h" +#include "racket_version.h" #include "schgc.h" #ifdef UNIX_DYNAMIC_LOAD diff --git a/racket/src/racket/src/dynext.inc b/racket/src/bc/src/dynext.inc similarity index 100% rename from racket/src/racket/src/dynext.inc rename to racket/src/bc/src/dynext.inc diff --git a/racket/src/racket/src/env.c b/racket/src/bc/src/env.c similarity index 99% rename from racket/src/racket/src/env.c rename to racket/src/bc/src/env.c index 074bcd5720..37a3919919 100644 --- a/racket/src/racket/src/env.c +++ b/racket/src/bc/src/env.c @@ -323,7 +323,7 @@ static void init_startup_env(void) if (builtin_ref_counter != EXPECTED_PRIM_COUNT) { fprintf(stderr, "Primitive count %d doesn't match expected count %d\n" - "Update the count in src/schminc.h and bump the version in src/schvers.h\n", + "Update the count in src/schminc.h and bump the version in ../version/racket_version.h\n", builtin_ref_counter, EXPECTED_PRIM_COUNT); abort(); } diff --git a/racket/src/racket/src/error.c b/racket/src/bc/src/error.c similarity index 100% rename from racket/src/racket/src/error.c rename to racket/src/bc/src/error.c diff --git a/racket/src/racket/src/eval.c b/racket/src/bc/src/eval.c similarity index 100% rename from racket/src/racket/src/eval.c rename to racket/src/bc/src/eval.c diff --git a/racket/src/racket/src/file.c b/racket/src/bc/src/file.c similarity index 100% rename from racket/src/racket/src/file.c rename to racket/src/bc/src/file.c diff --git a/racket/src/racket/src/fun.c b/racket/src/bc/src/fun.c similarity index 100% rename from racket/src/racket/src/fun.c rename to racket/src/bc/src/fun.c diff --git a/racket/src/racket/src/future.c b/racket/src/bc/src/future.c similarity index 100% rename from racket/src/racket/src/future.c rename to racket/src/bc/src/future.c diff --git a/racket/src/racket/src/future.h b/racket/src/bc/src/future.h similarity index 100% rename from racket/src/racket/src/future.h rename to racket/src/bc/src/future.h diff --git a/racket/src/racket/src/gen-jit-ts.rkt b/racket/src/bc/src/gen-jit-ts.rkt similarity index 100% rename from racket/src/racket/src/gen-jit-ts.rkt rename to racket/src/bc/src/gen-jit-ts.rkt diff --git a/racket/src/racket/src/gmp/README b/racket/src/bc/src/gmp/README similarity index 100% rename from racket/src/racket/src/gmp/README rename to racket/src/bc/src/gmp/README diff --git a/racket/src/racket/src/gmp/gmp-impl.h b/racket/src/bc/src/gmp/gmp-impl.h similarity index 100% rename from racket/src/racket/src/gmp/gmp-impl.h rename to racket/src/bc/src/gmp/gmp-impl.h diff --git a/racket/src/racket/src/gmp/gmp-mparam.h b/racket/src/bc/src/gmp/gmp-mparam.h similarity index 100% rename from racket/src/racket/src/gmp/gmp-mparam.h rename to racket/src/bc/src/gmp/gmp-mparam.h diff --git a/racket/src/racket/src/gmp/gmp.c b/racket/src/bc/src/gmp/gmp.c similarity index 100% rename from racket/src/racket/src/gmp/gmp.c rename to racket/src/bc/src/gmp/gmp.c diff --git a/racket/src/racket/src/gmp/gmp.h b/racket/src/bc/src/gmp/gmp.h similarity index 100% rename from racket/src/racket/src/gmp/gmp.h rename to racket/src/bc/src/gmp/gmp.h diff --git a/racket/src/racket/src/gmp/gmp_alpha_gcc.s b/racket/src/bc/src/gmp/gmp_alpha_gcc.s similarity index 100% rename from racket/src/racket/src/gmp/gmp_alpha_gcc.s rename to racket/src/bc/src/gmp/gmp_alpha_gcc.s diff --git a/racket/src/racket/src/gmp/gmp_arm_gcc.S b/racket/src/bc/src/gmp/gmp_arm_gcc.S similarity index 100% rename from racket/src/racket/src/gmp/gmp_arm_gcc.S rename to racket/src/bc/src/gmp/gmp_arm_gcc.S diff --git a/racket/src/racket/src/gmp/gmplonglong.h b/racket/src/bc/src/gmp/gmplonglong.h similarity index 100% rename from racket/src/racket/src/gmp/gmplonglong.h rename to racket/src/bc/src/gmp/gmplonglong.h diff --git a/racket/src/racket/src/hamt_subset.inc b/racket/src/bc/src/hamt_subset.inc similarity index 100% rename from racket/src/racket/src/hamt_subset.inc rename to racket/src/bc/src/hamt_subset.inc diff --git a/racket/src/racket/src/hash.c b/racket/src/bc/src/hash.c similarity index 100% rename from racket/src/racket/src/hash.c rename to racket/src/bc/src/hash.c diff --git a/racket/src/racket/src/help-startup.rkt b/racket/src/bc/src/help-startup.rkt similarity index 100% rename from racket/src/racket/src/help-startup.rkt rename to racket/src/bc/src/help-startup.rkt diff --git a/racket/src/racket/src/jit.c b/racket/src/bc/src/jit.c similarity index 100% rename from racket/src/racket/src/jit.c rename to racket/src/bc/src/jit.c diff --git a/racket/src/racket/src/jit.h b/racket/src/bc/src/jit.h similarity index 100% rename from racket/src/racket/src/jit.h rename to racket/src/bc/src/jit.h diff --git a/racket/src/racket/src/jit_ts.c b/racket/src/bc/src/jit_ts.c similarity index 100% rename from racket/src/racket/src/jit_ts.c rename to racket/src/bc/src/jit_ts.c diff --git a/racket/src/racket/src/jit_ts_def.c b/racket/src/bc/src/jit_ts_def.c similarity index 100% rename from racket/src/racket/src/jit_ts_def.c rename to racket/src/bc/src/jit_ts_def.c diff --git a/racket/src/racket/src/jit_ts_future_glue.c b/racket/src/bc/src/jit_ts_future_glue.c similarity index 100% rename from racket/src/racket/src/jit_ts_future_glue.c rename to racket/src/bc/src/jit_ts_future_glue.c diff --git a/racket/src/racket/src/jit_ts_protos.h b/racket/src/bc/src/jit_ts_protos.h similarity index 100% rename from racket/src/racket/src/jit_ts_protos.h rename to racket/src/bc/src/jit_ts_protos.h diff --git a/racket/src/racket/src/jit_ts_runtime_glue.c b/racket/src/bc/src/jit_ts_runtime_glue.c similarity index 100% rename from racket/src/racket/src/jit_ts_runtime_glue.c rename to racket/src/bc/src/jit_ts_runtime_glue.c diff --git a/racket/src/racket/src/jitalloc.c b/racket/src/bc/src/jitalloc.c similarity index 100% rename from racket/src/racket/src/jitalloc.c rename to racket/src/bc/src/jitalloc.c diff --git a/racket/src/racket/src/jitarith.c b/racket/src/bc/src/jitarith.c similarity index 100% rename from racket/src/racket/src/jitarith.c rename to racket/src/bc/src/jitarith.c diff --git a/racket/src/racket/src/jitcall.c b/racket/src/bc/src/jitcall.c similarity index 100% rename from racket/src/racket/src/jitcall.c rename to racket/src/bc/src/jitcall.c diff --git a/racket/src/racket/src/jitcommon.c b/racket/src/bc/src/jitcommon.c similarity index 100% rename from racket/src/racket/src/jitcommon.c rename to racket/src/bc/src/jitcommon.c diff --git a/racket/src/racket/src/jitfpu.h b/racket/src/bc/src/jitfpu.h similarity index 100% rename from racket/src/racket/src/jitfpu.h rename to racket/src/bc/src/jitfpu.h diff --git a/racket/src/racket/src/jitinline.c b/racket/src/bc/src/jitinline.c similarity index 100% rename from racket/src/racket/src/jitinline.c rename to racket/src/bc/src/jitinline.c diff --git a/racket/src/racket/src/jitprep.c b/racket/src/bc/src/jitprep.c similarity index 100% rename from racket/src/racket/src/jitprep.c rename to racket/src/bc/src/jitprep.c diff --git a/racket/src/racket/src/jitstack.c b/racket/src/bc/src/jitstack.c similarity index 100% rename from racket/src/racket/src/jitstack.c rename to racket/src/bc/src/jitstack.c diff --git a/racket/src/racket/src/jitstate.c b/racket/src/bc/src/jitstate.c similarity index 100% rename from racket/src/racket/src/jitstate.c rename to racket/src/bc/src/jitstate.c diff --git a/racket/src/racket/src/letrec_check.c b/racket/src/bc/src/letrec_check.c similarity index 100% rename from racket/src/racket/src/letrec_check.c rename to racket/src/bc/src/letrec_check.c diff --git a/racket/src/racket/src/lightning/README b/racket/src/bc/src/lightning/README similarity index 100% rename from racket/src/racket/src/lightning/README rename to racket/src/bc/src/lightning/README diff --git a/racket/src/racket/src/lightning/arm/asm-common.h b/racket/src/bc/src/lightning/arm/asm-common.h similarity index 100% rename from racket/src/racket/src/lightning/arm/asm-common.h rename to racket/src/bc/src/lightning/arm/asm-common.h diff --git a/racket/src/racket/src/lightning/arm/asm.h b/racket/src/bc/src/lightning/arm/asm.h similarity index 100% rename from racket/src/racket/src/lightning/arm/asm.h rename to racket/src/bc/src/lightning/arm/asm.h diff --git a/racket/src/racket/src/lightning/arm/core-common.h b/racket/src/bc/src/lightning/arm/core-common.h similarity index 100% rename from racket/src/racket/src/lightning/arm/core-common.h rename to racket/src/bc/src/lightning/arm/core-common.h diff --git a/racket/src/racket/src/lightning/arm/core.h b/racket/src/bc/src/lightning/arm/core.h similarity index 100% rename from racket/src/racket/src/lightning/arm/core.h rename to racket/src/bc/src/lightning/arm/core.h diff --git a/racket/src/racket/src/lightning/arm/fp-common.h b/racket/src/bc/src/lightning/arm/fp-common.h similarity index 100% rename from racket/src/racket/src/lightning/arm/fp-common.h rename to racket/src/bc/src/lightning/arm/fp-common.h diff --git a/racket/src/racket/src/lightning/arm/fp-swf.h b/racket/src/bc/src/lightning/arm/fp-swf.h similarity index 100% rename from racket/src/racket/src/lightning/arm/fp-swf.h rename to racket/src/bc/src/lightning/arm/fp-swf.h diff --git a/racket/src/racket/src/lightning/arm/fp-vfp.h b/racket/src/bc/src/lightning/arm/fp-vfp.h similarity index 100% rename from racket/src/racket/src/lightning/arm/fp-vfp.h rename to racket/src/bc/src/lightning/arm/fp-vfp.h diff --git a/racket/src/racket/src/lightning/arm/fp.h b/racket/src/bc/src/lightning/arm/fp.h similarity index 100% rename from racket/src/racket/src/lightning/arm/fp.h rename to racket/src/bc/src/lightning/arm/fp.h diff --git a/racket/src/racket/src/lightning/arm/funcs-common.h b/racket/src/bc/src/lightning/arm/funcs-common.h similarity index 100% rename from racket/src/racket/src/lightning/arm/funcs-common.h rename to racket/src/bc/src/lightning/arm/funcs-common.h diff --git a/racket/src/racket/src/lightning/arm/funcs.h b/racket/src/bc/src/lightning/arm/funcs.h similarity index 100% rename from racket/src/racket/src/lightning/arm/funcs.h rename to racket/src/bc/src/lightning/arm/funcs.h diff --git a/racket/src/racket/src/lightning/i386/asm-common.h b/racket/src/bc/src/lightning/i386/asm-common.h similarity index 100% rename from racket/src/racket/src/lightning/i386/asm-common.h rename to racket/src/bc/src/lightning/i386/asm-common.h diff --git a/racket/src/racket/src/lightning/i386/asm.h b/racket/src/bc/src/lightning/i386/asm.h similarity index 100% rename from racket/src/racket/src/lightning/i386/asm.h rename to racket/src/bc/src/lightning/i386/asm.h diff --git a/racket/src/racket/src/lightning/i386/core-common.h b/racket/src/bc/src/lightning/i386/core-common.h similarity index 100% rename from racket/src/racket/src/lightning/i386/core-common.h rename to racket/src/bc/src/lightning/i386/core-common.h diff --git a/racket/src/racket/src/lightning/i386/core.h b/racket/src/bc/src/lightning/i386/core.h similarity index 100% rename from racket/src/racket/src/lightning/i386/core.h rename to racket/src/bc/src/lightning/i386/core.h diff --git a/racket/src/racket/src/lightning/i386/fp-common.h b/racket/src/bc/src/lightning/i386/fp-common.h similarity index 100% rename from racket/src/racket/src/lightning/i386/fp-common.h rename to racket/src/bc/src/lightning/i386/fp-common.h diff --git a/racket/src/racket/src/lightning/i386/fp-extfpu.h b/racket/src/bc/src/lightning/i386/fp-extfpu.h similarity index 100% rename from racket/src/racket/src/lightning/i386/fp-extfpu.h rename to racket/src/bc/src/lightning/i386/fp-extfpu.h diff --git a/racket/src/racket/src/lightning/i386/fp-sse.h b/racket/src/bc/src/lightning/i386/fp-sse.h similarity index 100% rename from racket/src/racket/src/lightning/i386/fp-sse.h rename to racket/src/bc/src/lightning/i386/fp-sse.h diff --git a/racket/src/racket/src/lightning/i386/fp.h b/racket/src/bc/src/lightning/i386/fp.h similarity index 100% rename from racket/src/racket/src/lightning/i386/fp.h rename to racket/src/bc/src/lightning/i386/fp.h diff --git a/racket/src/racket/src/lightning/i386/funcs-common.h b/racket/src/bc/src/lightning/i386/funcs-common.h similarity index 100% rename from racket/src/racket/src/lightning/i386/funcs-common.h rename to racket/src/bc/src/lightning/i386/funcs-common.h diff --git a/racket/src/racket/src/lightning/i386/funcs.h b/racket/src/bc/src/lightning/i386/funcs.h similarity index 100% rename from racket/src/racket/src/lightning/i386/funcs.h rename to racket/src/bc/src/lightning/i386/funcs.h diff --git a/racket/src/racket/src/lightning/lightning.h b/racket/src/bc/src/lightning/lightning.h similarity index 100% rename from racket/src/racket/src/lightning/lightning.h rename to racket/src/bc/src/lightning/lightning.h diff --git a/racket/src/racket/src/lightning/ppc/asm-common.h b/racket/src/bc/src/lightning/ppc/asm-common.h similarity index 100% rename from racket/src/racket/src/lightning/ppc/asm-common.h rename to racket/src/bc/src/lightning/ppc/asm-common.h diff --git a/racket/src/racket/src/lightning/ppc/asm.h b/racket/src/bc/src/lightning/ppc/asm.h similarity index 100% rename from racket/src/racket/src/lightning/ppc/asm.h rename to racket/src/bc/src/lightning/ppc/asm.h diff --git a/racket/src/racket/src/lightning/ppc/core-common.h b/racket/src/bc/src/lightning/ppc/core-common.h similarity index 100% rename from racket/src/racket/src/lightning/ppc/core-common.h rename to racket/src/bc/src/lightning/ppc/core-common.h diff --git a/racket/src/racket/src/lightning/ppc/core.h b/racket/src/bc/src/lightning/ppc/core.h similarity index 100% rename from racket/src/racket/src/lightning/ppc/core.h rename to racket/src/bc/src/lightning/ppc/core.h diff --git a/racket/src/racket/src/lightning/ppc/fp-common.h b/racket/src/bc/src/lightning/ppc/fp-common.h similarity index 100% rename from racket/src/racket/src/lightning/ppc/fp-common.h rename to racket/src/bc/src/lightning/ppc/fp-common.h diff --git a/racket/src/racket/src/lightning/ppc/fp.h b/racket/src/bc/src/lightning/ppc/fp.h similarity index 100% rename from racket/src/racket/src/lightning/ppc/fp.h rename to racket/src/bc/src/lightning/ppc/fp.h diff --git a/racket/src/racket/src/lightning/ppc/funcs-common.h b/racket/src/bc/src/lightning/ppc/funcs-common.h similarity index 100% rename from racket/src/racket/src/lightning/ppc/funcs-common.h rename to racket/src/bc/src/lightning/ppc/funcs-common.h diff --git a/racket/src/racket/src/lightning/ppc/funcs.h b/racket/src/bc/src/lightning/ppc/funcs.h similarity index 100% rename from racket/src/racket/src/lightning/ppc/funcs.h rename to racket/src/bc/src/lightning/ppc/funcs.h diff --git a/racket/src/racket/src/linklet.c b/racket/src/bc/src/linklet.c similarity index 100% rename from racket/src/racket/src/linklet.c rename to racket/src/bc/src/linklet.c diff --git a/racket/src/racket/src/list.c b/racket/src/bc/src/list.c similarity index 100% rename from racket/src/racket/src/list.c rename to racket/src/bc/src/list.c diff --git a/racket/src/racket/src/longdouble/longdouble.c b/racket/src/bc/src/longdouble/longdouble.c similarity index 100% rename from racket/src/racket/src/longdouble/longdouble.c rename to racket/src/bc/src/longdouble/longdouble.c diff --git a/racket/src/racket/src/longdouble/longdouble.h b/racket/src/bc/src/longdouble/longdouble.h similarity index 100% rename from racket/src/racket/src/longdouble/longdouble.h rename to racket/src/bc/src/longdouble/longdouble.h diff --git a/racket/src/racket/src/mac_roman.inc b/racket/src/bc/src/mac_roman.inc similarity index 100% rename from racket/src/racket/src/mac_roman.inc rename to racket/src/bc/src/mac_roman.inc diff --git a/racket/src/racket/src/macdnr.inc b/racket/src/bc/src/macdnr.inc similarity index 100% rename from racket/src/racket/src/macdnr.inc rename to racket/src/bc/src/macdnr.inc diff --git a/racket/src/racket/src/makeexn b/racket/src/bc/src/makeexn similarity index 100% rename from racket/src/racket/src/makeexn rename to racket/src/bc/src/makeexn diff --git a/racket/src/racket/src/makex.rkt b/racket/src/bc/src/makex.rkt similarity index 100% rename from racket/src/racket/src/makex.rkt rename to racket/src/bc/src/makex.rkt diff --git a/racket/src/racket/src/marshal.c b/racket/src/bc/src/marshal.c similarity index 100% rename from racket/src/racket/src/marshal.c rename to racket/src/bc/src/marshal.c diff --git a/racket/src/racket/src/mk-uchar.rkt b/racket/src/bc/src/mk-uchar.rkt similarity index 100% rename from racket/src/racket/src/mk-uchar.rkt rename to racket/src/bc/src/mk-uchar.rkt diff --git a/racket/src/racket/src/mkmark.rkt b/racket/src/bc/src/mkmark.rkt similarity index 100% rename from racket/src/racket/src/mkmark.rkt rename to racket/src/bc/src/mkmark.rkt diff --git a/racket/src/racket/src/mzclpf_decl.inc b/racket/src/bc/src/mzclpf_decl.inc similarity index 100% rename from racket/src/racket/src/mzclpf_decl.inc rename to racket/src/bc/src/mzclpf_decl.inc diff --git a/racket/src/racket/src/mzclpf_post.inc b/racket/src/bc/src/mzclpf_post.inc similarity index 100% rename from racket/src/racket/src/mzclpf_post.inc rename to racket/src/bc/src/mzclpf_post.inc diff --git a/racket/src/racket/src/mzclpf_pre.inc b/racket/src/bc/src/mzclpf_pre.inc similarity index 100% rename from racket/src/racket/src/mzclpf_pre.inc rename to racket/src/bc/src/mzclpf_pre.inc diff --git a/racket/src/racket/src/mzeqchk.inc b/racket/src/bc/src/mzeqchk.inc similarity index 100% rename from racket/src/racket/src/mzeqchk.inc rename to racket/src/bc/src/mzeqchk.inc diff --git a/racket/src/racket/src/mzhashchk.inc b/racket/src/bc/src/mzhashchk.inc similarity index 100% rename from racket/src/racket/src/mzhashchk.inc rename to racket/src/bc/src/mzhashchk.inc diff --git a/racket/src/racket/src/mzmark_compenv.inc b/racket/src/bc/src/mzmark_compenv.inc similarity index 100% rename from racket/src/racket/src/mzmark_compenv.inc rename to racket/src/bc/src/mzmark_compenv.inc diff --git a/racket/src/racket/src/mzmark_compile.inc b/racket/src/bc/src/mzmark_compile.inc similarity index 100% rename from racket/src/racket/src/mzmark_compile.inc rename to racket/src/bc/src/mzmark_compile.inc diff --git a/racket/src/racket/src/mzmark_env.inc b/racket/src/bc/src/mzmark_env.inc similarity index 100% rename from racket/src/racket/src/mzmark_env.inc rename to racket/src/bc/src/mzmark_env.inc diff --git a/racket/src/racket/src/mzmark_eval.inc b/racket/src/bc/src/mzmark_eval.inc similarity index 100% rename from racket/src/racket/src/mzmark_eval.inc rename to racket/src/bc/src/mzmark_eval.inc diff --git a/racket/src/racket/src/mzmark_fun.inc b/racket/src/bc/src/mzmark_fun.inc similarity index 100% rename from racket/src/racket/src/mzmark_fun.inc rename to racket/src/bc/src/mzmark_fun.inc diff --git a/racket/src/racket/src/mzmark_future.inc b/racket/src/bc/src/mzmark_future.inc similarity index 100% rename from racket/src/racket/src/mzmark_future.inc rename to racket/src/bc/src/mzmark_future.inc diff --git a/racket/src/racket/src/mzmark_hash.inc b/racket/src/bc/src/mzmark_hash.inc similarity index 100% rename from racket/src/racket/src/mzmark_hash.inc rename to racket/src/bc/src/mzmark_hash.inc diff --git a/racket/src/racket/src/mzmark_jit.inc b/racket/src/bc/src/mzmark_jit.inc similarity index 100% rename from racket/src/racket/src/mzmark_jit.inc rename to racket/src/bc/src/mzmark_jit.inc diff --git a/racket/src/racket/src/mzmark_letrec_check.inc b/racket/src/bc/src/mzmark_letrec_check.inc similarity index 100% rename from racket/src/racket/src/mzmark_letrec_check.inc rename to racket/src/bc/src/mzmark_letrec_check.inc diff --git a/racket/src/racket/src/mzmark_linklet.inc b/racket/src/bc/src/mzmark_linklet.inc similarity index 100% rename from racket/src/racket/src/mzmark_linklet.inc rename to racket/src/bc/src/mzmark_linklet.inc diff --git a/racket/src/racket/src/mzmark_network.inc b/racket/src/bc/src/mzmark_network.inc similarity index 100% rename from racket/src/racket/src/mzmark_network.inc rename to racket/src/bc/src/mzmark_network.inc diff --git a/racket/src/racket/src/mzmark_optimize.inc b/racket/src/bc/src/mzmark_optimize.inc similarity index 100% rename from racket/src/racket/src/mzmark_optimize.inc rename to racket/src/bc/src/mzmark_optimize.inc diff --git a/racket/src/racket/src/mzmark_place.inc b/racket/src/bc/src/mzmark_place.inc similarity index 100% rename from racket/src/racket/src/mzmark_place.inc rename to racket/src/bc/src/mzmark_place.inc diff --git a/racket/src/racket/src/mzmark_port.inc b/racket/src/bc/src/mzmark_port.inc similarity index 100% rename from racket/src/racket/src/mzmark_port.inc rename to racket/src/bc/src/mzmark_port.inc diff --git a/racket/src/racket/src/mzmark_portfun.inc b/racket/src/bc/src/mzmark_portfun.inc similarity index 100% rename from racket/src/racket/src/mzmark_portfun.inc rename to racket/src/bc/src/mzmark_portfun.inc diff --git a/racket/src/racket/src/mzmark_print.inc b/racket/src/bc/src/mzmark_print.inc similarity index 100% rename from racket/src/racket/src/mzmark_print.inc rename to racket/src/bc/src/mzmark_print.inc diff --git a/racket/src/racket/src/mzmark_read.inc b/racket/src/bc/src/mzmark_read.inc similarity index 100% rename from racket/src/racket/src/mzmark_read.inc rename to racket/src/bc/src/mzmark_read.inc diff --git a/racket/src/racket/src/mzmark_regexp.inc b/racket/src/bc/src/mzmark_regexp.inc similarity index 100% rename from racket/src/racket/src/mzmark_regexp.inc rename to racket/src/bc/src/mzmark_regexp.inc diff --git a/racket/src/racket/src/mzmark_resolve.inc b/racket/src/bc/src/mzmark_resolve.inc similarity index 100% rename from racket/src/racket/src/mzmark_resolve.inc rename to racket/src/bc/src/mzmark_resolve.inc diff --git a/racket/src/racket/src/mzmark_salloc.inc b/racket/src/bc/src/mzmark_salloc.inc similarity index 100% rename from racket/src/racket/src/mzmark_salloc.inc rename to racket/src/bc/src/mzmark_salloc.inc diff --git a/racket/src/racket/src/mzmark_sema.inc b/racket/src/bc/src/mzmark_sema.inc similarity index 100% rename from racket/src/racket/src/mzmark_sema.inc rename to racket/src/bc/src/mzmark_sema.inc diff --git a/racket/src/racket/src/mzmark_sfs.inc b/racket/src/bc/src/mzmark_sfs.inc similarity index 100% rename from racket/src/racket/src/mzmark_sfs.inc rename to racket/src/bc/src/mzmark_sfs.inc diff --git a/racket/src/racket/src/mzmark_string.inc b/racket/src/bc/src/mzmark_string.inc similarity index 100% rename from racket/src/racket/src/mzmark_string.inc rename to racket/src/bc/src/mzmark_string.inc diff --git a/racket/src/racket/src/mzmark_struct.inc b/racket/src/bc/src/mzmark_struct.inc similarity index 100% rename from racket/src/racket/src/mzmark_struct.inc rename to racket/src/bc/src/mzmark_struct.inc diff --git a/racket/src/racket/src/mzmark_syntax.inc b/racket/src/bc/src/mzmark_syntax.inc similarity index 100% rename from racket/src/racket/src/mzmark_syntax.inc rename to racket/src/bc/src/mzmark_syntax.inc diff --git a/racket/src/racket/src/mzmark_thread.inc b/racket/src/bc/src/mzmark_thread.inc similarity index 100% rename from racket/src/racket/src/mzmark_thread.inc rename to racket/src/bc/src/mzmark_thread.inc diff --git a/racket/src/racket/src/mzmark_type.inc b/racket/src/bc/src/mzmark_type.inc similarity index 100% rename from racket/src/racket/src/mzmark_type.inc rename to racket/src/bc/src/mzmark_type.inc diff --git a/racket/src/racket/src/mzmark_validate.inc b/racket/src/bc/src/mzmark_validate.inc similarity index 100% rename from racket/src/racket/src/mzmark_validate.inc rename to racket/src/bc/src/mzmark_validate.inc diff --git a/racket/src/racket/src/mzmarksrc.c b/racket/src/bc/src/mzmarksrc.c similarity index 100% rename from racket/src/racket/src/mzmarksrc.c rename to racket/src/bc/src/mzmarksrc.c diff --git a/racket/src/racket/src/mzrt.c b/racket/src/bc/src/mzrt.c similarity index 100% rename from racket/src/racket/src/mzrt.c rename to racket/src/bc/src/mzrt.c diff --git a/racket/src/racket/src/mzrt.h b/racket/src/bc/src/mzrt.h similarity index 100% rename from racket/src/racket/src/mzrt.h rename to racket/src/bc/src/mzrt.h diff --git a/racket/src/racket/src/mzrt_cas.inc b/racket/src/bc/src/mzrt_cas.inc similarity index 100% rename from racket/src/racket/src/mzrt_cas.inc rename to racket/src/bc/src/mzrt_cas.inc diff --git a/racket/src/racket/src/mzsj86.c b/racket/src/bc/src/mzsj86.c similarity index 100% rename from racket/src/racket/src/mzsj86.c rename to racket/src/bc/src/mzsj86.c diff --git a/racket/src/racket/src/mzsj86g.S b/racket/src/bc/src/mzsj86g.S similarity index 100% rename from racket/src/racket/src/mzsj86g.S rename to racket/src/bc/src/mzsj86g.S diff --git a/racket/src/racket/src/mzsj86w64.S b/racket/src/bc/src/mzsj86w64.S similarity index 100% rename from racket/src/racket/src/mzsj86w64.S rename to racket/src/bc/src/mzsj86w64.S diff --git a/racket/src/racket/src/mzstkchk.h b/racket/src/bc/src/mzstkchk.h similarity index 100% rename from racket/src/racket/src/mzstkchk.h rename to racket/src/bc/src/mzstkchk.h diff --git a/racket/src/racket/src/network.c b/racket/src/bc/src/network.c similarity index 100% rename from racket/src/racket/src/network.c rename to racket/src/bc/src/network.c diff --git a/racket/src/racket/src/newrandom.inc b/racket/src/bc/src/newrandom.inc similarity index 100% rename from racket/src/racket/src/newrandom.inc rename to racket/src/bc/src/newrandom.inc diff --git a/racket/src/racket/src/numarith.c b/racket/src/bc/src/numarith.c similarity index 100% rename from racket/src/racket/src/numarith.c rename to racket/src/bc/src/numarith.c diff --git a/racket/src/racket/src/number.c b/racket/src/bc/src/number.c similarity index 100% rename from racket/src/racket/src/number.c rename to racket/src/bc/src/number.c diff --git a/racket/src/racket/src/numcomp.c b/racket/src/bc/src/numcomp.c similarity index 100% rename from racket/src/racket/src/numcomp.c rename to racket/src/bc/src/numcomp.c diff --git a/racket/src/racket/src/nummacs.h b/racket/src/bc/src/nummacs.h similarity index 100% rename from racket/src/racket/src/nummacs.h rename to racket/src/bc/src/nummacs.h diff --git a/racket/src/racket/src/numstr.c b/racket/src/bc/src/numstr.c similarity index 100% rename from racket/src/racket/src/numstr.c rename to racket/src/bc/src/numstr.c diff --git a/racket/src/racket/src/optimize.c b/racket/src/bc/src/optimize.c similarity index 100% rename from racket/src/racket/src/optimize.c rename to racket/src/bc/src/optimize.c diff --git a/racket/src/racket/src/pc_keys.inc b/racket/src/bc/src/pc_keys.inc similarity index 100% rename from racket/src/racket/src/pc_keys.inc rename to racket/src/bc/src/pc_keys.inc diff --git a/racket/src/racket/src/place.c b/racket/src/bc/src/place.c similarity index 100% rename from racket/src/racket/src/place.c rename to racket/src/bc/src/place.c diff --git a/racket/src/racket/src/port.c b/racket/src/bc/src/port.c similarity index 100% rename from racket/src/racket/src/port.c rename to racket/src/bc/src/port.c diff --git a/racket/src/racket/src/portfun.c b/racket/src/bc/src/portfun.c similarity index 99% rename from racket/src/racket/src/portfun.c rename to racket/src/bc/src/portfun.c index bbd33630e6..99cbe53301 100644 --- a/racket/src/racket/src/portfun.c +++ b/racket/src/bc/src/portfun.c @@ -2,7 +2,7 @@ port types. See also "port.c". */ #include "schpriv.h" -#include "schvers.h" +#include "racket_version.h" #include "schrktio.h" static Scheme_Object *input_port_p (int, Scheme_Object *[]); diff --git a/racket/src/racket/src/print.c b/racket/src/bc/src/print.c similarity index 99% rename from racket/src/racket/src/print.c rename to racket/src/bc/src/print.c index 24721277fd..475317930d 100644 --- a/racket/src/racket/src/print.c +++ b/racket/src/bc/src/print.c @@ -1,5 +1,5 @@ #include "schpriv.h" -#include "schvers.h" +#include "racket_version.h" #include "schmach.h" #include "schcpt.h" #include diff --git a/racket/src/racket/src/print_vector.inc b/racket/src/bc/src/print_vector.inc similarity index 100% rename from racket/src/racket/src/print_vector.inc rename to racket/src/bc/src/print_vector.inc diff --git a/racket/src/racket/src/qqsrc.rkt b/racket/src/bc/src/qqsrc.rkt similarity index 100% rename from racket/src/racket/src/qqsrc.rkt rename to racket/src/bc/src/qqsrc.rkt diff --git a/racket/src/racket/src/random.inc b/racket/src/bc/src/random.inc similarity index 100% rename from racket/src/racket/src/random.inc rename to racket/src/bc/src/random.inc diff --git a/racket/src/racket/src/ratfloat.inc b/racket/src/bc/src/ratfloat.inc similarity index 100% rename from racket/src/racket/src/ratfloat.inc rename to racket/src/bc/src/ratfloat.inc diff --git a/racket/src/racket/src/rational.c b/racket/src/bc/src/rational.c similarity index 100% rename from racket/src/racket/src/rational.c rename to racket/src/bc/src/rational.c diff --git a/racket/src/racket/src/read.c b/racket/src/bc/src/read.c similarity index 99% rename from racket/src/racket/src/read.c rename to racket/src/bc/src/read.c index b238c7352b..76ac6d30e7 100644 --- a/racket/src/racket/src/read.c +++ b/racket/src/bc/src/read.c @@ -15,7 +15,7 @@ #include "schmach.h" #include "schminc.h" #include "schcpt.h" -#include "schvers.h" +#include "racket_version.h" #include #include #ifdef USE_STACKAVAIL diff --git a/racket/src/racket/src/regexp.c b/racket/src/bc/src/regexp.c similarity index 100% rename from racket/src/racket/src/regexp.c rename to racket/src/bc/src/regexp.c diff --git a/racket/src/racket/src/renumber.rkt b/racket/src/bc/src/renumber.rkt similarity index 100% rename from racket/src/racket/src/renumber.rkt rename to racket/src/bc/src/renumber.rkt diff --git a/racket/src/racket/src/resolve.c b/racket/src/bc/src/resolve.c similarity index 100% rename from racket/src/racket/src/resolve.c rename to racket/src/bc/src/resolve.c diff --git a/racket/src/racket/src/salloc.c b/racket/src/bc/src/salloc.c similarity index 100% rename from racket/src/racket/src/salloc.c rename to racket/src/bc/src/salloc.c diff --git a/racket/src/racket/src/schapp.inc b/racket/src/bc/src/schapp.inc similarity index 100% rename from racket/src/racket/src/schapp.inc rename to racket/src/bc/src/schapp.inc diff --git a/racket/src/racket/src/schcpt.h b/racket/src/bc/src/schcpt.h similarity index 100% rename from racket/src/racket/src/schcpt.h rename to racket/src/bc/src/schcpt.h diff --git a/racket/src/racket/src/schemef.h b/racket/src/bc/src/schemef.h similarity index 100% rename from racket/src/racket/src/schemef.h rename to racket/src/bc/src/schemef.h diff --git a/racket/src/racket/src/schemex.h b/racket/src/bc/src/schemex.h similarity index 100% rename from racket/src/racket/src/schemex.h rename to racket/src/bc/src/schemex.h diff --git a/racket/src/racket/src/schemex.inc b/racket/src/bc/src/schemex.inc similarity index 100% rename from racket/src/racket/src/schemex.inc rename to racket/src/bc/src/schemex.inc diff --git a/racket/src/racket/src/schemexm.h b/racket/src/bc/src/schemexm.h similarity index 100% rename from racket/src/racket/src/schemexm.h rename to racket/src/bc/src/schemexm.h diff --git a/racket/src/racket/src/schexn.h b/racket/src/bc/src/schexn.h similarity index 100% rename from racket/src/racket/src/schexn.h rename to racket/src/bc/src/schexn.h diff --git a/racket/src/racket/src/schgc.h b/racket/src/bc/src/schgc.h similarity index 100% rename from racket/src/racket/src/schgc.h rename to racket/src/bc/src/schgc.h diff --git a/racket/src/racket/src/schgencat.h b/racket/src/bc/src/schgencat.h similarity index 100% rename from racket/src/racket/src/schgencat.h rename to racket/src/bc/src/schgencat.h diff --git a/racket/src/racket/src/schmach.h b/racket/src/bc/src/schmach.h similarity index 100% rename from racket/src/racket/src/schmach.h rename to racket/src/bc/src/schmach.h diff --git a/racket/src/racket/src/schmap.inc b/racket/src/bc/src/schmap.inc similarity index 100% rename from racket/src/racket/src/schmap.inc rename to racket/src/bc/src/schmap.inc diff --git a/racket/src/racket/src/schminc.h b/racket/src/bc/src/schminc.h similarity index 68% rename from racket/src/racket/src/schminc.h rename to racket/src/bc/src/schminc.h index 5f49f7e8a4..24c52af707 100644 --- a/racket/src/racket/src/schminc.h +++ b/racket/src/bc/src/schminc.h @@ -7,10 +7,11 @@ names shift). If you make a version with omissions or additions, set - USE_COMPILED_STARTUP to 0 and change the version on "schvers.h"; - then, `make cgc' and then `make cstartup' to create "cstartup.inc"; - finally, set EXPECTED_PRIM_COUNT to the right value and - USE_COMPILED_STARTUP to 1 and `make' again. */ + USE_COMPILED_STARTUP to 0 and change the version at + "../version/racket_version.h"; then, `make cgc' and then `make + cstartup' to create "cstartup.inc"; finally, set + EXPECTED_PRIM_COUNT to the right value and USE_COMPILED_STARTUP to + 1 and `make' again. */ #define USE_COMPILED_STARTUP 1 diff --git a/racket/src/racket/src/schnapp.inc b/racket/src/bc/src/schnapp.inc similarity index 100% rename from racket/src/racket/src/schnapp.inc rename to racket/src/bc/src/schnapp.inc diff --git a/racket/src/racket/src/schpriv.h b/racket/src/bc/src/schpriv.h similarity index 100% rename from racket/src/racket/src/schpriv.h rename to racket/src/bc/src/schpriv.h diff --git a/racket/src/racket/src/schrktio.h b/racket/src/bc/src/schrktio.h similarity index 100% rename from racket/src/racket/src/schrktio.h rename to racket/src/bc/src/schrktio.h diff --git a/racket/src/racket/src/schround.inc b/racket/src/bc/src/schround.inc similarity index 100% rename from racket/src/racket/src/schround.inc rename to racket/src/bc/src/schround.inc diff --git a/racket/src/racket/src/schrunst.h b/racket/src/bc/src/schrunst.h similarity index 100% rename from racket/src/racket/src/schrunst.h rename to racket/src/bc/src/schrunst.h diff --git a/racket/src/racket/src/schrx.h b/racket/src/bc/src/schrx.h similarity index 100% rename from racket/src/racket/src/schrx.h rename to racket/src/bc/src/schrx.h diff --git a/racket/src/racket/src/schuchar.inc b/racket/src/bc/src/schuchar.inc similarity index 100% rename from racket/src/racket/src/schuchar.inc rename to racket/src/bc/src/schuchar.inc diff --git a/racket/src/racket/src/schustr.inc b/racket/src/bc/src/schustr.inc similarity index 100% rename from racket/src/racket/src/schustr.inc rename to racket/src/bc/src/schustr.inc diff --git a/racket/src/racket/src/sema.c b/racket/src/bc/src/sema.c similarity index 100% rename from racket/src/racket/src/sema.c rename to racket/src/bc/src/sema.c diff --git a/racket/src/racket/src/setjmpup.c b/racket/src/bc/src/setjmpup.c similarity index 100% rename from racket/src/racket/src/setjmpup.c rename to racket/src/bc/src/setjmpup.c diff --git a/racket/src/racket/src/sfs.c b/racket/src/bc/src/sfs.c similarity index 100% rename from racket/src/racket/src/sfs.c rename to racket/src/bc/src/sfs.c diff --git a/racket/src/racket/src/sort.c b/racket/src/bc/src/sort.c similarity index 100% rename from racket/src/racket/src/sort.c rename to racket/src/bc/src/sort.c diff --git a/racket/src/racket/src/startup-glue.inc b/racket/src/bc/src/startup-glue.inc similarity index 100% rename from racket/src/racket/src/startup-glue.inc rename to racket/src/bc/src/startup-glue.inc diff --git a/racket/src/racket/src/startup-select.rkt b/racket/src/bc/src/startup-select.rkt similarity index 100% rename from racket/src/racket/src/startup-select.rkt rename to racket/src/bc/src/startup-select.rkt diff --git a/racket/src/racket/src/startup.c b/racket/src/bc/src/startup.c similarity index 98% rename from racket/src/racket/src/startup.c rename to racket/src/bc/src/startup.c index df3f4a7b3e..1f3537901e 100644 --- a/racket/src/racket/src/startup.c +++ b/racket/src/bc/src/startup.c @@ -1,5 +1,5 @@ #include "schpriv.h" -#include "schvers.h" +#include "racket_version.h" #include "schminc.h" /* Generated by the build process in the build area; might simply diff --git a/racket/src/racket/src/startup.inc b/racket/src/bc/src/startup.inc similarity index 100% rename from racket/src/racket/src/startup.inc rename to racket/src/bc/src/startup.inc diff --git a/racket/src/racket/src/string.c b/racket/src/bc/src/string.c similarity index 99% rename from racket/src/racket/src/string.c rename to racket/src/bc/src/string.c index 6304982b73..9bc2433147 100644 --- a/racket/src/racket/src/string.c +++ b/racket/src/bc/src/string.c @@ -1,5 +1,5 @@ #include "schpriv.h" -#include "schvers.h" +#include "racket_version.h" #include "schrktio.h" #include #include diff --git a/racket/src/racket/src/strops.inc b/racket/src/bc/src/strops.inc similarity index 100% rename from racket/src/racket/src/strops.inc rename to racket/src/bc/src/strops.inc diff --git a/racket/src/racket/src/struct.c b/racket/src/bc/src/struct.c similarity index 100% rename from racket/src/racket/src/struct.c rename to racket/src/bc/src/struct.c diff --git a/racket/src/racket/src/stypes.h b/racket/src/bc/src/stypes.h similarity index 100% rename from racket/src/racket/src/stypes.h rename to racket/src/bc/src/stypes.h diff --git a/racket/src/racket/src/symbol.c b/racket/src/bc/src/symbol.c similarity index 100% rename from racket/src/racket/src/symbol.c rename to racket/src/bc/src/symbol.c diff --git a/racket/src/racket/src/syntax.c b/racket/src/bc/src/syntax.c similarity index 100% rename from racket/src/racket/src/syntax.c rename to racket/src/bc/src/syntax.c diff --git a/racket/src/racket/src/sysname b/racket/src/bc/src/sysname similarity index 100% rename from racket/src/racket/src/sysname rename to racket/src/bc/src/sysname diff --git a/racket/src/racket/src/systype.c b/racket/src/bc/src/systype.c similarity index 100% rename from racket/src/racket/src/systype.c rename to racket/src/bc/src/systype.c diff --git a/racket/src/racket/src/systype.inc b/racket/src/bc/src/systype.inc similarity index 100% rename from racket/src/racket/src/systype.inc rename to racket/src/bc/src/systype.inc diff --git a/racket/src/racket/src/thread.c b/racket/src/bc/src/thread.c similarity index 100% rename from racket/src/racket/src/thread.c rename to racket/src/bc/src/thread.c diff --git a/racket/src/racket/src/type.c b/racket/src/bc/src/type.c similarity index 100% rename from racket/src/racket/src/type.c rename to racket/src/bc/src/type.c diff --git a/racket/src/racket/src/unwind/libunwind.c b/racket/src/bc/src/unwind/libunwind.c similarity index 100% rename from racket/src/racket/src/unwind/libunwind.c rename to racket/src/bc/src/unwind/libunwind.c diff --git a/racket/src/racket/src/unwind/libunwind.h b/racket/src/bc/src/unwind/libunwind.h similarity index 100% rename from racket/src/racket/src/unwind/libunwind.h rename to racket/src/bc/src/unwind/libunwind.h diff --git a/racket/src/racket/src/unwind/libunwind_i.h b/racket/src/bc/src/unwind/libunwind_i.h similarity index 100% rename from racket/src/racket/src/unwind/libunwind_i.h rename to racket/src/bc/src/unwind/libunwind_i.h diff --git a/racket/src/racket/src/unwind/os-linux.h b/racket/src/bc/src/unwind/os-linux.h similarity index 100% rename from racket/src/racket/src/unwind/os-linux.h rename to racket/src/bc/src/unwind/os-linux.h diff --git a/racket/src/racket/src/validate.c b/racket/src/bc/src/validate.c similarity index 100% rename from racket/src/racket/src/validate.c rename to racket/src/bc/src/validate.c diff --git a/racket/src/racket/src/vector.c b/racket/src/bc/src/vector.c similarity index 100% rename from racket/src/racket/src/vector.c rename to racket/src/bc/src/vector.c diff --git a/racket/src/racket/uconfig.h b/racket/src/bc/uconfig.h similarity index 100% rename from racket/src/racket/uconfig.h rename to racket/src/bc/uconfig.h diff --git a/racket/src/racket/utils/schiptr.h b/racket/src/bc/utils/schiptr.h similarity index 100% rename from racket/src/racket/utils/schiptr.h rename to racket/src/bc/utils/schiptr.h diff --git a/racket/src/racket/utils/splay.c b/racket/src/bc/utils/splay.c similarity index 100% rename from racket/src/racket/utils/splay.c rename to racket/src/bc/utils/splay.c diff --git a/racket/src/racket/version.mak b/racket/src/bc/version.mak similarity index 71% rename from racket/src/racket/version.mak rename to racket/src/bc/version.mak index a3c53c6594..7137294c2e 100644 --- a/racket/src/racket/version.mak +++ b/racket/src/bc/version.mak @@ -1,8 +1,8 @@ -FWVERSION_X = $(shell grep 'define MZSCHEME_VERSION_X ' $(mainsrcdir)/racket/src/schvers.h | cut -d ' ' -f 3) -FWVERSION_Y = $(shell grep 'define MZSCHEME_VERSION_Y ' $(mainsrcdir)/racket/src/schvers.h | cut -d ' ' -f 3) -FWVERSION_Z = $(shell grep 'define MZSCHEME_VERSION_Z ' $(mainsrcdir)/racket/src/schvers.h | cut -d ' ' -f 3) -FWVERSION_W = $(shell grep 'define MZSCHEME_VERSION_W ' $(mainsrcdir)/racket/src/schvers.h | cut -d ' ' -f 3) +FWVERSION_X = $(shell grep 'define MZSCHEME_VERSION_X ' $(mainsrcdir)/version/racket_version.h | cut -d ' ' -f 3) +FWVERSION_Y = $(shell grep 'define MZSCHEME_VERSION_Y ' $(mainsrcdir)/version/racket_version.h | cut -d ' ' -f 3) +FWVERSION_Z = $(shell grep 'define MZSCHEME_VERSION_Z ' $(mainsrcdir)/version/racket_version.h | cut -d ' ' -f 3) +FWVERSION_W = $(shell grep 'define MZSCHEME_VERSION_W ' $(mainsrcdir)/version/racket_version.h | cut -d ' ' -f 3) ifneq ($(FWVERSION_W),0) FWVERSION = $(FWVERSION_X).$(FWVERSION_Y).$(FWVERSION_Z).$(FWVERSION_W) diff --git a/racket/src/racket/win_tls.inc b/racket/src/bc/win_tls.inc similarity index 100% rename from racket/src/racket/win_tls.inc rename to racket/src/bc/win_tls.inc diff --git a/racket/src/cfg-bc b/racket/src/cfg-bc index 1a551c2843..27d6173e8f 100755 --- a/racket/src/cfg-bc +++ b/racket/src/cfg-bc @@ -583,7 +583,7 @@ PACKAGE_BUGREPORT= PACKAGE_URL= ac_unique_file="Racket" -ac_unique_file="racket/src/bignum.c" +ac_unique_file="bc/src/bignum.c" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -857,7 +857,7 @@ LDFLAGS LIBS CPPFLAGS CPP' -ac_subdirs_all='foreign/libffi +ac_subdirs_all='bc/foreign/libffi rktio ' # Initialize some variables set by options. @@ -2475,7 +2475,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers racket/mzconfig.h" +ac_config_headers="$ac_config_headers bc/mzconfig.h" ac_aux_dir= @@ -3209,7 +3209,7 @@ show_path_results() ###### Make sure GRacket is really there ###### if test "${enable_gracket}" = "yes" ; then - if test ! -d $srcdir/gracket ; then + if test ! -d $srcdir/bc/gracket ; then enable_gracket=no fi fi @@ -4897,7 +4897,7 @@ case "$host_os" in ;; aix*) enable_cgcdefault="yes" - EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../racket/include/racket.exp" + EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../bc/include/racket.exp" ;; *freebsd*) LIBS="$LIBS -rdynamic" @@ -6951,8 +6951,8 @@ fi ############## Racket for Racket ################ if test "${enable_racket}" = "auto" ; then - enable_racket="`pwd`/local/racket/racket3m" - MAKE_LOCAL_RACKET="local/racket/racket3m" + enable_racket="`pwd`/local/bc/racket3m" + MAKE_LOCAL_RACKET="local/bc/racket3m" fi if test "${enable_racket}" = "" ; then @@ -7008,10 +7008,10 @@ if test "${enable_shared}" = "yes" ; then if test "$INCLUDEDEP" = "-include" ; then plt_lib_version="\$(FWVERSION)" else - VERSION_X=`grep 'define MZSCHEME_VERSION_X ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` - VERSION_Y=`grep 'define MZSCHEME_VERSION_Y ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` - VERSION_Z=`grep 'define MZSCHEME_VERSION_Z ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` - VERSION_W=`grep 'define MZSCHEME_VERSION_W ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` + VERSION_X=`grep 'define MZSCHEME_VERSION_X ' ${srcdir}/bc/src/schvers.h | cut -d ' ' -f 3` + VERSION_Y=`grep 'define MZSCHEME_VERSION_Y ' ${srcdir}/bc/src/schvers.h | cut -d ' ' -f 3` + VERSION_Z=`grep 'define MZSCHEME_VERSION_Z ' ${srcdir}/bc/src/schvers.h | cut -d ' ' -f 3` + VERSION_W=`grep 'define MZSCHEME_VERSION_W ' ${srcdir}/bc/src/schvers.h | cut -d ' ' -f 3` if test "${VERSION_W}" != "0" ; then plt_lib_version="${VERSION_X}.${VERSION_Y}.${VERSION_Z}.${VERSION_W}" @@ -7181,9 +7181,9 @@ mk_needed_dir() } makefiles="Makefile - racket/Makefile - racket/src/Makefile racket/dynsrc/Makefile - racket/sgc/Makefile racket/gc2/Makefile" + bc/Makefile + bc/src/Makefile bc/dynsrc/Makefile + bc/sgc/Makefile bc/gc2/Makefile" # Make sure the --enable-shared default is propagated: if test "${enable_shared}" = "yes" ; then @@ -7206,10 +7206,10 @@ fi FOREIGNTARGET= FOREIGN_IF_USED="FOREIGN_NOT_USED" -if test -d "${srcdir}/foreign" && test "${enable_foreign}" = "yes" ; then +if test -d "${srcdir}/bc/foreign" && test "${enable_foreign}" = "yes" ; then if test "${have_libffi}" != "yes" ; then ac_aux_dir= -for ac_dir in foreign/libffi "$srcdir"/foreign/libffi ; do +for ac_dir in bc/foreign/libffi "$srcdir"/bc/foreign/libffi ; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -7225,7 +7225,7 @@ for ac_dir in foreign/libffi "$srcdir"/foreign/libffi ; do fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in foreign/libffi \"$srcdir\"/foreign/libffi " "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in bc/foreign/libffi \"$srcdir\"/bc/foreign/libffi " "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -7239,7 +7239,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -subdirs="$subdirs foreign/libffi" +subdirs="$subdirs bc/foreign/libffi" fi FOREIGNTARGET="foreign-stuff" @@ -7248,7 +7248,7 @@ else FOREIGNTARGET="foreign-stub" MZOPTIONS="$MZOPTIONS -DDONT_USE_FOREIGN" fi -makefiles="$makefiles foreign/Makefile" +makefiles="$makefiles bc/foreign/Makefile" subdirs="$subdirs rktio" @@ -7276,8 +7276,8 @@ ac_configure_args="$new_configure_args$SUB_CONFIGURE_EXTRAS" if test "${enable_gracket}" = "yes" ; then makefiles="$makefiles - gracket/Makefile - gracket/gc2/Makefile" + bc/gracket/Makefile + bc/gracket/gc2/Makefile" fi ac_config_files="$ac_config_files $makefiles" @@ -7972,7 +7972,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in - "racket/mzconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS racket/mzconfig.h" ;; + "bc/mzconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS bc/mzconfig.h" ;; "$makefiles") CONFIG_FILES="$CONFIG_FILES $makefiles" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/racket/src/cs/Makefile b/racket/src/cs/Makefile index bd5c410825..34552cb3c4 100644 --- a/racket/src/cs/Makefile +++ b/racket/src/cs/Makefile @@ -312,7 +312,7 @@ RUMBLE_SRCS = rumble/define.ss \ rumble/future.ss \ rumble/version.ss \ rumble/inline.ss \ - ../racket/src/schvers.h + ../version/racket_version.h $(BUILDDIR)rumble.$(CSO): $(RUMBLE_DEPS) rumble.sls $(RUMBLE_SRCS) $(COMPILE_FILE_DEPS) $(COMPILE_FILE) rumble.sls $(RUMBLE_DEPS) diff --git a/racket/src/cs/c/Makefile.in b/racket/src/cs/c/Makefile.in index a0384e2950..6250ada76e 100644 --- a/racket/src/cs/c/Makefile.in +++ b/racket/src/cs/c/Makefile.in @@ -242,7 +242,7 @@ $(GRACKET_BIN): grmain.o $(RKTFW) $(GRAPPSKEL) $(MAKE) mac-embed-boot-@MACLIBRKT_LINK_MODE@ EMBED_DEST=$(GRACKET_BIN) /usr/bin/install_name_tool -change "Racket.framework/Versions/$(FWVERSION)_CS/Racket" "@executable_path/../../../Racket.framework/Versions/$(FWVERSION)_CS/Racket" $(GRACKET_BIN) -$(GRAPPSKEL): $(srcdir)/../../mac/osx_appl.rkt $(srcdir)/../../racket/src/schvers.h $(srcdir)/../../mac/icon/GRacket.icns +$(GRAPPSKEL): $(srcdir)/../../mac/osx_appl.rkt $(srcdir)/../../version/racket_version.h $(srcdir)/../../mac/icon/GRacket.icns $(BOOTSTRAP_RACKET) $(srcdir)/../../mac/osx_appl.rkt $(srcdir)/../.. "CS" BOOT_FILES = $(SCHEME_TARGET_INC)/petite.boot $(SCHEME_TARGET_INC)/scheme.boot racket.boot @@ -455,7 +455,7 @@ common-install: $(ICP) starter "$(DESTDIR)$(libpltdir)/starter" $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/starter" $(ICP) $(srcdir)/../../start/starter-sh "$(DESTDIR)$(libpltdir)/starter-sh" - $(RACKET) -cu "$(srcdir)/../../racket/collects-path.rkt" "$(DESTDIR)$(libpltdir)/starter" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ + $(RACKET) -cu "$(srcdir)/../../bc/collects-path.rkt" "$(DESTDIR)$(libpltdir)/starter" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ $(MAKE) system-install $(ICP) $(srcdir)/api.h "$(DESTDIR)$(includepltdir)/racketcs.h" $(ICP) $(srcdir)/boot.h "$(DESTDIR)$(includepltdir)/racketcsboot.h" @@ -476,8 +476,8 @@ unix-install: $(MAKE) common-install rm -f "$(DESTDIR)$(libpltdir)/gracket$(CS_INSTALLED)" $(ICP) gracketcs "$(DESTDIR)$(libpltdir)/gracket$(CS_INSTALLED)" - $(RACKET) -cu "$(srcdir)/../../racket/collects-path.rkt" "$(DESTDIR)$(bindir)/racket$(CS_INSTALLED)" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ - $(RACKET) -cu "$(srcdir)/../../racket/collects-path.rkt" "$(DESTDIR)$(libpltdir)/gracket$(CS_INSTALLED)" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ + $(RACKET) -cu "$(srcdir)/../../bc/collects-path.rkt" "$(DESTDIR)$(bindir)/racket$(CS_INSTALLED)" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ + $(RACKET) -cu "$(srcdir)/../../bc/collects-path.rkt" "$(DESTDIR)$(libpltdir)/gracket$(CS_INSTALLED)" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ $(MAKE) unix-@INSTALL_LIBS_ENABLE@-libs unix-install-libs: @@ -509,7 +509,7 @@ macos-install: cp $(RKTFWDIR)/boot/petite.boot $(DESTDIR)$(RKTFWDEST)/Versions/$(FWVERSION)_CS/boot/ cp $(RKTFWDIR)/boot/scheme.boot $(DESTDIR)$(RKTFWDEST)/Versions/$(FWVERSION)_CS/boot/ cp $(RKTFWDIR)/boot/racket.boot $(DESTDIR)$(RKTFWDEST)/Versions/$(FWVERSION)_CS/boot/ - $(RACKET) -cu "$(srcdir)/../../racket/collects-path.rkt" "$(DESTDIR)$(bindir)/racket$(CS_INSTALLED)" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ + $(RACKET) -cu "$(srcdir)/../../bc/collects-path.rkt" "$(DESTDIR)$(bindir)/racket$(CS_INSTALLED)" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@ $(MAKE) macos-install-gracket CS_GR_INSTALLED="`echo $(CS_INSTALLED) | tr a-z A-Z`" $(MAKE) macos-@INSTALL_LIBS_ENABLE@-libs @@ -518,8 +518,8 @@ macos-install-gracket: rm -rf $(DESTDIR)"$(libpltdir)/GRacket$(CS_GR_INSTALLED).app" $(ICP) -r "GRacketCS.app" $(DESTDIR)"$(libpltdir)/GRacket$(CS_GR_INSTALLED).app" $(BOOTSTRAP_RACKET) "$(srcdir)/../../mac/rename-app.rkt" $(DESTDIR)"$(libpltdir)/GRacket$(CS_GR_INSTALLED).app" "GRacketCS" "GRacket$(CS_GR_INSTALLED)" no-up - /usr/bin/install_name_tool -change "@executable_path/../../../../racket/Racket.framework/Versions/$(FWVERSION)_CS/Racket" "@FRAMEWORK_PREFIX@Racket.framework/Versions/$(FWVERSION)_CS/Racket" $(DESTDIR)"$(libpltdir)/GRacket$(CS_GR_INSTALLED).app/Contents/MacOS/GRacket$(CS_GR_INSTALLED)" - $(RACKET) -cu "$(srcdir)/../../racket/collects-path.rkt" $(DESTDIR)"$(libpltdir)/GRacket$(CS_GR_INSTALLED).app/Contents/MacOS/GRacket$(CS_GR_INSTALLED)" ../../../../collects ../../../../etc + /usr/bin/install_name_tool -change "@executable_path/../../../../bc/Racket.framework/Versions/$(FWVERSION)_CS/Racket" "@FRAMEWORK_PREFIX@Racket.framework/Versions/$(FWVERSION)_CS/Racket" $(DESTDIR)"$(libpltdir)/GRacket$(CS_GR_INSTALLED).app/Contents/MacOS/GRacket$(CS_GR_INSTALLED)" + $(RACKET) -cu "$(srcdir)/../../bc/collects-path.rkt" $(DESTDIR)"$(libpltdir)/GRacket$(CS_GR_INSTALLED).app/Contents/MacOS/GRacket$(CS_GR_INSTALLED)" ../../../../collects ../../../../etc $(STRIP_DEBUG) $(DESTDIR)"$(libpltdir)/GRacket$(CS_GR_INSTALLED).app/Contents/MacOS/GRacket$(CS_GR_INSTALLED)" rm -rf $(DESTDIR)"$(libpltdir)/Starter.app" $(ICP) -r Starter.app $(DESTDIR)"$(libpltdir)/." diff --git a/racket/src/cs/rumble/version.ss b/racket/src/cs/rumble/version.ss index d7722a9dd1..002b5506e4 100644 --- a/racket/src/cs/rumble/version.ss +++ b/racket/src/cs/rumble/version.ss @@ -1,7 +1,7 @@ (define-syntax (extract-version-string stx) (#%call-with-input-file - "../racket/src/schvers.h" + "../version/racket_version.h" (lambda (i) (let ([to-find "#define MZSCHEME_VERSION_"]) (let numbers-loop ([numbers '()]) diff --git a/racket/src/mzcom/mzcom.cxx b/racket/src/mzcom/mzcom.cxx index 919d5e8f9b..de1b185947 100644 --- a/racket/src/mzcom/mzcom.cxx +++ b/racket/src/mzcom/mzcom.cxx @@ -3,7 +3,7 @@ // This file is not xformed for 3m. There's just one // bit of conditional compilation on MZCOM_3M. -#include "../racket/src/schvers.h" +#include "../version/racket_version.h" #include "resource.h" #include diff --git a/racket/src/mzcom/mzobj.cxx b/racket/src/mzcom/mzobj.cxx index e874aa6650..e5d98725d4 100644 --- a/racket/src/mzcom/mzobj.cxx +++ b/racket/src/mzcom/mzobj.cxx @@ -309,7 +309,7 @@ static int record_at_exit(Scheme_At_Exit_Callback_Proc p) XFORM_SKIP_PROC } #define NO_TLS_INDEX_FOR_WIN_TLS 1 -#include "../racket/win_tls.inc" +#include "../bc/win_tls.inc" static unsigned WINAPI evalLoop(void *args) XFORM_SKIP_PROC { register_win_tls(); diff --git a/racket/src/racket/src/schvers.h b/racket/src/version/racket_version.h similarity index 100% rename from racket/src/racket/src/schvers.h rename to racket/src/version/racket_version.h diff --git a/racket/src/worksp/.gitignore b/racket/src/worksp/.gitignore index 151415a05f..391cca548c 100644 --- a/racket/src/worksp/.gitignore +++ b/racket/src/worksp/.gitignore @@ -36,5 +36,6 @@ cstartup.obj cstartup.exe /bc_suffix.h +/bc_suffix_new.h /compiled diff --git a/racket/src/worksp/build-cs.bat b/racket/src/worksp/build-cs.bat index 488127efe8..57b9968bf1 100644 --- a/racket/src/worksp/build-cs.bat +++ b/racket/src/worksp/build-cs.bat @@ -1,7 +1,7 @@ -set BUILD_LEVEL=3m +set BUILD_LEVEL=bc call build.bat -..\..\Racket3m.exe -O "info@compiler/cm" -l- setup --boot ../setup-go.rkt ../build/compiled ^ +..\..\RacketBC.exe -O "info@compiler/cm" -l- setup --boot ../setup-go.rkt ../build/compiled ^ ignored ../build/ignored.d ^ csbuild.rkt ^ --racketcs-suffix "" --pull ^ diff --git a/racket/src/worksp/build.bat b/racket/src/worksp/build.bat index 15e829ddfd..c8084dab0b 100644 --- a/racket/src/worksp/build.bat +++ b/racket/src/worksp/build.bat @@ -12,7 +12,10 @@ cl genvsx.c genvsx.exe if errorlevel 1 (set PLTSLNVER=X) -echo #define COMPILED_PATH_AS%BC_SUFFIX% > bc_suffix.h +echo #define COMPILED_PATH_AS%BC_SUFFIX% > bc_suffix_new.h +fc bc_suffix.h bc_suffix_new.h +if errorlevel 1 (copy bc_suffix_new.h bc_suffix.h) +del bc_suffix_new.h if not exist ..\..\etc mkdir ..\..\etc if not exist ..\..\doc mkdir ..\..\doc @@ -21,14 +24,14 @@ if not exist ..\..\share mkdir ..\..\share if not defined BUILD_CONFIG set BUILD_CONFIG=..\..\etc cl cstartup.c -cstartup.exe ..\racket\src\startup.inc libracket\startup.inc +cstartup.exe ..\bc\src\startup.inc libracket\startup.inc if errorlevel 1 exit /B 1 if not exist libracket\cstartup.inc echo #include "startup.inc" > libracket\cstartup.inc cd racket msbuild racket%PLTSLNVER%.sln /p:Configuration=Release /p:Platform=%BUILDMODE% if errorlevel 1 exit /B 1 -..\..\..\racketcgc -cu ..\..\racket\src\compile-startup.rkt ..\libracket\cstartup.inc ..\libracket\cstartup.zo ..\..\racket\src\startup.inc ..\..\racket\src\schvers.h +..\..\..\racketcgc -cu ..\..\bc\src\compile-startup.rkt ..\libracket\cstartup.inc ..\libracket\cstartup.zo ..\..\bc\src\startup.inc ..\..\version\racket_version.h if errorlevel 1 exit /B 1 msbuild racket%PLTSLNVER%.sln /p:Configuration=Release /p:Platform=%BUILDMODE% diff --git a/racket/src/worksp/cs/libracket.rc b/racket/src/worksp/cs/libracket.rc index 0172fb9cf4..99c19ebe05 100644 --- a/racket/src/worksp/cs/libracket.rc +++ b/racket/src/worksp/cs/libracket.rc @@ -1,5 +1,5 @@ #include -#include "../../racket/src/schvers.h" +#include "../../version/racket_version.h" ///////////////////////////////////////////////////////////////////////////// // diff --git a/racket/src/worksp/gc2/make.rkt b/racket/src/worksp/gc2/make.rkt index 3c65f63d62..66df113411 100644 --- a/racket/src/worksp/gc2/make.rkt +++ b/racket/src/worksp/gc2/make.rkt @@ -1,7 +1,7 @@ #lang racket/base (require racket/system racket/cmdline - (for-label "../../racket/gc2/xform-mod.rkt")) + (for-label "../../bc/gc2/xform-mod.rkt")) (define suffix "") @@ -150,7 +150,7 @@ "-o" dest src)))]) - (dynamic-require "../../racket/gc2/xform-mod.rkt" #f) + (dynamic-require "../../bc/gc2/xform-mod.rkt" #f) (set! success? #t))))) (unless success? (when (file-exists? dest) @@ -177,7 +177,7 @@ (unless (system- (format "~a ~a /MT /Zi /GS- ~a /c ~a /Fdxsrc/ /Fo~a" cl.exe flags opt-flags c o)) (error "failed compile")))) -(define common-deps (list "../../racket/gc2/xform-mod.rkt")) +(define common-deps (list "../../bc/gc2/xform-mod.rkt")) (define (find-build-file d f) (define (find-release d2) @@ -198,22 +198,23 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define mz-inc - (string-append "/I../../racket/include " + (string-append "/I../../bc/include " + "/I../../version " "/I../../rktio " "/I../librktio " "/I../libracket " "/I.. ")) -(try "precomp.c" (list* "../../racket/src/schvers.h" +(try "precomp.c" (list* "../../version/racket_version.h" common-deps) "xsrc/precomp.h" #f - (string-append mz-inc "/I ../../racket/src") + (string-append mz-inc "/I ../../bc/src") #f "" "" #f #f) (for-each (lambda (x) - (try (format "../../racket/src/~a.c" x) - (list* (format "../../racket/src/~a.c" x) + (try (format "../../bc/src/~a.c" x) + (list* (format "../../bc/src/~a.c" x) common-deps) (format "xsrc/~a.c" x) (format "xsrc/~a.obj" x) @@ -233,8 +234,8 @@ "" "/D MZ_NO_LIBRACKET_DLL ")) -(try "../../racket/main.c" - (list* "../../racket/main.c" +(try "../../bc/main.c" + (list* "../../bc/main.c" common-deps) "xsrc/main.c" "xsrc/main.obj" @@ -245,33 +246,33 @@ #f #t) -(try "../../foreign/foreign.c" - (list* "../../foreign/foreign.c" +(try "../../bc/foreign/foreign.c" + (list* "../../bc/foreign/foreign.c" common-deps) "xsrc/foreign.c" "xsrc/foreign.obj" (string-append mz-inc "/I../libffi " - "/I../../foreign/libffi/src/x86 " - "/I../../foreign/libffi/include " - "/I../../racket/src ") + "/I../../bc/foreign/libffi/src/x86 " + "/I../../bc/foreign/libffi/include " + "/I../../bc/src ") #f "" "" #f #f) -(c-compile "../../racket/gc2/gc2.c" "xsrc/gc2.obj" +(c-compile "../../bc/gc2/gc2.c" "xsrc/gc2.obj" (append (list "../mzconfig.h") - (map (lambda (f) (build-path "../../racket/" f)) + (map (lambda (f) (build-path "../../bc/" f)) '("include/scheme.h" "include/schthread.h" "sconfig.h" "src/schpriv.h" "src/stypes.h")) - (map (lambda (f) (build-path "../../racket/gc2/" f)) + (map (lambda (f) (build-path "../../bc/gc2/" f)) '("gc2.c" "newgc.c" "vm_win.c" @@ -285,7 +286,7 @@ "/D MZ_GC_BACKTRACE " "") mz-inc)) -(c-compile "../../racket/src/mzsj86.c" "xsrc/mzsj86.obj" '() mz-inc) +(c-compile "../../bc/src/mzsj86.c" "xsrc/mzsj86.obj" '() mz-inc) (define dll "../../../lib/libracket3mxxxxxxx.dll") (define exe (format "../../../Racket~a.exe" suffix)) @@ -386,13 +387,13 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(define wx-inc (string-append "/I ../../racket/include " +(define wx-inc (string-append "/I ../../bc/include " "/I .. " "/I ../../racket " - "/I ../../racket/gc2 ")) + "/I ../../bc/gc2 ")) -(try "../../gracket/grmain.c" - (list* "../../gracket/grmain.c" +(try "../../bc/gracket/grmain.c" + (list* "../../bc/gracket/grmain.c" common-deps) "xsrc/grmain.c" "xsrc/grmain.obj" @@ -419,9 +420,9 @@ (system- (format "mt.exe -manifest ../gracket/gracket.manifest -outputresource:~a;1" gui-exe)) -(system- (format "~a /MT /O2 /DMZ_PRECISE_GC /I../../racket/include /I.. /c ../../racket/dynsrc/mzdyn.c /Fomzdyn3m.obj" +(system- (format "~a /MT /O2 /DMZ_PRECISE_GC /I../../bc/include /I.. /c ../../bc/dynsrc/mzdyn.c /Fomzdyn3m.obj" cl.exe)) -(system- (format "lib.exe -machine:~a -def:../../racket/dynsrc/mzdyn.def -out:mzdyn3m.lib" +(system- (format "lib.exe -machine:~a -def:../../bc/dynsrc/mzdyn.def -out:mzdyn3m.lib" (if win64? "x64" "X86"))) (define (copy-file/diff src dest) @@ -437,4 +438,4 @@ (when (equal? suffix "") (parameterize ([current-command-line-arguments (vector "../../../lib/system.rktd")]) - (dynamic-require "../../racket/mksystem.rkt" #f))) + (dynamic-require "../../bc/mksystem.rkt" #f))) diff --git a/racket/src/worksp/gracket/gracket.rc b/racket/src/worksp/gracket/gracket.rc index 598fbb6caf..51962ac4ee 100644 --- a/racket/src/worksp/gracket/gracket.rc +++ b/racket/src/worksp/gracket/gracket.rc @@ -1,5 +1,5 @@ #include -#include "../../racket/src/schvers.h" +#include "../../version/racket_version.h" ///////////////////////////////////////////////////////////////////////////// // diff --git a/racket/src/worksp/gracket/gracket.vcproj b/racket/src/worksp/gracket/gracket.vcproj index d189fecf92..c8952c90a9 100644 --- a/racket/src/worksp/gracket/gracket.vcproj +++ b/racket/src/worksp/gracket/gracket.vcproj @@ -32,7 +32,7 @@ InlineFunctionExpansion="2" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="..,..\..\racket\include" + AdditionalIncludeDirectories="..,..\..\bc\include" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,__WINDOWS__,GC_DLL,__STDC__,_CRT_SECURE_NO_DEPRECATE,USE_SENORA_GC" StringPooling="true" RuntimeLibrary="0" @@ -80,7 +80,7 @@ - ..;..\..\racket\gc;..\..\racket\include;%(AdditionalIncludeDirectories) + ..;..\..\bc\gc;..\..\bc\include;%(AdditionalIncludeDirectories) Level3 true @@ -121,7 +121,7 @@ addman.bat - + diff --git a/racket/src/worksp/libffi/libffi.vcproj b/racket/src/worksp/libffi/libffi.vcproj index b833de2691..4109ee88a0 100644 --- a/racket/src/worksp/libffi/libffi.vcproj +++ b/racket/src/worksp/libffi/libffi.vcproj @@ -29,7 +29,7 @@ Disabled - ..\libffi;..\..\foreign\libffi\include;..\..\foreign\libffi\src\x86;%(AdditionalIncludeDirectories) + ..\libffi;..\..\bc\foreign\libffi\include;..\..\bc\foreign\libffi\src\x86;%(AdditionalIncludeDirectories) true @@ -116,27 +116,27 @@ - - - - - + + + + + - cl.exe /EP /I . /I ../../foreign/libffi/src/x86 win32.asm > Release/win32_plain.asm + cl.exe /EP /I . /I ../../bc/foreign/libffi/src/x86 win32.asm > Release/win32_plain.asm ml.exe /c /Cx /coff /safeseh /Fo Release/win32.obj Release/win32_plain.asm Release/win32.obj;%(Outputs) - cl.exe /EP /I . /I ../../foreign/libffi/src/x86 win32.asm > x64/Release/win32_plain.asm + cl.exe /EP /I . /I ../../bc/foreign/libffi/src/x86 win32.asm > x64/Release/win32_plain.asm ml64.exe /c /Cx /Fo x64/Release/win32.obj x64/Release/win32_plain.asm x64/Release/win32.obj;%(Outputs) - cl.exe /EP /I . /I ../../foreign/libffi/src/x86 win32.asm > Release/win32_plain.asm + cl.exe /EP /I . /I ../../bc/foreign/libffi/src/x86 win32.asm > Release/win32_plain.asm ml.exe /c /Cx /coff /safeseh /Fo Release/win32.obj Release/win32_plain.asm Release/win32.obj;%(Outputs) - cl.exe /EP /I . /I ../../foreign/libffi/src/x86 win32.asm > x64/Release/win32_plain.asm + cl.exe /EP /I . /I ../../bc/foreign/libffi/src/x86 win32.asm > x64/Release/win32_plain.asm ml64.exe /c /Cx /Fo x64/Release/win32.obj x64/Release/win32_plain.asm x64/Release/win32.obj;%(Outputs) diff --git a/racket/src/worksp/libffi/win32.asm b/racket/src/worksp/libffi/win32.asm index 4e7d0e3bff..5f1cff1d38 100644 --- a/racket/src/worksp/libffi/win32.asm +++ b/racket/src/worksp/libffi/win32.asm @@ -1,5 +1,5 @@ #ifdef _WIN64 -# include "../../foreign/libffi/src/x86/win64.S" +# include "../../bc/foreign/libffi/src/x86/win64.S" #else -# include "../../foreign/libffi/src/x86/win32.S" +# include "../../bc/foreign/libffi/src/x86/win32.S" #endif diff --git a/racket/src/worksp/libracket/libracket.vcproj b/racket/src/worksp/libracket/libracket.vcproj index dc88179079..d626ca5248 100644 --- a/racket/src/worksp/libracket/libracket.vcproj +++ b/racket/src/worksp/libracket/libracket.vcproj @@ -30,7 +30,7 @@ diff --git a/racket/src/worksp/libracket/libracket.vcxproj b/racket/src/worksp/libracket/libracket.vcxproj index 8dcbd5b745..9a4e381408 100644 --- a/racket/src/worksp/libracket/libracket.vcxproj +++ b/racket/src/worksp/libracket/libracket.vcxproj @@ -45,7 +45,7 @@ - ..;..\..\racket\include;..\..\racket\src;..\libffi;..\..\foreign\libffi\src\x86;..\..\foreign\libffi\include;..\..\rktio;..\librktio;..\libracket + ..;..\..\bc\include;..\..\bc\src;..\..\version;..\libffi;..\..\bc\foreign\libffi\src\x86;..\..\bc\foreign\libffi\include;..\..\rktio;..\librktio;..\libracket true Level3 @@ -112,69 +112,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - ml64.exe /c /Cx /Fo $(Platform)\$(Configuration)\mzsj86w64.obj ..\..\racket\src\mzsj86w64.S + + ml64.exe /c /Cx /Fo $(Platform)\$(Configuration)\mzsj86w64.obj ..\..\bc\src\mzsj86w64.S $(Platform)\$(Configuration)\mzsj86w64.obj;%(Outputs) diff --git a/racket/src/worksp/mzcom/mzcom.rc b/racket/src/worksp/mzcom/mzcom.rc index 8a22631b88..637d3234f5 100644 --- a/racket/src/worksp/mzcom/mzcom.rc +++ b/racket/src/worksp/mzcom/mzcom.rc @@ -2,7 +2,7 @@ // #include "resource.h" #include -#include "../../racket/src/schvers.h" +#include "../../version/racket_version.h" ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources diff --git a/racket/src/worksp/mzcom/mzcom.vcproj b/racket/src/worksp/mzcom/mzcom.vcproj index 1439fbf790..2d0d24721a 100644 --- a/racket/src/worksp/mzcom/mzcom.vcproj +++ b/racket/src/worksp/mzcom/mzcom.vcproj @@ -34,7 +34,7 @@ $(OutDir)mzcom.tlb - ..;..\..\racket\include;.;%(AdditionalIncludeDirectories) + ..;..\..\bc\include;.;%(AdditionalIncludeDirectories) Level3 true diff --git a/racket/src/worksp/mzcom/xform.rkt b/racket/src/worksp/mzcom/xform.rkt index f38f0c3dd4..b87d7c8148 100644 --- a/racket/src/worksp/mzcom/xform.rkt +++ b/racket/src/worksp/mzcom/xform.rkt @@ -1,8 +1,8 @@ #lang racket/base -(require (for-label "../../racket/gc2/xform-mod.rkt")) +(require (for-label "../../bc/gc2/xform-mod.rkt")) (define cpp-flags "/D _CRT_SECURE_NO_DEPRECATE /D WIN32 /D _USE_DECLSPECS_FOR_SAL=0 /D _USE_ATTRIBUTES_FOR_SAL=0") -(define includes "/I ../../racket/include /I . /I .. /I ../../mzcom") +(define includes "/I ../../bc/include /I . /I .. /I ../../mzcom") (define (xform src dest) (parameterize ([current-command-line-arguments @@ -18,6 +18,6 @@ "-o" dest src)))]) - (dynamic-require "../../racket/gc2/xform-mod.rkt" #f))) + (dynamic-require "../../bc/gc2/xform-mod.rkt" #f))) (xform "../../mzcom/mzobj.cxx" "../../mzcom/mzobj3m.cxx") diff --git a/racket/src/worksp/racket/racket.rc b/racket/src/worksp/racket/racket.rc index c32b3c94e2..22df204086 100644 --- a/racket/src/worksp/racket/racket.rc +++ b/racket/src/worksp/racket/racket.rc @@ -1,5 +1,5 @@ #include -#include "../../racket/src/schvers.h" +#include "../../version/racket_version.h" ///////////////////////////////////////////////////////////////////////////// // diff --git a/racket/src/worksp/racket/racket.vcproj b/racket/src/worksp/racket/racket.vcproj index 8f5e1397ab..323d315239 100644 --- a/racket/src/worksp/racket/racket.vcproj +++ b/racket/src/worksp/racket/racket.vcproj @@ -30,7 +30,7 @@ @@ -244,7 +244,7 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90" > - ..;..\..\racket\include + ..;..\..\bc\include Level3 true @@ -76,9 +76,9 @@ if exist "$(TargetPath)" goto :MzOK echo Error: did not find $(TargetPath) exit 1 :MzOK -"$(TargetPath)" -cu ..\..\racket\mkincludes.rkt "$(TargetDir)/include/" ..\..\racket .. +"$(TargetPath)" -cu ..\..\bc\mkincludes.rkt "$(TargetDir)/include/" ..\..\bc .. if errorlevel 1 exit 1 -cd ..\..\racket\dynsrc +cd ..\..\bc\dynsrc call mkmzdyn.bat $(Configuration) $(Platform) cd ..\..\worksp\racket addman.bat @@ -130,7 +130,7 @@ addman.bat - + diff --git a/racket/src/worksp/sgc/sgc.vcproj b/racket/src/worksp/sgc/sgc.vcproj index 25bcb9fd2b..a8fdcabc60 100644 --- a/racket/src/worksp/sgc/sgc.vcproj +++ b/racket/src/worksp/sgc/sgc.vcproj @@ -149,7 +149,7 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > diff --git a/racket/src/worksp/sgc/sgc.vcxproj b/racket/src/worksp/sgc/sgc.vcxproj index ef5b6ddedc..8c7147147c 100644 --- a/racket/src/worksp/sgc/sgc.vcxproj +++ b/racket/src/worksp/sgc/sgc.vcxproj @@ -137,7 +137,7 @@ - + diff --git a/racket/src/worksp/starters/start.rc b/racket/src/worksp/starters/start.rc index b6a82e6e64..1ef0622644 100644 --- a/racket/src/worksp/starters/start.rc +++ b/racket/src/worksp/starters/start.rc @@ -1,5 +1,5 @@ #include -#include "../../racket/src/schvers.h" +#include "../../version/racket_version.h" ///////////////////////////////////////////////////////////////////////////// //