From b058be9bfcf1d256c982a80fbec550fa670f659c Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 29 Apr 2021 19:18:23 -0600 Subject: [PATCH] Chez Scheme: clean up "Mf-" and ".def" Replace lots of mostly-duplicated "Mf-" and ".def" files with just a few "Mf-unix" and and "unix.def" files plus configuration within "configure" and "workarea". Also change "version.h" to infer more OS details (as was used for pb, anyway). This change simplifies setting up configurations for different platforms, and it makes it easier to share among similar configurations. --- .makefile | 2 +- Makefile | 12 +- racket/src/ChezScheme/IMPLEMENTATION.md | 49 ++--- racket/src/ChezScheme/c/Mf-a6fb | 45 ----- racket/src/ChezScheme/c/Mf-a6le | 44 ----- racket/src/ChezScheme/c/Mf-a6nb | 46 ----- racket/src/ChezScheme/c/Mf-a6nt | 1 - racket/src/ChezScheme/c/Mf-a6ob | 45 ----- racket/src/ChezScheme/c/Mf-a6osx | 44 ----- racket/src/ChezScheme/c/Mf-a6s2 | 44 ----- racket/src/ChezScheme/c/Mf-arm32le | 44 ----- racket/src/ChezScheme/c/Mf-arm64le | 44 ----- racket/src/ChezScheme/c/Mf-arm64osx | 44 ----- racket/src/ChezScheme/c/Mf-base | 3 + racket/src/ChezScheme/c/Mf-i3fb | 45 ----- racket/src/ChezScheme/c/Mf-i3le | 44 ----- racket/src/ChezScheme/c/Mf-i3nb | 46 ----- racket/src/ChezScheme/c/Mf-i3nt | 1 - racket/src/ChezScheme/c/Mf-i3ob | 45 ----- racket/src/ChezScheme/c/Mf-i3osx | 44 ----- racket/src/ChezScheme/c/Mf-i3qnx | 45 ----- racket/src/ChezScheme/c/Mf-i3s2 | 44 ----- racket/src/ChezScheme/c/Mf-pb | 9 - racket/src/ChezScheme/c/Mf-ppc32le | 44 ----- racket/src/ChezScheme/c/Mf-ppc32osx | 32 ---- racket/src/ChezScheme/c/Mf-ta6fb | 5 - racket/src/ChezScheme/c/Mf-ta6le | 5 - racket/src/ChezScheme/c/Mf-ta6nb | 6 - racket/src/ChezScheme/c/Mf-ta6nt | 1 - racket/src/ChezScheme/c/Mf-ta6ob | 5 - racket/src/ChezScheme/c/Mf-ta6osx | 5 - racket/src/ChezScheme/c/Mf-ta6s2 | 5 - racket/src/ChezScheme/c/Mf-tarm32le | 5 - racket/src/ChezScheme/c/Mf-tarm64le | 5 - racket/src/ChezScheme/c/Mf-tarm64osx | 5 - racket/src/ChezScheme/c/Mf-ti3fb | 5 - racket/src/ChezScheme/c/Mf-ti3le | 5 - racket/src/ChezScheme/c/Mf-ti3nb | 5 - racket/src/ChezScheme/c/Mf-ti3nt | 1 - racket/src/ChezScheme/c/Mf-ti3ob | 5 - racket/src/ChezScheme/c/Mf-ti3osx | 5 - racket/src/ChezScheme/c/Mf-ti3s2 | 5 - racket/src/ChezScheme/c/Mf-tppc32le | 5 - racket/src/ChezScheme/c/Mf-tppc32osx | 5 - racket/src/ChezScheme/c/Mf-unix | 25 +++ racket/src/ChezScheme/c/version.h | 156 +++------------- racket/src/ChezScheme/configure | 157 ++++++++++++++-- racket/src/ChezScheme/mats/6.ms | 6 +- racket/src/ChezScheme/mats/Mf-a6fb | 27 --- racket/src/ChezScheme/mats/Mf-a6le | 27 --- racket/src/ChezScheme/mats/Mf-a6nb | 27 --- racket/src/ChezScheme/mats/Mf-a6nt | 1 - racket/src/ChezScheme/mats/Mf-a6ob | 27 --- racket/src/ChezScheme/mats/Mf-a6osx | 27 --- racket/src/ChezScheme/mats/Mf-a6s2 | 27 --- racket/src/ChezScheme/mats/Mf-arm32le | 27 --- racket/src/ChezScheme/mats/Mf-arm64le | 27 --- racket/src/ChezScheme/mats/Mf-i3fb | 27 --- racket/src/ChezScheme/mats/Mf-i3le | 27 --- racket/src/ChezScheme/mats/Mf-i3nb | 27 --- racket/src/ChezScheme/mats/Mf-i3nt | 1 - racket/src/ChezScheme/mats/Mf-i3ob | 27 --- racket/src/ChezScheme/mats/Mf-i3osx | 27 --- racket/src/ChezScheme/mats/Mf-i3qnx | 27 --- racket/src/ChezScheme/mats/Mf-i3s2 | 27 --- racket/src/ChezScheme/mats/Mf-pb | 5 - racket/src/ChezScheme/mats/Mf-ppc32le | 27 --- racket/src/ChezScheme/mats/Mf-ppc32osx | 14 -- racket/src/ChezScheme/mats/Mf-ta6fb | 7 - racket/src/ChezScheme/mats/Mf-ta6le | 7 - racket/src/ChezScheme/mats/Mf-ta6nb | 7 - racket/src/ChezScheme/mats/Mf-ta6nt | 1 - racket/src/ChezScheme/mats/Mf-ta6ob | 7 - racket/src/ChezScheme/mats/Mf-ta6osx | 5 - racket/src/ChezScheme/mats/Mf-ta6s2 | 7 - racket/src/ChezScheme/mats/Mf-tarm32le | 5 - racket/src/ChezScheme/mats/Mf-tarm64le | 5 - racket/src/ChezScheme/mats/Mf-tarm64osx | 5 - racket/src/ChezScheme/mats/Mf-ti3fb | 7 - racket/src/ChezScheme/mats/Mf-ti3le | 7 - racket/src/ChezScheme/mats/Mf-ti3nb | 7 - racket/src/ChezScheme/mats/Mf-ti3nt | 1 - racket/src/ChezScheme/mats/Mf-ti3ob | 7 - racket/src/ChezScheme/mats/Mf-ti3osx | 5 - racket/src/ChezScheme/mats/Mf-ti3s2 | 7 - racket/src/ChezScheme/mats/Mf-tppc32le | 7 - racket/src/ChezScheme/mats/Mf-tppc32osx | 5 - .../ChezScheme/mats/{Mf-arm64osx => Mf-unix} | 8 +- racket/src/ChezScheme/rktboot/constant.rkt | 13 +- racket/src/ChezScheme/rktboot/machine-def.rkt | 28 +++ racket/src/ChezScheme/rktboot/make-boot.rkt | 17 +- racket/src/ChezScheme/rktboot/scheme-lang.rkt | 11 +- racket/src/ChezScheme/s/Mf-a6fb | 19 -- racket/src/ChezScheme/s/Mf-a6le | 19 -- racket/src/ChezScheme/s/Mf-a6nb | 19 -- racket/src/ChezScheme/s/Mf-a6nt | 1 - racket/src/ChezScheme/s/Mf-a6ob | 19 -- racket/src/ChezScheme/s/Mf-a6osx | 19 -- racket/src/ChezScheme/s/Mf-a6s2 | 19 -- racket/src/ChezScheme/s/Mf-arm32le | 21 --- racket/src/ChezScheme/s/Mf-arm64le | 21 --- racket/src/ChezScheme/s/Mf-arm64osx | 21 --- racket/src/ChezScheme/s/Mf-cross | 4 +- racket/src/ChezScheme/s/Mf-i3fb | 19 -- racket/src/ChezScheme/s/Mf-i3le | 19 -- racket/src/ChezScheme/s/Mf-i3nb | 19 -- racket/src/ChezScheme/s/Mf-i3nt | 1 - racket/src/ChezScheme/s/Mf-i3ob | 19 -- racket/src/ChezScheme/s/Mf-i3osx | 19 -- racket/src/ChezScheme/s/Mf-i3qnx | 19 -- racket/src/ChezScheme/s/Mf-i3s2 | 19 -- racket/src/ChezScheme/s/Mf-pb | 6 - racket/src/ChezScheme/s/Mf-ppc32le | 21 --- racket/src/ChezScheme/s/Mf-ppc32osx | 6 - racket/src/ChezScheme/s/Mf-ta6fb | 18 -- racket/src/ChezScheme/s/Mf-ta6le | 18 -- racket/src/ChezScheme/s/Mf-ta6nb | 18 -- racket/src/ChezScheme/s/Mf-ta6nt | 1 - racket/src/ChezScheme/s/Mf-ta6ob | 18 -- racket/src/ChezScheme/s/Mf-ta6osx | 18 -- racket/src/ChezScheme/s/Mf-ta6s2 | 18 -- racket/src/ChezScheme/s/Mf-tarm32le | 18 -- racket/src/ChezScheme/s/Mf-tarm64le | 18 -- racket/src/ChezScheme/s/Mf-tarm64osx | 18 -- racket/src/ChezScheme/s/Mf-ti3fb | 19 -- racket/src/ChezScheme/s/Mf-ti3le | 19 -- racket/src/ChezScheme/s/Mf-ti3nb | 19 -- racket/src/ChezScheme/s/Mf-ti3nt | 1 - racket/src/ChezScheme/s/Mf-ti3ob | 19 -- racket/src/ChezScheme/s/Mf-ti3osx | 18 -- racket/src/ChezScheme/s/Mf-ti3s2 | 19 -- racket/src/ChezScheme/s/Mf-tppc32le | 18 -- racket/src/ChezScheme/s/Mf-tppc32osx | 5 - racket/src/ChezScheme/s/Mf-unix | 1 + racket/src/ChezScheme/s/a6fb.def | 19 -- racket/src/ChezScheme/s/a6le.def | 19 -- racket/src/ChezScheme/s/a6nb.def | 19 -- racket/src/ChezScheme/s/a6ob.def | 19 -- racket/src/ChezScheme/s/a6osx.def | 19 -- racket/src/ChezScheme/s/a6s2.def | 19 -- racket/src/ChezScheme/s/arm32le.def | 19 -- racket/src/ChezScheme/s/arm64le.def | 6 - racket/src/ChezScheme/s/i3fb.def | 19 -- racket/src/ChezScheme/s/i3le.def | 19 -- racket/src/ChezScheme/s/i3nb.def | 19 -- racket/src/ChezScheme/s/i3ob.def | 19 -- racket/src/ChezScheme/s/i3osx.def | 19 -- racket/src/ChezScheme/s/i3s2.def | 19 -- racket/src/ChezScheme/s/mkheader.ss | 2 + racket/src/ChezScheme/s/ppc32le.def | 19 -- racket/src/ChezScheme/s/ta6fb.def | 19 -- racket/src/ChezScheme/s/ta6le.def | 19 -- racket/src/ChezScheme/s/ta6nb.def | 19 -- racket/src/ChezScheme/s/ta6ob.def | 19 -- racket/src/ChezScheme/s/ta6osx.def | 19 -- racket/src/ChezScheme/s/ta6s2.def | 19 -- racket/src/ChezScheme/s/tarm32le.def | 19 -- racket/src/ChezScheme/s/tarm64le.def | 6 - racket/src/ChezScheme/s/tarm64osx.def | 6 - racket/src/ChezScheme/s/ti3fb.def | 19 -- racket/src/ChezScheme/s/ti3le.def | 19 -- racket/src/ChezScheme/s/ti3nb.def | 19 -- racket/src/ChezScheme/s/ti3ob.def | 19 -- racket/src/ChezScheme/s/ti3osx.def | 19 -- racket/src/ChezScheme/s/ti3s2.def | 19 -- racket/src/ChezScheme/s/tppc32le.def | 19 -- racket/src/ChezScheme/s/tunix.def | 7 + racket/src/ChezScheme/s/unix.def | 7 + racket/src/ChezScheme/workarea | 172 +++++++++++------- 169 files changed, 410 insertions(+), 2915 deletions(-) delete mode 100644 racket/src/ChezScheme/c/Mf-a6fb delete mode 100644 racket/src/ChezScheme/c/Mf-a6le delete mode 100644 racket/src/ChezScheme/c/Mf-a6nb delete mode 100644 racket/src/ChezScheme/c/Mf-a6ob delete mode 100644 racket/src/ChezScheme/c/Mf-a6osx delete mode 100644 racket/src/ChezScheme/c/Mf-a6s2 delete mode 100644 racket/src/ChezScheme/c/Mf-arm32le delete mode 100644 racket/src/ChezScheme/c/Mf-arm64le delete mode 100644 racket/src/ChezScheme/c/Mf-arm64osx delete mode 100644 racket/src/ChezScheme/c/Mf-i3fb delete mode 100644 racket/src/ChezScheme/c/Mf-i3le delete mode 100644 racket/src/ChezScheme/c/Mf-i3nb delete mode 100644 racket/src/ChezScheme/c/Mf-i3ob delete mode 100644 racket/src/ChezScheme/c/Mf-i3osx delete mode 100644 racket/src/ChezScheme/c/Mf-i3qnx delete mode 100644 racket/src/ChezScheme/c/Mf-i3s2 delete mode 100644 racket/src/ChezScheme/c/Mf-pb delete mode 100644 racket/src/ChezScheme/c/Mf-ppc32le delete mode 100644 racket/src/ChezScheme/c/Mf-ppc32osx delete mode 100644 racket/src/ChezScheme/c/Mf-ta6fb delete mode 100644 racket/src/ChezScheme/c/Mf-ta6le delete mode 100644 racket/src/ChezScheme/c/Mf-ta6nb delete mode 100644 racket/src/ChezScheme/c/Mf-ta6ob delete mode 100644 racket/src/ChezScheme/c/Mf-ta6osx delete mode 100644 racket/src/ChezScheme/c/Mf-ta6s2 delete mode 100644 racket/src/ChezScheme/c/Mf-tarm32le delete mode 100644 racket/src/ChezScheme/c/Mf-tarm64le delete mode 100644 racket/src/ChezScheme/c/Mf-tarm64osx delete mode 100644 racket/src/ChezScheme/c/Mf-ti3fb delete mode 100644 racket/src/ChezScheme/c/Mf-ti3le delete mode 100644 racket/src/ChezScheme/c/Mf-ti3nb delete mode 100644 racket/src/ChezScheme/c/Mf-ti3ob delete mode 100644 racket/src/ChezScheme/c/Mf-ti3osx delete mode 100644 racket/src/ChezScheme/c/Mf-ti3s2 delete mode 100644 racket/src/ChezScheme/c/Mf-tppc32le delete mode 100644 racket/src/ChezScheme/c/Mf-tppc32osx create mode 100644 racket/src/ChezScheme/c/Mf-unix delete mode 100644 racket/src/ChezScheme/mats/Mf-a6fb delete mode 100644 racket/src/ChezScheme/mats/Mf-a6le delete mode 100644 racket/src/ChezScheme/mats/Mf-a6nb delete mode 100644 racket/src/ChezScheme/mats/Mf-a6ob delete mode 100644 racket/src/ChezScheme/mats/Mf-a6osx delete mode 100644 racket/src/ChezScheme/mats/Mf-a6s2 delete mode 100644 racket/src/ChezScheme/mats/Mf-arm32le delete mode 100644 racket/src/ChezScheme/mats/Mf-arm64le delete mode 100644 racket/src/ChezScheme/mats/Mf-i3fb delete mode 100644 racket/src/ChezScheme/mats/Mf-i3le delete mode 100644 racket/src/ChezScheme/mats/Mf-i3nb delete mode 100644 racket/src/ChezScheme/mats/Mf-i3ob delete mode 100644 racket/src/ChezScheme/mats/Mf-i3osx delete mode 100644 racket/src/ChezScheme/mats/Mf-i3qnx delete mode 100644 racket/src/ChezScheme/mats/Mf-i3s2 delete mode 100644 racket/src/ChezScheme/mats/Mf-pb delete mode 100644 racket/src/ChezScheme/mats/Mf-ppc32le delete mode 100644 racket/src/ChezScheme/mats/Mf-ppc32osx delete mode 100644 racket/src/ChezScheme/mats/Mf-ta6fb delete mode 100644 racket/src/ChezScheme/mats/Mf-ta6le delete mode 100644 racket/src/ChezScheme/mats/Mf-ta6nb delete mode 100644 racket/src/ChezScheme/mats/Mf-ta6ob delete mode 100644 racket/src/ChezScheme/mats/Mf-ta6osx delete mode 100644 racket/src/ChezScheme/mats/Mf-ta6s2 delete mode 100644 racket/src/ChezScheme/mats/Mf-tarm32le delete mode 100644 racket/src/ChezScheme/mats/Mf-tarm64le delete mode 100644 racket/src/ChezScheme/mats/Mf-tarm64osx delete mode 100644 racket/src/ChezScheme/mats/Mf-ti3fb delete mode 100644 racket/src/ChezScheme/mats/Mf-ti3le delete mode 100644 racket/src/ChezScheme/mats/Mf-ti3nb delete mode 100644 racket/src/ChezScheme/mats/Mf-ti3ob delete mode 100644 racket/src/ChezScheme/mats/Mf-ti3osx delete mode 100644 racket/src/ChezScheme/mats/Mf-ti3s2 delete mode 100644 racket/src/ChezScheme/mats/Mf-tppc32le delete mode 100644 racket/src/ChezScheme/mats/Mf-tppc32osx rename racket/src/ChezScheme/mats/{Mf-arm64osx => Mf-unix} (51%) create mode 100644 racket/src/ChezScheme/rktboot/machine-def.rkt delete mode 100644 racket/src/ChezScheme/s/Mf-a6fb delete mode 100644 racket/src/ChezScheme/s/Mf-a6le delete mode 100644 racket/src/ChezScheme/s/Mf-a6nb delete mode 100644 racket/src/ChezScheme/s/Mf-a6ob delete mode 100644 racket/src/ChezScheme/s/Mf-a6osx delete mode 100644 racket/src/ChezScheme/s/Mf-a6s2 delete mode 100644 racket/src/ChezScheme/s/Mf-arm32le delete mode 100644 racket/src/ChezScheme/s/Mf-arm64le delete mode 100644 racket/src/ChezScheme/s/Mf-arm64osx delete mode 100644 racket/src/ChezScheme/s/Mf-i3fb delete mode 100644 racket/src/ChezScheme/s/Mf-i3le delete mode 100644 racket/src/ChezScheme/s/Mf-i3nb delete mode 100644 racket/src/ChezScheme/s/Mf-i3ob delete mode 100644 racket/src/ChezScheme/s/Mf-i3osx delete mode 100644 racket/src/ChezScheme/s/Mf-i3qnx delete mode 100644 racket/src/ChezScheme/s/Mf-i3s2 delete mode 100644 racket/src/ChezScheme/s/Mf-pb delete mode 100644 racket/src/ChezScheme/s/Mf-ppc32le delete mode 100644 racket/src/ChezScheme/s/Mf-ppc32osx delete mode 100644 racket/src/ChezScheme/s/Mf-ta6fb delete mode 100644 racket/src/ChezScheme/s/Mf-ta6le delete mode 100644 racket/src/ChezScheme/s/Mf-ta6nb delete mode 100644 racket/src/ChezScheme/s/Mf-ta6ob delete mode 100644 racket/src/ChezScheme/s/Mf-ta6osx delete mode 100644 racket/src/ChezScheme/s/Mf-ta6s2 delete mode 100644 racket/src/ChezScheme/s/Mf-tarm32le delete mode 100644 racket/src/ChezScheme/s/Mf-tarm64le delete mode 100644 racket/src/ChezScheme/s/Mf-tarm64osx delete mode 100644 racket/src/ChezScheme/s/Mf-ti3fb delete mode 100644 racket/src/ChezScheme/s/Mf-ti3le delete mode 100644 racket/src/ChezScheme/s/Mf-ti3nb delete mode 100644 racket/src/ChezScheme/s/Mf-ti3ob delete mode 100644 racket/src/ChezScheme/s/Mf-ti3osx delete mode 100644 racket/src/ChezScheme/s/Mf-ti3s2 delete mode 100644 racket/src/ChezScheme/s/Mf-tppc32le delete mode 100644 racket/src/ChezScheme/s/Mf-tppc32osx create mode 100644 racket/src/ChezScheme/s/Mf-unix delete mode 100644 racket/src/ChezScheme/s/a6fb.def delete mode 100644 racket/src/ChezScheme/s/a6le.def delete mode 100644 racket/src/ChezScheme/s/a6nb.def delete mode 100644 racket/src/ChezScheme/s/a6ob.def delete mode 100644 racket/src/ChezScheme/s/a6osx.def delete mode 100644 racket/src/ChezScheme/s/a6s2.def delete mode 100644 racket/src/ChezScheme/s/arm32le.def delete mode 100644 racket/src/ChezScheme/s/arm64le.def delete mode 100644 racket/src/ChezScheme/s/i3fb.def delete mode 100644 racket/src/ChezScheme/s/i3le.def delete mode 100644 racket/src/ChezScheme/s/i3nb.def delete mode 100644 racket/src/ChezScheme/s/i3ob.def delete mode 100644 racket/src/ChezScheme/s/i3osx.def delete mode 100644 racket/src/ChezScheme/s/i3s2.def delete mode 100644 racket/src/ChezScheme/s/ppc32le.def delete mode 100644 racket/src/ChezScheme/s/ta6fb.def delete mode 100644 racket/src/ChezScheme/s/ta6le.def delete mode 100644 racket/src/ChezScheme/s/ta6nb.def delete mode 100644 racket/src/ChezScheme/s/ta6ob.def delete mode 100644 racket/src/ChezScheme/s/ta6osx.def delete mode 100644 racket/src/ChezScheme/s/ta6s2.def delete mode 100644 racket/src/ChezScheme/s/tarm32le.def delete mode 100644 racket/src/ChezScheme/s/tarm64le.def delete mode 100644 racket/src/ChezScheme/s/tarm64osx.def delete mode 100644 racket/src/ChezScheme/s/ti3fb.def delete mode 100644 racket/src/ChezScheme/s/ti3le.def delete mode 100644 racket/src/ChezScheme/s/ti3nb.def delete mode 100644 racket/src/ChezScheme/s/ti3ob.def delete mode 100644 racket/src/ChezScheme/s/ti3osx.def delete mode 100644 racket/src/ChezScheme/s/ti3s2.def delete mode 100644 racket/src/ChezScheme/s/tppc32le.def create mode 100644 racket/src/ChezScheme/s/tunix.def create mode 100644 racket/src/ChezScheme/s/unix.def diff --git a/.makefile b/.makefile index 07f9a813f1..fd173a4ecf 100644 --- a/.makefile +++ b/.makefile @@ -344,7 +344,7 @@ RACKET_FOR_BOOTFILES = $(RACKET) RACKET_FOR_BUILD = $(RACKET) # This branch name changes each time the pb boot files are updated: -PB_BRANCH == circa-8.0.0.10-1 +PB_BRANCH == circa-8.1.0.4-1 PB_REPO = https://github.com/racket/pb # Set to empty for Git before v1.7.10: diff --git a/Makefile b/Makefile index b61148ac05..603230e6a6 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ RACKETCS_SUFFIX = RACKET = RACKET_FOR_BOOTFILES = $(RACKET) RACKET_FOR_BUILD = $(RACKET) -PB_BRANCH = circa-8.0.0.10-1 +PB_BRANCH = circa-8.1.0.4-1 PB_REPO = https://github.com/racket/pb SINGLE_BRANCH_FLAG = --single-branch EXTRA_REPOS_BASE = @@ -310,18 +310,18 @@ maybe-fetch-pb-as-is: echo done fetch-pb-from: mkdir -p racket/src/ChezScheme/boot - if [ ! -d racket/src/ChezScheme/boot/pb ] ; then git clone -q $(SINGLE_BRANCH_FLAG) -b circa-8.0.0.10-1 $(PB_REPO) racket/src/ChezScheme/boot/pb ; else cd racket/src/ChezScheme/boot/pb && git fetch -q origin circa-8.0.0.10-1:remotes/origin/circa-8.0.0.10-1 ; fi - cd racket/src/ChezScheme/boot/pb && git checkout -q circa-8.0.0.10-1 + if [ ! -d racket/src/ChezScheme/boot/pb ] ; then git clone -q $(SINGLE_BRANCH_FLAG) -b circa-8.1.0.4-1 $(PB_REPO) racket/src/ChezScheme/boot/pb ; else cd racket/src/ChezScheme/boot/pb && git fetch -q origin circa-8.1.0.4-1:remotes/origin/circa-8.1.0.4-1 ; fi + cd racket/src/ChezScheme/boot/pb && git checkout -q circa-8.1.0.4-1 pb-fetch: $(MAKE) fetch-pb EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" PB_REPO="$(PB_REPO)" SINGLE_BRANCH_FLAG="$(SINGLE_BRANCH_FLAG)" pb-build: cd racket/src/ChezScheme && racket rktboot/main.rkt --machine pb pb-stage: - cd racket/src/ChezScheme/boot/pb && git branch circa-8.0.0.10-1 - cd racket/src/ChezScheme/boot/pb && git checkout circa-8.0.0.10-1 + cd racket/src/ChezScheme/boot/pb && git branch circa-8.1.0.4-1 + cd racket/src/ChezScheme/boot/pb && git checkout circa-8.1.0.4-1 cd racket/src/ChezScheme/boot/pb && git add . && git commit --amend -m "new build" pb-push: - cd racket/src/ChezScheme/boot/pb && git push -u origin circa-8.0.0.10-1 + cd racket/src/ChezScheme/boot/pb && git push -u origin circa-8.1.0.4-1 win-cs-base: IF "$(RACKET_FOR_BUILD)" == "" $(MAKE) win-bc-then-cs-base SETUP_BOOT_MODE=--boot WIN32_BUILD_LEVEL=bc PLAIN_RACKET=racket\racketbc DISABLE_STATIC_LIBS="$(DISABLE_STATIC_LIBS)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" JOB_OPTIONS="$(JOB_OPTIONS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" IF not "$(RACKET_FOR_BUILD)" == "" $(MAKE) win-just-cs-base SETUP_BOOT_MODE=--chain DISABLE_STATIC_LIBS="$(DISABLE_STATIC_LIBS)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" JOB_OPTIONS="$(JOB_OPTIONS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" diff --git a/racket/src/ChezScheme/IMPLEMENTATION.md b/racket/src/ChezScheme/IMPLEMENTATION.md index 3b7c698a9b..b522dadcf6 100644 --- a/racket/src/ChezScheme/IMPLEMENTATION.md +++ b/racket/src/ChezScheme/IMPLEMENTATION.md @@ -23,9 +23,10 @@ Some key files in "s": * "x86_64.ss", "arm64.ss", etc.: backends that are used by "cpnanopass.ss" and "cpprim.ss" - * "ta6os.def", "tarm64le", etc.: one per OS-architecture combination, - provides platform-specific constants that feed into "cmacro.ss" and - selects the backend used by "cpnanopass.ss" and "cpprim.ss" + * "ppc32osx.def", "tppc32osx.def", etc., with common combinations + produced from the "unix.def" and "tunix.def" templates: provides + platform-specific constants that feed into "cmacro.ss" and selects + the backend used by "cpnanopass.ss" and "cpprim.ss" Chez Scheme is a bootstrapped compiler, meaning you need a Chez Scheme compiler to build a Chez Scheme compiler. The compiler and makefiles @@ -54,11 +55,13 @@ directory "boot/*machine-type*". (If it doesn't find them, then configuration cannot continue.) The supported machine types are listed in "cmacros.ss" and reflected -by a "boot/*machine-type*" directory for boot and headers files, a -"s/*machine-type*.def" file to describe the platform, a -"s/Mf-*machine-type*" makefile to select relevant files in "s", a -"c/Mf-*machine-type*" makefile for configration in "c", and a -"mats/Mf-*machine-type*" makefile to configure testing. +by a "boot/*machine-type*" directory for boot and headers files and a +combination of "s/*kind*.def" files to describe the platform. There +may also be a "s/Mf-*machine-type*" makefile to select relevant files +in "s", a "c/Mf-*machine-type*" makefile for configration in "c", and +a "mats/Mf-*machine-type*" makefile to configure testing, but Unix +machine types are handled by Mf-unix and variables configured in the +"configure" and "workarea" scripts. The "workarea" script in the root of the Chez Scheme project is used to generate a subdirectory with the appropriate contents to build for @@ -89,21 +92,23 @@ handled by having the Scheme compiler generate a couple of C headers: "scheme.h" and "equates.h", that the contain the information about the Scheme compiler the C kernel needs to do its job. -Most of the work of porting to a new platform is producing a new -"*machine-type*.def" file, which (except in simple ports to a new -operating system) will require a new "*ISA*.ss" compiler backend. -You'll also have to set up all the "Mf-*machine-type*" makefiles and -update "configure", "cmacro.ss", and "version.h"---plus maybe other -files, such as "workarea" if you create new dependencies among "Mf-" -or ".def" files (e.g., "workarea" needs to know that "a6nt.def" uses -"a6.def" and "nt.def"). Once you have all of the pieces working -together, you cross-compile boot files, then copy them over to the the -new machine to start compiling there. +You can port to a new operating system by imitating the files and +configuration of a similar supported operating system, but building a +new backend for a new processor requires much more understanding of +the compiler and runtime system. -You can port to a new operating system by imitating the files of a -similar supported oerating system, but building a new backend for a -new processor requires much more understanding of the compiler and -runtime system. +Most of the work of porting to a new architecture is producing a new +"*ISA*.ss" compiler backend, and there will be a "*arch*.def" file to +go with it. For all ports, including a new operating system on an +already-supported architecture, you'll need to update "configure", +"workarea", "cmacro.ss", and possibly "version.h". If the generic +"unix.def" and/or "tunix.def" templates do not work for the +OS--architecture combination, you'll need to create a new +"*machine-type*.def" file. + +Once you have all of the pieces working together, you cross-compile +boot files, then copy them over to the the new machine to start +compiling there. # Adding Functionality diff --git a/racket/src/ChezScheme/c/Mf-a6fb b/racket/src/ChezScheme/c/Mf-a6fb deleted file mode 100644 index 51c51f8017..0000000000 --- a/racket/src/ChezScheme/c/Mf-a6fb +++ /dev/null @@ -1,45 +0,0 @@ -# Mf-a6fb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6fb -Cpu ?= X86_64 - -mdinclude = -I/usr/local/include -I/usr/X11R6/include -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} ${mdinclude} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure --64) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-a6le b/racket/src/ChezScheme/c/Mf-a6le deleted file mode 100644 index e9705e9111..0000000000 --- a/racket/src/ChezScheme/c/Mf-a6le +++ /dev/null @@ -1,44 +0,0 @@ -# Mf-a6le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6le -Cpu ?= X86_64 - -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -melf_x86_64 -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure --64) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-a6nb b/racket/src/ChezScheme/c/Mf-a6nb deleted file mode 100644 index 81a9983f71..0000000000 --- a/racket/src/ChezScheme/c/Mf-a6nb +++ /dev/null @@ -1,46 +0,0 @@ -# Mf-a6nb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6nb -Cpu ?= X86_64 - -mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/local/include -I/usr/X11R6/include -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} ${mdinclude} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - paxctl +m ${Scheme} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure --64) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-a6nt b/racket/src/ChezScheme/c/Mf-a6nt index 19e3e98967..40c0265b99 100644 --- a/racket/src/ChezScheme/c/Mf-a6nt +++ b/racket/src/ChezScheme/c/Mf-a6nt @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -m ?= a6nt Cpu ?= X86_64 clib= diff --git a/racket/src/ChezScheme/c/Mf-a6ob b/racket/src/ChezScheme/c/Mf-a6ob deleted file mode 100644 index 19e843aa29..0000000000 --- a/racket/src/ChezScheme/c/Mf-a6ob +++ /dev/null @@ -1,45 +0,0 @@ -# Mf-a6ob -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6ob -Cpu ?= X86_64 - -mdinclude = -I/usr/local/include -I/usr/X11R6/include -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} ${mdinclude} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure --64) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-a6osx b/racket/src/ChezScheme/c/Mf-a6osx deleted file mode 100644 index 7cadd7127c..0000000000 --- a/racket/src/ChezScheme/c/Mf-a6osx +++ /dev/null @@ -1,44 +0,0 @@ -# Mf-a6osx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6osx -Cpu ?= X86_64 - -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} ${mdinclude} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -r -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure --64) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-a6s2 b/racket/src/ChezScheme/c/Mf-a6s2 deleted file mode 100644 index b497e190c9..0000000000 --- a/racket/src/ChezScheme/c/Mf-a6s2 +++ /dev/null @@ -1,44 +0,0 @@ -# Mf-a6s2 -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6s2 -Cpu ?= X86_64 - -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -DSOLARIS -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -melf_x86_64 -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure --64) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-arm32le b/racket/src/ChezScheme/c/Mf-arm32le deleted file mode 100644 index 9d095d2367..0000000000 --- a/racket/src/ChezScheme/c/Mf-arm32le +++ /dev/null @@ -1,44 +0,0 @@ -# Mf-arm32le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= arm32le -Cpu ?= ARMV6 - -o = o -mdsrc ?= arm32le.c -mdobj ?= arm32le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-arm64le b/racket/src/ChezScheme/c/Mf-arm64le deleted file mode 100644 index 2bb34e21c5..0000000000 --- a/racket/src/ChezScheme/c/Mf-arm64le +++ /dev/null @@ -1,44 +0,0 @@ -# Mf-arm64le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= tarm64le -Cpu ?= AARCH64 - -o = o -mdsrc ?= arm32le.c -mdobj ?= arm32le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-arm64osx b/racket/src/ChezScheme/c/Mf-arm64osx deleted file mode 100644 index 57cd07051a..0000000000 --- a/racket/src/ChezScheme/c/Mf-arm64osx +++ /dev/null @@ -1,44 +0,0 @@ -# Mf-a6osx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= arm64osx -Cpu ?= AARCH64 - -o = o -mdsrc ?= arm32le.c -mdobj ?= arm32le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} ${mdinclude} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -r -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ./configure) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-base b/racket/src/ChezScheme/c/Mf-base index 65b16b93be..188c7ff571 100644 --- a/racket/src/ChezScheme/c/Mf-base +++ b/racket/src/ChezScheme/c/Mf-base @@ -15,6 +15,9 @@ include Mf-config +mdsrc ?= ${mdarchsrc}.c +mdobj ?= ${mdarchsrc}.o + Include=../boot/$m PetiteBoot=../boot/$m/petite.boot SchemeBoot=../boot/$m/scheme.boot diff --git a/racket/src/ChezScheme/c/Mf-i3fb b/racket/src/ChezScheme/c/Mf-i3fb deleted file mode 100644 index eb21e1118c..0000000000 --- a/racket/src/ChezScheme/c/Mf-i3fb +++ /dev/null @@ -1,45 +0,0 @@ -# Mf-i3fb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3fb -Cpu ?= I386 - -mdinclude = -I/usr/local/include -I/usr/X11R6/include -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} ${mdinclude} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-i3le b/racket/src/ChezScheme/c/Mf-i3le deleted file mode 100644 index 801f9bf447..0000000000 --- a/racket/src/ChezScheme/c/Mf-i3le +++ /dev/null @@ -1,44 +0,0 @@ -# Mf-i3le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3le -Cpu ?= I386 - -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -melf_i386 -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-i3nb b/racket/src/ChezScheme/c/Mf-i3nb deleted file mode 100644 index 84d10bdf66..0000000000 --- a/racket/src/ChezScheme/c/Mf-i3nb +++ /dev/null @@ -1,46 +0,0 @@ -# Mf-i3nb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3nb -Cpu ?= I386 - -mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} ${mdinclude} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -m elf_i386 -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - paxctl +m ${Scheme} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-i3nt b/racket/src/ChezScheme/c/Mf-i3nt index b7bd5bc32d..1166c3eb00 100644 --- a/racket/src/ChezScheme/c/Mf-i3nt +++ b/racket/src/ChezScheme/c/Mf-i3nt @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -m ?= i3nt Cpu ?= I386 clib= diff --git a/racket/src/ChezScheme/c/Mf-i3ob b/racket/src/ChezScheme/c/Mf-i3ob deleted file mode 100644 index 6bb27a47e0..0000000000 --- a/racket/src/ChezScheme/c/Mf-i3ob +++ /dev/null @@ -1,45 +0,0 @@ -# Mf-i3ob -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3ob -Cpu ?= I386 - -mdinclude = -I/usr/local/include -I/usr/X11R6/include -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} ${mdinclude} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-i3osx b/racket/src/ChezScheme/c/Mf-i3osx deleted file mode 100644 index 91dc1ecb6d..0000000000 --- a/racket/src/ChezScheme/c/Mf-i3osx +++ /dev/null @@ -1,44 +0,0 @@ -# Mf-i3osx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3osx -Cpu ?= I386 - -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} ${mdinclude} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -r -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-i3qnx b/racket/src/ChezScheme/c/Mf-i3qnx deleted file mode 100644 index 3395c6ce50..0000000000 --- a/racket/src/ChezScheme/c/Mf-i3qnx +++ /dev/null @@ -1,45 +0,0 @@ -# Mf-i3qnx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3qnx -Cpu ?= I386 - -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o -LocalInclude = /usr/local/include - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} -I${LocalInclude} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -mi386nto -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -Wl,--export-dynamic -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-i3s2 b/racket/src/ChezScheme/c/Mf-i3s2 deleted file mode 100644 index 24930a36f2..0000000000 --- a/racket/src/ChezScheme/c/Mf-i3s2 +++ /dev/null @@ -1,44 +0,0 @@ -# Mf-i3s2 -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3s2 -Cpu ?= I386 - -o = o -mdsrc ?= i3le.c -mdobj ?= i3le.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -DSOLARIS -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -melf_i386 -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-pb b/racket/src/ChezScheme/c/Mf-pb deleted file mode 100644 index 4f26c6ca66..0000000000 --- a/racket/src/ChezScheme/c/Mf-pb +++ /dev/null @@ -1,9 +0,0 @@ -# Mf-pb - -# Override definitions in `Mf-pbhost` -m = pb -Cpu = PORTABLE_BYTECODE -mdsrc = pb.c -mdobj = pb.o - -include Mf-pbhost diff --git a/racket/src/ChezScheme/c/Mf-ppc32le b/racket/src/ChezScheme/c/Mf-ppc32le deleted file mode 100644 index 6cd75d8a16..0000000000 --- a/racket/src/ChezScheme/c/Mf-ppc32le +++ /dev/null @@ -1,44 +0,0 @@ -# Mf-ppc32le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= ppc32le -Cpu ?= PPC32 - -o = o -mdsrc ?= ppc32.c -mdobj ?= ppc32.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -r -X -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-ppc32osx b/racket/src/ChezScheme/c/Mf-ppc32osx deleted file mode 100644 index e6efbb1a54..0000000000 --- a/racket/src/ChezScheme/c/Mf-ppc32osx +++ /dev/null @@ -1,32 +0,0 @@ -# Mf-ppc32osx - -m ?= ppc32osx -Cpu ?= PPC32 - -mdinclude = -I/opt/X11/include/ -o = o -mdsrc ?= ppc32.c -mdobj ?= ppc32.o - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $C -c -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} ${mdinclude} $*.c - -include Mf-base - -${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} - ${LD} -r -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} - -${KernelLib}: ${kernelobj} - ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} - -${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} - $C -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} - -../zlib/configure.log: - (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ./configure) - -../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/Mf-ta6fb b/racket/src/ChezScheme/c/Mf-ta6fb deleted file mode 100644 index dc61083b98..0000000000 --- a/racket/src/ChezScheme/c/Mf-ta6fb +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ta6fb - -m ?= ta6fb - -include Mf-a6fb diff --git a/racket/src/ChezScheme/c/Mf-ta6le b/racket/src/ChezScheme/c/Mf-ta6le deleted file mode 100644 index 8cae7d4fa7..0000000000 --- a/racket/src/ChezScheme/c/Mf-ta6le +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ta6le - -m ?= ta6le - -include Mf-a6le diff --git a/racket/src/ChezScheme/c/Mf-ta6nb b/racket/src/ChezScheme/c/Mf-ta6nb deleted file mode 100644 index bf7af020df..0000000000 --- a/racket/src/ChezScheme/c/Mf-ta6nb +++ /dev/null @@ -1,6 +0,0 @@ - -# Mf-ta6nb - -m ?= ta6nb - -include Mf-a6nb diff --git a/racket/src/ChezScheme/c/Mf-ta6nt b/racket/src/ChezScheme/c/Mf-ta6nt index ea40fa996e..53b585efb3 100644 --- a/racket/src/ChezScheme/c/Mf-ta6nt +++ b/racket/src/ChezScheme/c/Mf-ta6nt @@ -1,5 +1,4 @@ # Mf-ta6nt -m ?= ta6nt include Mf-a6nt diff --git a/racket/src/ChezScheme/c/Mf-ta6ob b/racket/src/ChezScheme/c/Mf-ta6ob deleted file mode 100644 index 8c9c96cc85..0000000000 --- a/racket/src/ChezScheme/c/Mf-ta6ob +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ta6ob - -m ?= ta6ob - -include Mf-a6ob diff --git a/racket/src/ChezScheme/c/Mf-ta6osx b/racket/src/ChezScheme/c/Mf-ta6osx deleted file mode 100644 index 4907914cb3..0000000000 --- a/racket/src/ChezScheme/c/Mf-ta6osx +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ta6osx - -m ?= ta6osx - -include Mf-a6osx diff --git a/racket/src/ChezScheme/c/Mf-ta6s2 b/racket/src/ChezScheme/c/Mf-ta6s2 deleted file mode 100644 index 0f53ae4d2c..0000000000 --- a/racket/src/ChezScheme/c/Mf-ta6s2 +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ta6s2 - -m ?= ta6s2 - -include Mf-a6s2 diff --git a/racket/src/ChezScheme/c/Mf-tarm32le b/racket/src/ChezScheme/c/Mf-tarm32le deleted file mode 100644 index 114107274e..0000000000 --- a/racket/src/ChezScheme/c/Mf-tarm32le +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-tarm32le - -m ?= tarm32le - -include Mf-arm32le diff --git a/racket/src/ChezScheme/c/Mf-tarm64le b/racket/src/ChezScheme/c/Mf-tarm64le deleted file mode 100644 index f3b71782f6..0000000000 --- a/racket/src/ChezScheme/c/Mf-tarm64le +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-tarm64le - -m ?= tarm64le - -include Mf-arm64le diff --git a/racket/src/ChezScheme/c/Mf-tarm64osx b/racket/src/ChezScheme/c/Mf-tarm64osx deleted file mode 100644 index e4d05eb21f..0000000000 --- a/racket/src/ChezScheme/c/Mf-tarm64osx +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-tarm64osx - -m ?= tarm64osx - -include Mf-arm64osx diff --git a/racket/src/ChezScheme/c/Mf-ti3fb b/racket/src/ChezScheme/c/Mf-ti3fb deleted file mode 100644 index e2d380dad6..0000000000 --- a/racket/src/ChezScheme/c/Mf-ti3fb +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ti3fb - -m ?= ti3fb - -include Mf-i3fb diff --git a/racket/src/ChezScheme/c/Mf-ti3le b/racket/src/ChezScheme/c/Mf-ti3le deleted file mode 100644 index 606a736b77..0000000000 --- a/racket/src/ChezScheme/c/Mf-ti3le +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ti3le - -m ?= ti3le - -include Mf-i3le diff --git a/racket/src/ChezScheme/c/Mf-ti3nb b/racket/src/ChezScheme/c/Mf-ti3nb deleted file mode 100644 index e32895d500..0000000000 --- a/racket/src/ChezScheme/c/Mf-ti3nb +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ti3nb - -m ?= ti3nb - -include Mf-i3nb diff --git a/racket/src/ChezScheme/c/Mf-ti3nt b/racket/src/ChezScheme/c/Mf-ti3nt index 7016fbf080..3be81d0b19 100644 --- a/racket/src/ChezScheme/c/Mf-ti3nt +++ b/racket/src/ChezScheme/c/Mf-ti3nt @@ -1,5 +1,4 @@ # Mf-ti3nt -m ?= ti3nt include Mf-i3nt diff --git a/racket/src/ChezScheme/c/Mf-ti3ob b/racket/src/ChezScheme/c/Mf-ti3ob deleted file mode 100644 index bc3c1afd82..0000000000 --- a/racket/src/ChezScheme/c/Mf-ti3ob +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ti3ob - -m ?= ti3ob - -include Mf-i3ob diff --git a/racket/src/ChezScheme/c/Mf-ti3osx b/racket/src/ChezScheme/c/Mf-ti3osx deleted file mode 100644 index 9cd7e049ac..0000000000 --- a/racket/src/ChezScheme/c/Mf-ti3osx +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ti3osx - -m ?= ti3osx - -include Mf-i3osx diff --git a/racket/src/ChezScheme/c/Mf-ti3s2 b/racket/src/ChezScheme/c/Mf-ti3s2 deleted file mode 100644 index b73c553688..0000000000 --- a/racket/src/ChezScheme/c/Mf-ti3s2 +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ti3s2 - -m ?= ti3s2 - -include Mf-i3s2 diff --git a/racket/src/ChezScheme/c/Mf-tppc32le b/racket/src/ChezScheme/c/Mf-tppc32le deleted file mode 100644 index b3c7f071b4..0000000000 --- a/racket/src/ChezScheme/c/Mf-tppc32le +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-tppc32le - -m ?= tppc32le - -include Mf-ppc32le diff --git a/racket/src/ChezScheme/c/Mf-tppc32osx b/racket/src/ChezScheme/c/Mf-tppc32osx deleted file mode 100644 index 2a1a6584ed..0000000000 --- a/racket/src/ChezScheme/c/Mf-tppc32osx +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-tppc32osx - -m ?= tppc32osx - -include Mf-ppc32osx diff --git a/racket/src/ChezScheme/c/Mf-unix b/racket/src/ChezScheme/c/Mf-unix new file mode 100644 index 0000000000..025c295a7d --- /dev/null +++ b/racket/src/ChezScheme/c/Mf-unix @@ -0,0 +1,25 @@ +o = o + +include Mf-base + +.SUFFIXES: +.SUFFIXES: .c .o + +.c.o: + $C -c ${mdcppflags} -D${Cpu} -I${Include} ${zlibInc} ${LZ4Inc} ${mdinclude} $*.c + +${KernelO}: ${kernelobj} ${zlibDep} ${LZ4Dep} + ${LD} -r -X ${mdldflags} -o ${KernelO} ${kernelobj} ${zlibLib} ${LZ4Lib} + +${KernelLib}: ${kernelobj} + ${AR} ${ARFLAGS} ${KernelLib} ${kernelobj} + +${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} + $C ${mdlinkflags} -o ${Scheme} ${Main} ${Kernel} ${KernelLinkLibs} ${LDFLAGS} ${LIBS} + ${exePostStep} + +../zlib/configure.log: + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ./configure ${zlibConfigureFlags}) + +../lz4/lib/liblz4.a: ${LZ4Sources} + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${MAKE} liblz4.a) diff --git a/racket/src/ChezScheme/c/version.h b/racket/src/ChezScheme/c/version.h index 6185ca4921..9a906af90b 100644 --- a/racket/src/ChezScheme/c/version.h +++ b/racket/src/ChezScheme/c/version.h @@ -16,112 +16,31 @@ #include "config.h" -#if (machine_type == machine_type_arm32le || machine_type == machine_type_tarm32le || machine_type == machine_type_arm64le || machine_type == machine_type_tarm64le) -# define OS_ANY_LINUX -# if (machine_type == machine_type_tarm32le || machine_type == machine_type_tarm64le) -# define PTHREADS -# endif -# define OS_ANY_LINUX -# define LITTLE_ENDIAN_IEEE_DOUBLE +#if defined(scheme_feature_pthreads) +# define PTHREADS +#endif + +/*****************************************/ +/* Architectures */ + +#if (defined(__powerpc__) || defined(__POWERPC__)) && !defined(__powerpc64__) +# define PORTABLE_BYTECODE_BIGENDIAN +# define BIG_ENDIAN_IEEE_DOUBLE # define FLUSHCACHE #endif -#if (machine_type == machine_type_ppc32le || machine_type == machine_type_tppc32le || machine_type == machine_type_ppc64le || machine_type == machine_type_tppc64le) -# define OS_ANY_LINUX -# if (machine_type == machine_type_tppc32le || machine_type == machine_type_tppc64le) -# define PTHREADS -# endif -# define FLUSHCACHE -#endif - -#if (machine_type == machine_type_i3le || machine_type == machine_type_ti3le || machine_type == machine_type_a6le || machine_type == machine_type_ta6le) -# define OS_ANY_LINUX -# if (machine_type == machine_type_ti3le || machine_type == machine_type_ta6le) -# define PTHREADS -# endif -# define LITTLE_ENDIAN_IEEE_DOUBLE -#endif - -#if (machine_type == machine_type_i3fb || machine_type == machine_type_ti3fb || machine_type == machine_type_a6fb || machine_type == machine_type_ta6fb) -# define OS_ANY_FREEBSD -# if (machine_type == machine_type_ti3fb || machine_type == machine_type_ta6fb) -# define PTHREADS -# endif -# define LITTLE_ENDIAN_IEEE_DOUBLE -#endif - -#if (machine_type == machine_type_i3nb || machine_type == machine_type_ti3nb || machine_type == machine_type_a6nb || machine_type == machine_type_ta6nb) -# define OS_ANY_NETBSD -# if (machine_type == machine_type_ti3nb || machine_type == machine_type_ta6nb) -# define PTHREADS -# endif -#endif - -#if (machine_type == machine_type_i3nt || machine_type == machine_type_ti3nt || machine_type == machine_type_a6nt || machine_type == machine_type_ta6nt) -# define OS_ANY_WINDOWS -# if (machine_type == machine_type_ti3nt || machine_type == machine_type_ta6nt) -# define PTHREADS -# endif -#endif - -#if (machine_type == machine_type_i3ob || machine_type == machine_type_ti3ob || machine_type == machine_type_a6ob || machine_type == machine_type_ta6ob) -# define OS_ANY_OPENBSD -# if (machine_type == machine_type_ti3ob || machine_type == machine_type_ta6ob) -# define PTHREADS -# endif -#endif - -#if (machine_type == machine_type_i3osx || machine_type == machine_type_ti3osx || machine_type == machine_type_a6osx || machine_type == machine_type_ta6osx) -# define OS_ANY_MACOSX -# if (machine_type == machine_type_ti3osx || machine_type == machine_type_ta6osx) -# define PTHREADS -# endif -#endif - -#if (machine_type == machine_type_arm64osx || machine_type == machine_type_tarm64osx) -# define OS_ANY_MACOSX -# if (machine_type == machine_type_tarm64osx) -# define PTHREADS -# endif -# define FLUSHCACHE -#endif - -#if (machine_type == machine_type_ppc32osx || machine_type == machine_type_tppc32osx) -# define OS_ANY_MACOSX -# if (machine_type == machine_type_tppc32osx) -# define PTHREADS -# endif +#if (defined(__arm__) || defined(__arm64__) || defined(__aarch64__)) # define FLUSHCACHE #endif #if (machine_type == machine_type_pb) -# if (defined(__powerpc__) || defined(__POWERPC__)) && !defined(__powerpc64__) -# define PORTABLE_BYTECODE_BIGENDIAN -# endif -# if defined(__linux__) -# define OS_ANY_LINUX -# ifndef PORTABLE_BYTECODE_BIGENDIAN -# define LITTLE_ENDIAN_IEEE_DOUBLE -# endif -# elif defined(__NetBSD__) -# define OS_ANY_NETBSD -# elif defined(__OpenBSD__) && !defined(__Bitrig__) -# define OS_ANY_OPENBSD -# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -# define OS_ANY_FREEBSD -# ifndef PORTABLE_BYTECODE_BIGENDIAN -# define LITTLE_ENDIAN_IEEE_DOUBLE -# endif -# elif defined(_MSC_VER) || defined(__MINGW32__) -# define OS_ANY_WINDOWS -# elif __APPLE__ -# define OS_ANY_MACOSX -# elif defined(sun) -# define OS_ANY_SOLARIS2 -# endif +# undef FLUSHCACHE #endif -#ifdef OS_ANY_LINUX +/*****************************************/ +/* Operating systems */ + +#if defined(__linux__) #define NOBLOCK O_NONBLOCK #define LOAD_SHARED_OBJECT #define USE_MMAP @@ -158,7 +77,7 @@ typedef int tputsputcchar; #define UNUSED __attribute__((__unused__)) #endif -#ifdef OS_ANY_FREEBSD +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #define NOBLOCK O_NONBLOCK #define LOAD_SHARED_OBJECT #define USE_MMAP @@ -187,7 +106,7 @@ typedef int tputsputcchar; #define USE_OSSP_UUID #endif -#ifdef OS_ANY_NETBSD +#if defined(__NetBSD__) #ifdef PTHREADS # define NETBSD #endif @@ -196,7 +115,6 @@ typedef int tputsputcchar; #define USE_MMAP #define MMAP_HEAP #define IEEE_DOUBLE -#define LITTLE_ENDIAN_IEEE_DOUBLE #define LDEXP #define ARCHYPERBOLIC #define GETPAGESIZE() getpagesize() @@ -222,11 +140,10 @@ typedef int tputsputcchar; #define USE_MBRTOWC_L #endif -#ifdef OS_ANY_WINDOWS +#if defined(_MSC_VER) || defined(__MINGW32__) #define GETPAGESIZE() S_getpagesize() #define GETWD(x) GETCWD(x, _MAX_PATH) #define IEEE_DOUBLE -#define LITTLE_ENDIAN_IEEE_DOUBLE #define LOAD_SHARED_OBJECT #define USE_VIRTUAL_ALLOC #define NAN_INCLUDE @@ -289,13 +206,12 @@ struct timespec; #endif #endif -#ifdef OS_ANY_OPENBSD +#if defined(__OpenBSD__) && !defined(__Bitrig__) #define NOBLOCK O_NONBLOCK #define LOAD_SHARED_OBJECT #define USE_MMAP #define MMAP_HEAP #define IEEE_DOUBLE -#define LITTLE_ENDIAN_IEEE_DOUBLE #define LDEXP #define ARCHYPERBOLIC #define GETPAGESIZE() getpagesize() @@ -320,16 +236,13 @@ typedef int tputsputcchar; #define USE_OSSP_UUID #endif -#ifdef OS_ANY_MACOSX +#if defined(__APPLE__) #define MACOSX #define NOBLOCK O_NONBLOCK #define LOAD_SHARED_OBJECT #define USE_MMAP #define MMAP_HEAP #define IEEE_DOUBLE -#if !defined(__POWERPC__) -# define LITTLE_ENDIAN_IEEE_DOUBLE -#endif /* for both iPhone and iPhoneSimulator */ #if defined(TARGET_OS_IPHONE) # define SYSTEM(s) ((void)s, -1) @@ -374,20 +287,12 @@ typedef int tputsputcchar; #define UNUSED __attribute__((__unused__)) #endif -#if (machine_type == machine_type_i3qnx || machine_type == machine_type_ti3qnx) -# define OS_ANY_QNX -# if (machine_type == machine_type_ti3qnx) -# define PTHREADS -# endif -#endif - -#ifdef OS_ANY_QNX +#if defined(__QNX__) #define NOBLOCK O_NONBLOCK #define LOAD_SHARED_OBJECT #define USE_MMAP #define MMAP_HEAP #define IEEE_DOUBLE -#define LITTLE_ENDIAN_IEEE_DOUBLE #define LDEXP #define ARCHYPERBOLIC #define GETPAGESIZE() getpagesize() @@ -411,20 +316,12 @@ typedef int tputsputcchar; #define UNUSED #endif -#if (machine_type == machine_type_i3s2 || machine_type == machine_type_ti3s2 || machine_type == machine_type_a6s2 || machine_type == machine_type_ta6s2) -# define OS_ANY_SOLARIS2 -# if (machine_type == machine_type_ti3s2 || machine_type == machine_type_ta6s2) -# define PTHREADS -# endif -#endif - -#ifdef OS_ANY_SOLARIS2 +#if defined(sun) #define NOBLOCK O_NONBLOCK #define LOAD_SHARED_OBJECT #define USE_MMAP #define MMAP_HEAP #define IEEE_DOUBLE -#define LITTLE_ENDIAN_IEEE_DOUBLE #define LDEXP #define ARCHYPERBOLIC #define LOG1P @@ -451,7 +348,12 @@ typedef char tputsputcchar; #define UNUSED __attribute__((__unused__)) #endif -/* defaults */ +/*****************************************/ +/* Defaults and derived */ + +#ifndef BIG_ENDIAN_IEEE_DOUBLE +# define LITTLE_ENDIAN_IEEE_DOUBLE +#endif #ifndef CHDIR # define CHDIR chdir diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure index 87be80a3b8..c18fffe6ec 100755 --- a/racket/src/ChezScheme/configure +++ b/racket/src/ChezScheme/configure @@ -101,9 +101,7 @@ case "${CONFIG_UNAME}" in tm64=ta6le elif uname -a | grep -i power > /dev/null 2>&1 ; then m32=ppc32le - m64="" tm32=tppc32le - tm64="" elif uname -a | egrep 'armv|aarch64' > /dev/null 2>&1 ; then m32=arm32le m64=arm64le @@ -500,61 +498,92 @@ case "${flagsm}" in ;; esac +flagsmuni=`echo $flagsm | sed -e 's/^t//'` +muni=`echo $m | sed -e 's/^t//'` + # Set default CFLAGS if not provided at all. Assuming that the # compiler is for the right platform, compilation should generally # succeed if no flags are set; anything required should be propagated # a different way if [ "$cflagsset" = "no" ] ; then - case "${flagsm}" in - a6le|ta6le) + case "${flagsmuni}" in + a6le) CFLAGS="-m64 -msse2 ${optFlags}" ;; - a6fb|ta6fb|a6nb|ta6nb|a6ob|ta6ob) + a6fb|a6nb|a6ob) CFLAGS="-m64 ${optFlags}" ;; - a6s2|ta6s2) + a6s2) CFLAGS="-m64 ${optFlags}" ;; - a6osx|ta6osx) + a6osx) CFLAGS="-m64 ${optFlags}" ;; - arm64osx|tarm64osx) + arm64osx) CFLAGS="-arch arm64 ${optFlags}" ;; - a6nt|ta6nt) + a6nt) CFLAGS="${optFlags}" ;; arm32le|tarm32le|arm64le|tarm64le) CFLAGS="${optFlags}" ;; - i3le|ti3le) + i3le) CFLAGS="-m32 -msse2 ${optFlags}" ;; - i3fb|ti3fb|i3nb|ti3nb|i3ob|ti3ob) + i3fb|i3nb|i3ob) CFLAGS="-m32 ${optFlags}" ;; - i3s2|ti3s2) + i3s2) CFLAGS="-m32 ${optFlags}" ;; - i3osx|ti3osx) + i3osx) CFLAGS="-m32 ${optFlags}" ;; - i3nt|ti3nt) + i3nt) CFLAGS="${optFlags}" ;; i3qnx) CC=qcc CFLAGS="-m32 -N2048K ${optFlags}" ;; - ppc32le|tppc32le) + ppc32le) CFLAGS="-m32 ${optFlags}" ;; - ppc32osx|tppc32osx) + ppc32osx) CFLAGS="${optFlags}" ;; esac fi +# architecture-specific for Mf-unix +case "${muni}" in + pb) + Cpu=PORTABLE_BYTECODE + mdarchsrc=pb + ;; + a6*) + Cpu=X86_64 + mdarchsrc=i3le + ;; + i3*) + Cpu=I386 + mdarchsrc=i3le + ;; + arm32*) + Cpu=ARMV6 + mdarchsrc=arm32le + ;; + arm64*) + Cpu=AARCH64 + mdarchsrc=arm32le + ;; + ppc32*) + Cpu=PPC32 + mdarchsrc=ppc32 + ;; +esac + # Add automatic thread compilation flags, unless suppressed by --disable-auto-flags if [ "$addflags" = "yes" ] ; then if [ "$threadFlags" != "" ] ; then @@ -627,6 +656,84 @@ if [ "$addflags" = "yes" ] ; then fi fi +# more compile and link flags for c/Mf-unix and mats/Mf-unix +mdinclude= +mdcppflags= +mdcflags= +mdldflags= +mdlinkflags= +zlibConfigureFlags= +exePostStep=":" + +# compile flags for c/Mf-unix and mats/Mf-unix +case "${flagsmuni}" in + *le) + mdcflags="-fPIC -shared" + ;; + *fb|*ob) + mdcflags="-fPIC -shared" + mdinclude="-I/usr/local/include -I/usr/X11R6/include" + ;; + *nb) + mdcflags="-fPIC -shared" + mdinclude="-I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include" + ;; + *osx) + mdcflags="-dynamiclib -undefined dynamic_lookup" + ;; + *s2) + mdcflags="-fPIC -shared" + mdcppflags="-DSOLARIS" + ;; + *qnx) + mdcflags="-fPIC -shared" + mdinclude="-I/usr/local/include" + ;; +esac + +# dynamic linking flags for c/Mf-unix +case "${flagsmuni}" in + a6le) + mdldflags="-melf_x86_64" + ;; + i3le) + mdldflags="-melf_i386" + ;; + ppc32le|arm32le|arm64le) + ;; + a6fb|a6ob|a6nb|i3fb|i3ob) + ;; + i3nb) + mdldflags="-m elf_i386" + ;; + *osx) + ;; + a6s2) + mdldflags="-melf_x86_64" + ;; + i3s2) + mdldflags="-melf_i386" + ;; + i3qnx) + mdlinkflags="-Wl,--export-dynamic" + mdldflags="-mi386nto" + ;; +esac + +# post-link-executable step for c/Mf-unix +case "${flagsmuni}" in + *nb) + exePostStep='paxctl +m ${Scheme}' + ;; +esac + +# zlib configure flags for c/Mf-unix +case "${flagsmuni}" in + a6*) + zlibConfigureFlags="--64" + ;; +esac + if [ -f boot/$m/scheme.boot -o -f "$srcdir"/boot/$m/scheme.boot ] ; then echo "Configuring for $m" else @@ -754,6 +861,15 @@ esac cat > $w/c/Mf-config << END upupsrcdir=$upupsrcdir +m=$m +Cpu=$Cpu +mdarchsrc=$mdarchsrc +mdinclude=$mdinclude +mdcppflags=$mdcppflags +mdldflags=$mdldflags +mdlinkflags=$mdlinkflags +exePostStep=$exePostStep +zlibConfigureFlags= CC=$CC CPPFLAGS=$CPPFLAGS CFLAGS=$CFLAGS @@ -781,3 +897,12 @@ KernelLinkDeps=\${${Kernel}LinkDeps} KernelLinkLibs=\${${Kernel}LinkLibs} C=\${CC} \${CPPFLAGS} \${CFLAGS} \${warningFlags} END + +cat > $w/mats/Mf-config << END +upupsrcdir=$upupsrcdir +m=$m +mdcflags=$mdcflags +CC=$CC +CPPFLAGS=$CPPFLAGS +CFLAGS=$CFLAGS +END diff --git a/racket/src/ChezScheme/mats/6.ms b/racket/src/ChezScheme/mats/6.ms index a1584eb239..f403663817 100644 --- a/racket/src/ChezScheme/mats/6.ms +++ b/racket/src/ChezScheme/mats/6.ms @@ -3033,11 +3033,11 @@ (time? (file-change-time "\\\\?\\c:\\")) (time? (file-modification-time "\\\\?\\c:\\")))) (or (windows?) (embedded?) - (time=? (file-access-time "Makefile") (file-access-time (format "Mf-~a" (machine-type))))) + (time=? (file-access-time "Makefile") (file-access-time "Mf-unix"))) (or (windows?) (embedded?) - (time=? (file-change-time "Makefile") (file-change-time (format "Mf-~a" (machine-type))))) + (time=? (file-change-time "Makefile") (file-change-time "Mf-unix"))) (or (windows?) (embedded?) - (time=? (file-modification-time "Makefile") (file-modification-time (format "Mf-~a" (machine-type))))) + (time=? (file-modification-time "Makefile") (file-modification-time "Mf-unix"))) (error? (file-access-time "probably/not/there")) (error? (file-access-time "probably/not/there" #f)) (error? (file-access-time "probably/not/there" #t)) diff --git a/racket/src/ChezScheme/mats/Mf-a6fb b/racket/src/ChezScheme/mats/Mf-a6fb deleted file mode 100644 index dff6a82788..0000000000 --- a/racket/src/ChezScheme/mats/Mf-a6fb +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-a6fb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6fb - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-a6le b/racket/src/ChezScheme/mats/Mf-a6le deleted file mode 100644 index 0aab2af6d5..0000000000 --- a/racket/src/ChezScheme/mats/Mf-a6le +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-a6le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6le - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -m64 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-a6nb b/racket/src/ChezScheme/mats/Mf-a6nb deleted file mode 100644 index bd190d3d04..0000000000 --- a/racket/src/ChezScheme/mats/Mf-a6nb +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-a6nb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6nb - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-a6nt b/racket/src/ChezScheme/mats/Mf-a6nt index e7a98a6be1..8d3f80ea9c 100644 --- a/racket/src/ChezScheme/mats/Mf-a6nt +++ b/racket/src/ChezScheme/mats/Mf-a6nt @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -m ?= a6nt fsrc = foreign1.c foreign2.c foreign3.c foreign4.c fobj = foreign1.so diff --git a/racket/src/ChezScheme/mats/Mf-a6ob b/racket/src/ChezScheme/mats/Mf-a6ob deleted file mode 100644 index beaa7ecbed..0000000000 --- a/racket/src/ChezScheme/mats/Mf-a6ob +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-a6ob -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6ob - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-a6osx b/racket/src/ChezScheme/mats/Mf-a6osx deleted file mode 100644 index 9d3ffcfc49..0000000000 --- a/racket/src/ChezScheme/mats/Mf-a6osx +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-a6osx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6osx - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -m64 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-a6s2 b/racket/src/ChezScheme/mats/Mf-a6s2 deleted file mode 100644 index 5e26b0bcc4..0000000000 --- a/racket/src/ChezScheme/mats/Mf-a6s2 +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-a6s2 -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6s2 - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - gcc -m64 ${threadFlags} -fPIC -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - gcc -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-arm32le b/racket/src/ChezScheme/mats/Mf-arm32le deleted file mode 100644 index fd1a266dcf..0000000000 --- a/racket/src/ChezScheme/mats/Mf-arm32le +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-arm32le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= arm32le - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-arm64le b/racket/src/ChezScheme/mats/Mf-arm64le deleted file mode 100644 index d2015651d4..0000000000 --- a/racket/src/ChezScheme/mats/Mf-arm64le +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-arm64le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= arm64le - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3fb b/racket/src/ChezScheme/mats/Mf-i3fb deleted file mode 100644 index d0e8d4b4d0..0000000000 --- a/racket/src/ChezScheme/mats/Mf-i3fb +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-i3fb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3fb - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3le b/racket/src/ChezScheme/mats/Mf-i3le deleted file mode 100644 index 2c8f84fc7e..0000000000 --- a/racket/src/ChezScheme/mats/Mf-i3le +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-i3le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3le - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -m32 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3nb b/racket/src/ChezScheme/mats/Mf-i3nb deleted file mode 100644 index 5080893085..0000000000 --- a/racket/src/ChezScheme/mats/Mf-i3nb +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-i3nb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3nb - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3nt b/racket/src/ChezScheme/mats/Mf-i3nt index 7e0d8903ef..ff56a4792c 100644 --- a/racket/src/ChezScheme/mats/Mf-i3nt +++ b/racket/src/ChezScheme/mats/Mf-i3nt @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -m ?= i3nt fsrc = foreign1.c foreign2.c foreign3.c foreign4.c fobj = foreign1.so diff --git a/racket/src/ChezScheme/mats/Mf-i3ob b/racket/src/ChezScheme/mats/Mf-i3ob deleted file mode 100644 index 47ad151462..0000000000 --- a/racket/src/ChezScheme/mats/Mf-i3ob +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-i3ob -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3ob - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3osx b/racket/src/ChezScheme/mats/Mf-i3osx deleted file mode 100644 index e5bb87c2d6..0000000000 --- a/racket/src/ChezScheme/mats/Mf-i3osx +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-i3osx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3osx - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -m32 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3qnx b/racket/src/ChezScheme/mats/Mf-i3qnx deleted file mode 100644 index 3e1437a9a2..0000000000 --- a/racket/src/ChezScheme/mats/Mf-i3qnx +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-i3qnx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = i3qnx - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3s2 b/racket/src/ChezScheme/mats/Mf-i3s2 deleted file mode 100644 index 55f1cb4de1..0000000000 --- a/racket/src/ChezScheme/mats/Mf-i3s2 +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-i3s2 -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3s2 - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - gcc -m32 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - gcc -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-pb b/racket/src/ChezScheme/mats/Mf-pb deleted file mode 100644 index 69b359460c..0000000000 --- a/racket/src/ChezScheme/mats/Mf-pb +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-pb - -m = pb - -include Mf-pbhost diff --git a/racket/src/ChezScheme/mats/Mf-ppc32le b/racket/src/ChezScheme/mats/Mf-ppc32le deleted file mode 100644 index 204a6a7666..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ppc32le +++ /dev/null @@ -1,27 +0,0 @@ -# Mf-ppc32le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= ppc32le - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -m32 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-ppc32osx b/racket/src/ChezScheme/mats/Mf-ppc32osx deleted file mode 100644 index 1fd2d8a909..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ppc32osx +++ /dev/null @@ -1,14 +0,0 @@ -# Mf-ppc32osx - -m ?= ppc32osx - -fsrc = foreign1.c foreign2.c foreign3.c foreign4.c -fobj = foreign1.so - -include Mf-base - -foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} - -cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-ta6fb b/racket/src/ChezScheme/mats/Mf-ta6fb deleted file mode 100644 index 6895aff210..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ta6fb +++ /dev/null @@ -1,7 +0,0 @@ -# Mf-ta6fb - -m = ta6fb - -threadFlags = -pthread - -include Mf-a6fb diff --git a/racket/src/ChezScheme/mats/Mf-ta6le b/racket/src/ChezScheme/mats/Mf-ta6le deleted file mode 100644 index 29ba25c3d1..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ta6le +++ /dev/null @@ -1,7 +0,0 @@ -# Mf-ta6le - -m = ta6le - -threadFlags = -pthread - -include Mf-a6le diff --git a/racket/src/ChezScheme/mats/Mf-ta6nb b/racket/src/ChezScheme/mats/Mf-ta6nb deleted file mode 100644 index 0ed99a5b22..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ta6nb +++ /dev/null @@ -1,7 +0,0 @@ -# Mf-ta6nb - -m = ta6nb - -threadFlags = -pthread - -include Mf-a6nb diff --git a/racket/src/ChezScheme/mats/Mf-ta6nt b/racket/src/ChezScheme/mats/Mf-ta6nt index 9e1fb593ab..53b585efb3 100644 --- a/racket/src/ChezScheme/mats/Mf-ta6nt +++ b/racket/src/ChezScheme/mats/Mf-ta6nt @@ -1,5 +1,4 @@ # Mf-ta6nt -m = ta6nt include Mf-a6nt diff --git a/racket/src/ChezScheme/mats/Mf-ta6ob b/racket/src/ChezScheme/mats/Mf-ta6ob deleted file mode 100644 index e1b8f096e9..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ta6ob +++ /dev/null @@ -1,7 +0,0 @@ -# Mf-ta6ob - -m = ta6ob - -threadFlags = -pthread - -include Mf-a6ob diff --git a/racket/src/ChezScheme/mats/Mf-ta6osx b/racket/src/ChezScheme/mats/Mf-ta6osx deleted file mode 100644 index 2696b70f1e..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ta6osx +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ta6osx - -m = ta6osx - -include Mf-a6osx diff --git a/racket/src/ChezScheme/mats/Mf-ta6s2 b/racket/src/ChezScheme/mats/Mf-ta6s2 deleted file mode 100644 index f8a11d60c0..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ta6s2 +++ /dev/null @@ -1,7 +0,0 @@ -# Mf-ta6s2 - -m = ta6s2 - -threadFlags = -D_REENTRANT - -include Mf-a6s2 diff --git a/racket/src/ChezScheme/mats/Mf-tarm32le b/racket/src/ChezScheme/mats/Mf-tarm32le deleted file mode 100644 index 6d67e1fd9b..0000000000 --- a/racket/src/ChezScheme/mats/Mf-tarm32le +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-tarm32le - -m = tarm32le - -include Mf-arm32le diff --git a/racket/src/ChezScheme/mats/Mf-tarm64le b/racket/src/ChezScheme/mats/Mf-tarm64le deleted file mode 100644 index 903f81643c..0000000000 --- a/racket/src/ChezScheme/mats/Mf-tarm64le +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-tarm64le - -m = tarm64le - -include Mf-arm64le diff --git a/racket/src/ChezScheme/mats/Mf-tarm64osx b/racket/src/ChezScheme/mats/Mf-tarm64osx deleted file mode 100644 index e4d05eb21f..0000000000 --- a/racket/src/ChezScheme/mats/Mf-tarm64osx +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-tarm64osx - -m ?= tarm64osx - -include Mf-arm64osx diff --git a/racket/src/ChezScheme/mats/Mf-ti3fb b/racket/src/ChezScheme/mats/Mf-ti3fb deleted file mode 100644 index c83a9fa332..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ti3fb +++ /dev/null @@ -1,7 +0,0 @@ -# Mf-ti3fb - -m = ti3fb - -threadFlags = -pthread - -include Mf-i3fb diff --git a/racket/src/ChezScheme/mats/Mf-ti3le b/racket/src/ChezScheme/mats/Mf-ti3le deleted file mode 100644 index 70f3832bfb..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ti3le +++ /dev/null @@ -1,7 +0,0 @@ -# Mf-ti3le - -m = ti3le - -threadFlags = -pthread - -include Mf-i3le diff --git a/racket/src/ChezScheme/mats/Mf-ti3nb b/racket/src/ChezScheme/mats/Mf-ti3nb deleted file mode 100644 index eb6f21bd41..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ti3nb +++ /dev/null @@ -1,7 +0,0 @@ -# Mf-ti3nb - -m = ti3nb - -threadFlags = -pthread - -include Mf-i3nb diff --git a/racket/src/ChezScheme/mats/Mf-ti3nt b/racket/src/ChezScheme/mats/Mf-ti3nt index 4a04350802..3be81d0b19 100644 --- a/racket/src/ChezScheme/mats/Mf-ti3nt +++ b/racket/src/ChezScheme/mats/Mf-ti3nt @@ -1,5 +1,4 @@ # Mf-ti3nt -m = ti3nt include Mf-i3nt diff --git a/racket/src/ChezScheme/mats/Mf-ti3ob b/racket/src/ChezScheme/mats/Mf-ti3ob deleted file mode 100644 index 7c63270d5d..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ti3ob +++ /dev/null @@ -1,7 +0,0 @@ -# Mf-ti3ob - -m = ti3ob - -threadFlags = -pthread - -include Mf-i3ob diff --git a/racket/src/ChezScheme/mats/Mf-ti3osx b/racket/src/ChezScheme/mats/Mf-ti3osx deleted file mode 100644 index 2f0c8d7c11..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ti3osx +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-ti3osx - -m = ti3osx - -include Mf-i3osx diff --git a/racket/src/ChezScheme/mats/Mf-ti3s2 b/racket/src/ChezScheme/mats/Mf-ti3s2 deleted file mode 100644 index 7d7bcd125e..0000000000 --- a/racket/src/ChezScheme/mats/Mf-ti3s2 +++ /dev/null @@ -1,7 +0,0 @@ -# Mf-ti3s2 - -m = ti3s2 - -threadFlags = -D_REENTRANT - -include Mf-i3s2 diff --git a/racket/src/ChezScheme/mats/Mf-tppc32le b/racket/src/ChezScheme/mats/Mf-tppc32le deleted file mode 100644 index 34f4571a6e..0000000000 --- a/racket/src/ChezScheme/mats/Mf-tppc32le +++ /dev/null @@ -1,7 +0,0 @@ -# Mf-tppc32le - -m = tppc32le - -threadFlags = -pthread - -include Mf-ppc32le diff --git a/racket/src/ChezScheme/mats/Mf-tppc32osx b/racket/src/ChezScheme/mats/Mf-tppc32osx deleted file mode 100644 index 2a1a6584ed..0000000000 --- a/racket/src/ChezScheme/mats/Mf-tppc32osx +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-tppc32osx - -m ?= tppc32osx - -include Mf-ppc32osx diff --git a/racket/src/ChezScheme/mats/Mf-arm64osx b/racket/src/ChezScheme/mats/Mf-unix similarity index 51% rename from racket/src/ChezScheme/mats/Mf-arm64osx rename to racket/src/ChezScheme/mats/Mf-unix index fa66a57fd5..73cbf95c20 100644 --- a/racket/src/ChezScheme/mats/Mf-arm64osx +++ b/racket/src/ChezScheme/mats/Mf-unix @@ -1,14 +1,10 @@ -# Mf-arm64osx - -m ?= arm64osx - fsrc = foreign1.c foreign2.c foreign3.c foreign4.c fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - $(CC) -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + $(CC) ${CPPFLAGS} ${CFLAGS} ${mdcflags} -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - $(CC) -o cat_flush cat_flush.c + $(CC) ${CPPFLAGS} ${CFLAGS} -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/rktboot/constant.rkt b/racket/src/ChezScheme/rktboot/constant.rkt index 45e7b183ee..9f6cf4f014 100644 --- a/racket/src/ChezScheme/rktboot/constant.rkt +++ b/racket/src/ChezScheme/rktboot/constant.rkt @@ -1,7 +1,8 @@ #lang racket/base (require racket/match "scheme-readtable.rkt" - "config.rkt") + "config.rkt" + "machine-def.rkt") ;; Extract constants that we need to get started by reading ;; "cmacros.ss" and the machine ".def" file (without trying to run or @@ -58,13 +59,13 @@ [else e])) (define (read-constants-from-file fn) - (call-with-input-file - (build-path scheme-dir "s" fn) - read-constants)) + (define i (open-file-with-machine.def-redirect fn target-machine (build-path scheme-dir "s"))) + (begin0 + (read-constants i) + (close-input-port i))) (when scheme-dir - (read-constants-from-file - (string-append target-machine ".def")) + (read-constants-from-file "machine.def") (read-constants-from-file "cmacros.ss")) (define-syntax-rule (define-constant id ...) diff --git a/racket/src/ChezScheme/rktboot/machine-def.rkt b/racket/src/ChezScheme/rktboot/machine-def.rkt new file mode 100644 index 0000000000..572a4e7e26 --- /dev/null +++ b/racket/src/ChezScheme/rktboot/machine-def.rkt @@ -0,0 +1,28 @@ +#lang racket/base +(require (only-in racket/file file->string)) + +(provide open-file-with-machine.def-redirect) + +(define (open-file-with-machine.def-redirect filename target-machine dir) + (define (build-path* dir f) (if (eq? dir 'same) f (build-path dir f))) + (cond + [(equal? filename "machine.def") + (define def (string-append target-machine ".def")) + (cond + [(file-exists? (build-path* dir def)) (open-input-file (build-path* dir def))] + [else + ;; synthesize a default ".def" file from "[t]unix.def" + (define def (if (regexp-match? #rx"^t" target-machine) "tunix.def" "unix.def")) + (let* ([s (file->string (build-path* dir def))] + [s (regexp-replace* #rx"[$][(]M[)]" s target-machine)] + [s (regexp-replace* #rx"[$][(]March[)]" s + (cond + [(regexp-match? #rx"^t?a6" target-machine) "a6"] + [(regexp-match? #rx"^t?i3" target-machine) "i3"] + [(regexp-match? #rx"^t?arm32" target-machine) "arm32"] + [(regexp-match? #rx"^t?arm64" target-machine) "arm64"] + [(regexp-match? #rx"^t?ppc32" target-machine) "ppc32"] + [else (error "machine.def: cannto infer architecture")]))]) + (open-input-string s))])] + [else + (open-input-file (build-path* dir filename))])) diff --git a/racket/src/ChezScheme/rktboot/make-boot.rkt b/racket/src/ChezScheme/rktboot/make-boot.rkt index a5a859213c..31a9f5f1bd 100644 --- a/racket/src/ChezScheme/rktboot/make-boot.rkt +++ b/racket/src/ChezScheme/rktboot/make-boot.rkt @@ -14,6 +14,7 @@ "scheme-readtable.rkt" "parse-makefile.rkt" "config.rkt" + "machine-def.rkt" "strip.rkt") ;; Set `SCHEME_SRC` and `MACH` to specify the ChezScheme source @@ -243,14 +244,14 @@ (loop #`(begin #,@(with-source-path 'include (syntax->datum #'fn) (lambda (n) - (call-with-input-file* - n - (lambda (i) - (let loop () - (define r (read-syntax n i)) - (if (eof-object? r) - '() - (cons r (loop))))))))))] + (define i (open-file-with-machine.def-redirect n target-machine 'same)) + (begin0 + (let loop () + (define r (read-syntax n i)) + (if (eof-object? r) + '() + (cons r (loop)))) + (close-input-port i))))))] [(constant-case architecture [else e ...]) (loop #`(begin e ...))] [(constant-case architecture [(arch ...) e ...] . _) diff --git a/racket/src/ChezScheme/rktboot/scheme-lang.rkt b/racket/src/ChezScheme/rktboot/scheme-lang.rkt index 17b34d5106..f4380b25db 100644 --- a/racket/src/ChezScheme/rktboot/scheme-lang.rkt +++ b/racket/src/ChezScheme/rktboot/scheme-lang.rkt @@ -22,6 +22,7 @@ "record.rkt" (for-syntax "record.rkt") "constant.rkt" + "machine-def.rkt" (only-in "r6rs-lang.rkt" make-record-constructor-descriptor set-car! @@ -345,7 +346,6 @@ (define-syntax include (lambda (stx) (syntax-case stx () - [(form "machine.def") #`(form ,(string-append target-machine ".def"))] [(form p) #'(r:include-at/relative-to form form p)]))) ;; If we have to avoid `read-syntax`: @@ -353,7 +353,6 @@ (define-syntax include (lambda (stx) (syntax-case stx () - [(form "machine.def") #`(form #,(string-append target-machine ".def"))] [(form p) (let ([r (call-with-input-file* (syntax->datum #'p) @@ -1167,11 +1166,7 @@ (define who 'some-who) (define (with-source-path who name procedure) - (cond - [(equal? name "machine.def") - (procedure (string-append target-machine ".def"))] - [else - (procedure name)])) + (procedure name)) (define ($make-source-oops . args) #f) @@ -1192,7 +1187,7 @@ (define (interpret e) (eval e)) (define ($open-file-input-port who filename [options #f]) - (open-input-file filename)) + (open-file-with-machine.def-redirect filename target-machine 'same)) (define ($open-file-output-port who filename options) (open-output-file filename #:exists (if (eval `(enum-set-subset? (file-options replace) ',options)) diff --git a/racket/src/ChezScheme/s/Mf-a6fb b/racket/src/ChezScheme/s/Mf-a6fb deleted file mode 100644 index 3a42a41cd6..0000000000 --- a/racket/src/ChezScheme/s/Mf-a6fb +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-a6fb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6fb -archincludes = x86_64.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-a6le b/racket/src/ChezScheme/s/Mf-a6le deleted file mode 100644 index 7daf9348d3..0000000000 --- a/racket/src/ChezScheme/s/Mf-a6le +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-a6le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6le -archincludes = x86_64.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-a6nb b/racket/src/ChezScheme/s/Mf-a6nb deleted file mode 100644 index 1a04d4f2c0..0000000000 --- a/racket/src/ChezScheme/s/Mf-a6nb +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-a6nb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6nb -archincludes = x86_64.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-a6nt b/racket/src/ChezScheme/s/Mf-a6nt index 29e08a5297..f8ab8f345e 100644 --- a/racket/src/ChezScheme/s/Mf-a6nt +++ b/racket/src/ChezScheme/s/Mf-a6nt @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -m ?= a6nt archincludes = x86_64.ss include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-a6ob b/racket/src/ChezScheme/s/Mf-a6ob deleted file mode 100644 index 64cc55aac0..0000000000 --- a/racket/src/ChezScheme/s/Mf-a6ob +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-a6ob -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6ob -archincludes = x86_64.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-a6osx b/racket/src/ChezScheme/s/Mf-a6osx deleted file mode 100644 index 9bf0942ab8..0000000000 --- a/racket/src/ChezScheme/s/Mf-a6osx +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-a6osx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6osx -archincludes = x86_64.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-a6s2 b/racket/src/ChezScheme/s/Mf-a6s2 deleted file mode 100644 index 0ac51751e2..0000000000 --- a/racket/src/ChezScheme/s/Mf-a6s2 +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-a6s2 -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= a6s2 -archincludes = x86_64.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-arm32le b/racket/src/ChezScheme/s/Mf-arm32le deleted file mode 100644 index fd7b8fe43f..0000000000 --- a/racket/src/ChezScheme/s/Mf-arm32le +++ /dev/null @@ -1,21 +0,0 @@ -# Mf-arm32le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= arm32le -archincludes = arm32.ss - -include Mf-base - -machine.def: arm32.def diff --git a/racket/src/ChezScheme/s/Mf-arm64le b/racket/src/ChezScheme/s/Mf-arm64le deleted file mode 100644 index 1c7ce88365..0000000000 --- a/racket/src/ChezScheme/s/Mf-arm64le +++ /dev/null @@ -1,21 +0,0 @@ -# Mf-arm64le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= arm64le -archincludes = arm64.ss - -include Mf-base - -machine.def: arm64.def diff --git a/racket/src/ChezScheme/s/Mf-arm64osx b/racket/src/ChezScheme/s/Mf-arm64osx deleted file mode 100644 index 92a5257213..0000000000 --- a/racket/src/ChezScheme/s/Mf-arm64osx +++ /dev/null @@ -1,21 +0,0 @@ -# Mf-arm64osx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= arm64osx -archincludes = arm64.ss - -include Mf-base - -machine.def: arm64.def diff --git a/racket/src/ChezScheme/s/Mf-cross b/racket/src/ChezScheme/s/Mf-cross index 24afa23d0e..d796cbb459 100644 --- a/racket/src/ChezScheme/s/Mf-cross +++ b/racket/src/ChezScheme/s/Mf-cross @@ -22,7 +22,7 @@ base = ../.. xdoit: xboot -include Mf-${xm} +include Mf-base Scheme=$(base)/bin/${m}/scheme export SCHEMEHEAPDIRS=$(base)/boot/${m} @@ -34,7 +34,7 @@ xpatch = xpatch xpatchobj = ${patchobj} xboot: ${xpatch} - $(MAKE) -f Mf-${xm} ${what} m=${xm} patchfile=${xpatch} Scheme="${Scheme}" SCHEMEHEAPDIRS=${SCHEMEHEAPDIRS} + $(MAKE) -f Mf-base ${what} m=${xm} patchfile=${xpatch} Scheme="${Scheme}" SCHEMEHEAPDIRS=${SCHEMEHEAPDIRS} ${xpatch}: ${xpatchobj} cat ${xpatchobj} > ${xpatch} diff --git a/racket/src/ChezScheme/s/Mf-i3fb b/racket/src/ChezScheme/s/Mf-i3fb deleted file mode 100644 index f96b9eabd7..0000000000 --- a/racket/src/ChezScheme/s/Mf-i3fb +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-i3fb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3fb -archincludes = x86.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-i3le b/racket/src/ChezScheme/s/Mf-i3le deleted file mode 100644 index 1caf899063..0000000000 --- a/racket/src/ChezScheme/s/Mf-i3le +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-i3le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3le -archincludes = x86.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-i3nb b/racket/src/ChezScheme/s/Mf-i3nb deleted file mode 100644 index ed037cdedd..0000000000 --- a/racket/src/ChezScheme/s/Mf-i3nb +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-i3nb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3nb -archincludes = x86.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-i3nt b/racket/src/ChezScheme/s/Mf-i3nt index e5752ad38e..b6a9a3fb06 100644 --- a/racket/src/ChezScheme/s/Mf-i3nt +++ b/racket/src/ChezScheme/s/Mf-i3nt @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -m ?= i3nt archincludes = x86.ss include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-i3ob b/racket/src/ChezScheme/s/Mf-i3ob deleted file mode 100644 index a8d5612c6e..0000000000 --- a/racket/src/ChezScheme/s/Mf-i3ob +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-i3ob -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3ob -archincludes = x86.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-i3osx b/racket/src/ChezScheme/s/Mf-i3osx deleted file mode 100644 index d97028f7b6..0000000000 --- a/racket/src/ChezScheme/s/Mf-i3osx +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-i3osx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3osx -archincludes = x86.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-i3qnx b/racket/src/ChezScheme/s/Mf-i3qnx deleted file mode 100644 index dc4c6b0336..0000000000 --- a/racket/src/ChezScheme/s/Mf-i3qnx +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-i3qnx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = i3qnx -archincludes = x86.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-i3s2 b/racket/src/ChezScheme/s/Mf-i3s2 deleted file mode 100644 index 96c5857831..0000000000 --- a/racket/src/ChezScheme/s/Mf-i3s2 +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-i3s2 -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= i3s2 -archincludes = x86.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-pb b/racket/src/ChezScheme/s/Mf-pb deleted file mode 100644 index 30286f9635..0000000000 --- a/racket/src/ChezScheme/s/Mf-pb +++ /dev/null @@ -1,6 +0,0 @@ -# Mf-pb - -m = pb -archincludes = pb.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-ppc32le b/racket/src/ChezScheme/s/Mf-ppc32le deleted file mode 100644 index 95f0b5551b..0000000000 --- a/racket/src/ChezScheme/s/Mf-ppc32le +++ /dev/null @@ -1,21 +0,0 @@ -# Mf-ppc32le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m ?= ppc32le -archincludes = ppc32.ss - -include Mf-base - -machine.def: ppc32.def diff --git a/racket/src/ChezScheme/s/Mf-ppc32osx b/racket/src/ChezScheme/s/Mf-ppc32osx deleted file mode 100644 index 90e504a865..0000000000 --- a/racket/src/ChezScheme/s/Mf-ppc32osx +++ /dev/null @@ -1,6 +0,0 @@ -# Mf-ppc32osx - -m ?= ppc32osx -archincludes = ppc32.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-ta6fb b/racket/src/ChezScheme/s/Mf-ta6fb deleted file mode 100644 index 8987a6a1dd..0000000000 --- a/racket/src/ChezScheme/s/Mf-ta6fb +++ /dev/null @@ -1,18 +0,0 @@ -# Mf-ta6fb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = ta6fb - -include Mf-a6fb diff --git a/racket/src/ChezScheme/s/Mf-ta6le b/racket/src/ChezScheme/s/Mf-ta6le deleted file mode 100644 index d213041e53..0000000000 --- a/racket/src/ChezScheme/s/Mf-ta6le +++ /dev/null @@ -1,18 +0,0 @@ -# Mf-ta6le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = ta6le - -include Mf-a6le diff --git a/racket/src/ChezScheme/s/Mf-ta6nb b/racket/src/ChezScheme/s/Mf-ta6nb deleted file mode 100644 index 51bc03527e..0000000000 --- a/racket/src/ChezScheme/s/Mf-ta6nb +++ /dev/null @@ -1,18 +0,0 @@ -# Mf-ta6nb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = ta6nb - -include Mf-a6nb diff --git a/racket/src/ChezScheme/s/Mf-ta6nt b/racket/src/ChezScheme/s/Mf-ta6nt index 3bc5e1dfb0..72190feed7 100644 --- a/racket/src/ChezScheme/s/Mf-ta6nt +++ b/racket/src/ChezScheme/s/Mf-ta6nt @@ -13,6 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -m = ta6nt include Mf-a6nt diff --git a/racket/src/ChezScheme/s/Mf-ta6ob b/racket/src/ChezScheme/s/Mf-ta6ob deleted file mode 100644 index 9a36fab922..0000000000 --- a/racket/src/ChezScheme/s/Mf-ta6ob +++ /dev/null @@ -1,18 +0,0 @@ -# Mf-ta6ob -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = ta6ob - -include Mf-a6ob diff --git a/racket/src/ChezScheme/s/Mf-ta6osx b/racket/src/ChezScheme/s/Mf-ta6osx deleted file mode 100644 index 5bf0f22875..0000000000 --- a/racket/src/ChezScheme/s/Mf-ta6osx +++ /dev/null @@ -1,18 +0,0 @@ -# Mf-ta6osx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = ta6osx - -include Mf-a6osx diff --git a/racket/src/ChezScheme/s/Mf-ta6s2 b/racket/src/ChezScheme/s/Mf-ta6s2 deleted file mode 100644 index 9351d8e0a1..0000000000 --- a/racket/src/ChezScheme/s/Mf-ta6s2 +++ /dev/null @@ -1,18 +0,0 @@ -# Mf-ta6s2 -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = ta6s2 - -include Mf-a6s2 diff --git a/racket/src/ChezScheme/s/Mf-tarm32le b/racket/src/ChezScheme/s/Mf-tarm32le deleted file mode 100644 index e3d9797bfd..0000000000 --- a/racket/src/ChezScheme/s/Mf-tarm32le +++ /dev/null @@ -1,18 +0,0 @@ -# Mf-tarm32le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = tarm32le - -include Mf-arm32le diff --git a/racket/src/ChezScheme/s/Mf-tarm64le b/racket/src/ChezScheme/s/Mf-tarm64le deleted file mode 100644 index c2bf17db01..0000000000 --- a/racket/src/ChezScheme/s/Mf-tarm64le +++ /dev/null @@ -1,18 +0,0 @@ -# Mf-tarm64le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = tarm64le - -include Mf-arm64le diff --git a/racket/src/ChezScheme/s/Mf-tarm64osx b/racket/src/ChezScheme/s/Mf-tarm64osx deleted file mode 100644 index 09f0a2a416..0000000000 --- a/racket/src/ChezScheme/s/Mf-tarm64osx +++ /dev/null @@ -1,18 +0,0 @@ -# Mf-tarm64osx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = tarm64osx - -include Mf-arm64osx diff --git a/racket/src/ChezScheme/s/Mf-ti3fb b/racket/src/ChezScheme/s/Mf-ti3fb deleted file mode 100644 index 1b12d2b83e..0000000000 --- a/racket/src/ChezScheme/s/Mf-ti3fb +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-ti3fb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = ti3fb -archincludes = x86.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-ti3le b/racket/src/ChezScheme/s/Mf-ti3le deleted file mode 100644 index 679073e261..0000000000 --- a/racket/src/ChezScheme/s/Mf-ti3le +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-ti3le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = ti3le -archincludes = x86.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-ti3nb b/racket/src/ChezScheme/s/Mf-ti3nb deleted file mode 100644 index 2f039aa3c6..0000000000 --- a/racket/src/ChezScheme/s/Mf-ti3nb +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-ti3nb -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = ti3nb -archincludes = x86.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-ti3nt b/racket/src/ChezScheme/s/Mf-ti3nt index 83c9fbe8b3..f01a36d526 100644 --- a/racket/src/ChezScheme/s/Mf-ti3nt +++ b/racket/src/ChezScheme/s/Mf-ti3nt @@ -13,6 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -m = ti3nt include Mf-i3nt diff --git a/racket/src/ChezScheme/s/Mf-ti3ob b/racket/src/ChezScheme/s/Mf-ti3ob deleted file mode 100644 index b1cbc111c5..0000000000 --- a/racket/src/ChezScheme/s/Mf-ti3ob +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-ti3ob -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = ti3ob -archincludes = x86.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-ti3osx b/racket/src/ChezScheme/s/Mf-ti3osx deleted file mode 100644 index a83bd3feb0..0000000000 --- a/racket/src/ChezScheme/s/Mf-ti3osx +++ /dev/null @@ -1,18 +0,0 @@ -# Mf-ti3osx -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = ti3osx - -include Mf-i3osx diff --git a/racket/src/ChezScheme/s/Mf-ti3s2 b/racket/src/ChezScheme/s/Mf-ti3s2 deleted file mode 100644 index 857ca569bb..0000000000 --- a/racket/src/ChezScheme/s/Mf-ti3s2 +++ /dev/null @@ -1,19 +0,0 @@ -# Mf-ti3s2 -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = ti3s2 -archincludes = x86.ss - -include Mf-base diff --git a/racket/src/ChezScheme/s/Mf-tppc32le b/racket/src/ChezScheme/s/Mf-tppc32le deleted file mode 100644 index b1d4949922..0000000000 --- a/racket/src/ChezScheme/s/Mf-tppc32le +++ /dev/null @@ -1,18 +0,0 @@ -# Mf-tppc32le -# Copyright 1984-2017 Cisco Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -m = tppc32le - -include Mf-ppc32le diff --git a/racket/src/ChezScheme/s/Mf-tppc32osx b/racket/src/ChezScheme/s/Mf-tppc32osx deleted file mode 100644 index 56b001c5d7..0000000000 --- a/racket/src/ChezScheme/s/Mf-tppc32osx +++ /dev/null @@ -1,5 +0,0 @@ -# Mf-tppc32osx - -m = tppc32osx - -include Mf-ppc32osx diff --git a/racket/src/ChezScheme/s/Mf-unix b/racket/src/ChezScheme/s/Mf-unix new file mode 100644 index 0000000000..45ab80e6dd --- /dev/null +++ b/racket/src/ChezScheme/s/Mf-unix @@ -0,0 +1 @@ +include Mf-base diff --git a/racket/src/ChezScheme/s/a6fb.def b/racket/src/ChezScheme/s/a6fb.def deleted file mode 100644 index 9ffa57618c..0000000000 --- a/racket/src/ChezScheme/s/a6fb.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; a6fb.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-a6fb)) -(features iconv expeditor) -(include "a6.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/a6le.def b/racket/src/ChezScheme/s/a6le.def deleted file mode 100644 index 0582d9a088..0000000000 --- a/racket/src/ChezScheme/s/a6le.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; a6le.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-a6le)) -(features iconv expeditor) -(include "a6.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/a6nb.def b/racket/src/ChezScheme/s/a6nb.def deleted file mode 100644 index ed48fcbcf1..0000000000 --- a/racket/src/ChezScheme/s/a6nb.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; a6nb.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-a6nb)) -(features iconv expeditor) -(include "a6.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/a6ob.def b/racket/src/ChezScheme/s/a6ob.def deleted file mode 100644 index 98d86057e5..0000000000 --- a/racket/src/ChezScheme/s/a6ob.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; a6ob.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-a6ob)) -(features iconv expeditor) -(include "a6.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/a6osx.def b/racket/src/ChezScheme/s/a6osx.def deleted file mode 100644 index c447683c78..0000000000 --- a/racket/src/ChezScheme/s/a6osx.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; a6osx.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-a6osx)) -(features iconv expeditor) -(include "a6.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/a6s2.def b/racket/src/ChezScheme/s/a6s2.def deleted file mode 100644 index 2b8ccb6919..0000000000 --- a/racket/src/ChezScheme/s/a6s2.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; a6s2.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-a6s2)) -(features iconv expeditor) -(include "a6.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/arm32le.def b/racket/src/ChezScheme/s/arm32le.def deleted file mode 100644 index eb4a036c6e..0000000000 --- a/racket/src/ChezScheme/s/arm32le.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; arm32le.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-arm32le)) -(features iconv expeditor) -(include "arm32.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/arm64le.def b/racket/src/ChezScheme/s/arm64le.def deleted file mode 100644 index 910081655b..0000000000 --- a/racket/src/ChezScheme/s/arm64le.def +++ /dev/null @@ -1,6 +0,0 @@ -;;; arm64le.def - -(define-constant machine-type (constant machine-type-arm64le)) -(features iconv expeditor) -(include "arm64.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/i3fb.def b/racket/src/ChezScheme/s/i3fb.def deleted file mode 100644 index 8f11c4db46..0000000000 --- a/racket/src/ChezScheme/s/i3fb.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; i3fb.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-i3fb)) -(features iconv expeditor) -(include "i3.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/i3le.def b/racket/src/ChezScheme/s/i3le.def deleted file mode 100644 index 7b77ecc303..0000000000 --- a/racket/src/ChezScheme/s/i3le.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; i3le.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-i3le)) -(features iconv expeditor) -(include "i3.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/i3nb.def b/racket/src/ChezScheme/s/i3nb.def deleted file mode 100644 index ae10180ed8..0000000000 --- a/racket/src/ChezScheme/s/i3nb.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; i3nb.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-i3nb)) -(features iconv expeditor) -(include "i3.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/i3ob.def b/racket/src/ChezScheme/s/i3ob.def deleted file mode 100644 index 36a8fc1dfc..0000000000 --- a/racket/src/ChezScheme/s/i3ob.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; i3ob.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-i3ob)) -(features iconv expeditor) -(include "i3.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/i3osx.def b/racket/src/ChezScheme/s/i3osx.def deleted file mode 100644 index 4c5baeac9b..0000000000 --- a/racket/src/ChezScheme/s/i3osx.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; i3osx.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-i3osx)) -(features iconv expeditor) -(include "i3.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/i3s2.def b/racket/src/ChezScheme/s/i3s2.def deleted file mode 100644 index 0acd01bd38..0000000000 --- a/racket/src/ChezScheme/s/i3s2.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; i3s2.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-i3s2)) -(features iconv expeditor) -(include "i3.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/mkheader.ss b/racket/src/ChezScheme/s/mkheader.ss index 0b565afb7b..778156d30c 100644 --- a/racket/src/ChezScheme/s/mkheader.ss +++ b/racket/src/ChezScheme/s/mkheader.ss @@ -1184,6 +1184,8 @@ (nl) (comment "threads") + (when-feature pthreads + (pr "#define scheme_feature_pthreads 1~%")) (defref THREADTYPE thread type) (defref THREADTC thread tc) diff --git a/racket/src/ChezScheme/s/ppc32le.def b/racket/src/ChezScheme/s/ppc32le.def deleted file mode 100644 index 7417c64796..0000000000 --- a/racket/src/ChezScheme/s/ppc32le.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ppc32le.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ppc32le)) -(features iconv expeditor) -(include "ppc32.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/ta6fb.def b/racket/src/ChezScheme/s/ta6fb.def deleted file mode 100644 index 741c288a9c..0000000000 --- a/racket/src/ChezScheme/s/ta6fb.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ta6fb.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ta6fb)) -(features iconv expeditor pthreads) -(include "a6.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/ta6le.def b/racket/src/ChezScheme/s/ta6le.def deleted file mode 100644 index 53459a2f90..0000000000 --- a/racket/src/ChezScheme/s/ta6le.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ta6le.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ta6le)) -(features iconv expeditor pthreads) -(include "a6.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/ta6nb.def b/racket/src/ChezScheme/s/ta6nb.def deleted file mode 100644 index c87428012b..0000000000 --- a/racket/src/ChezScheme/s/ta6nb.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ta6nb.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ta6nb)) -(features iconv expeditor pthreads) -(include "a6.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/ta6ob.def b/racket/src/ChezScheme/s/ta6ob.def deleted file mode 100644 index 0db2867d05..0000000000 --- a/racket/src/ChezScheme/s/ta6ob.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ta6ob.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ta6ob)) -(features iconv expeditor pthreads) -(include "a6.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/ta6osx.def b/racket/src/ChezScheme/s/ta6osx.def deleted file mode 100644 index 4ed30d64ed..0000000000 --- a/racket/src/ChezScheme/s/ta6osx.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ta6osx.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ta6osx)) -(features iconv expeditor pthreads) -(include "a6.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/ta6s2.def b/racket/src/ChezScheme/s/ta6s2.def deleted file mode 100644 index 845029686d..0000000000 --- a/racket/src/ChezScheme/s/ta6s2.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ta6s2.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ta6s2)) -(features iconv expeditor pthreads) -(include "a6.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/tarm32le.def b/racket/src/ChezScheme/s/tarm32le.def deleted file mode 100644 index 02dfc03992..0000000000 --- a/racket/src/ChezScheme/s/tarm32le.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; tarm32le.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-tarm32le)) -(features iconv expeditor pthreads) -(include "arm32.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/tarm64le.def b/racket/src/ChezScheme/s/tarm64le.def deleted file mode 100644 index 9d02ddcf37..0000000000 --- a/racket/src/ChezScheme/s/tarm64le.def +++ /dev/null @@ -1,6 +0,0 @@ -;;; tarm64le.def - -(define-constant machine-type (constant machine-type-tarm64le)) -(features iconv expeditor pthreads) -(include "arm64.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/tarm64osx.def b/racket/src/ChezScheme/s/tarm64osx.def deleted file mode 100644 index 07f98341c5..0000000000 --- a/racket/src/ChezScheme/s/tarm64osx.def +++ /dev/null @@ -1,6 +0,0 @@ -;;; tarm64osx.def - -(define-constant machine-type (constant machine-type-tarm64osx)) -(features iconv expeditor pthreads) -(include "arm64.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/ti3fb.def b/racket/src/ChezScheme/s/ti3fb.def deleted file mode 100644 index 457f7d964d..0000000000 --- a/racket/src/ChezScheme/s/ti3fb.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ti3fb.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ti3fb)) -(features iconv expeditor pthreads) -(include "i3.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/ti3le.def b/racket/src/ChezScheme/s/ti3le.def deleted file mode 100644 index 0326d2b11f..0000000000 --- a/racket/src/ChezScheme/s/ti3le.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ti3le.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ti3le)) -(features iconv expeditor pthreads) -(include "i3.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/ti3nb.def b/racket/src/ChezScheme/s/ti3nb.def deleted file mode 100644 index c3b12ee830..0000000000 --- a/racket/src/ChezScheme/s/ti3nb.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ti3nb.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ti3nb)) -(features iconv expeditor pthreads) -(include "i3.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/ti3ob.def b/racket/src/ChezScheme/s/ti3ob.def deleted file mode 100644 index 6e3d194e68..0000000000 --- a/racket/src/ChezScheme/s/ti3ob.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ti3ob.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ti3ob)) -(features iconv expeditor pthreads) -(include "i3.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/ti3osx.def b/racket/src/ChezScheme/s/ti3osx.def deleted file mode 100644 index 99323c562b..0000000000 --- a/racket/src/ChezScheme/s/ti3osx.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ti3osx.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ti3osx)) -(features iconv expeditor pthreads) -(include "i3.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/ti3s2.def b/racket/src/ChezScheme/s/ti3s2.def deleted file mode 100644 index 2f140c218d..0000000000 --- a/racket/src/ChezScheme/s/ti3s2.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; ti3s2.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-ti3s2)) -(features iconv expeditor pthreads) -(include "i3.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/tppc32le.def b/racket/src/ChezScheme/s/tppc32le.def deleted file mode 100644 index 9a2d09df35..0000000000 --- a/racket/src/ChezScheme/s/tppc32le.def +++ /dev/null @@ -1,19 +0,0 @@ -;;; tppc32le.def -;;; Copyright 1984-2017 Cisco Systems, Inc. -;;; -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(define-constant machine-type (constant machine-type-tppc32le)) -(features iconv expeditor pthreads) -(include "ppc32.def") -(include "default.def") diff --git a/racket/src/ChezScheme/s/tunix.def b/racket/src/ChezScheme/s/tunix.def new file mode 100644 index 0000000000..87c03012cd --- /dev/null +++ b/racket/src/ChezScheme/s/tunix.def @@ -0,0 +1,7 @@ +;; This template is turned into a machine-specific ".def" file +;; by the `workarea` script + +(define-constant machine-type (constant machine-type-$(M))) +(features iconv expeditor pthreads) +(include "$(March).def") +(include "default.def") diff --git a/racket/src/ChezScheme/s/unix.def b/racket/src/ChezScheme/s/unix.def new file mode 100644 index 0000000000..e0cb28c05b --- /dev/null +++ b/racket/src/ChezScheme/s/unix.def @@ -0,0 +1,7 @@ +;; This template is turned into a machine-specific ".def" file +;; by the `workarea` script + +(define-constant machine-type (constant machine-type-$(M))) +(features iconv expeditor) +(include "$(March).def") +(include "default.def") diff --git a/racket/src/ChezScheme/workarea b/racket/src/ChezScheme/workarea index 0f672e820b..24f78e5208 100755 --- a/racket/src/ChezScheme/workarea +++ b/racket/src/ChezScheme/workarea @@ -68,60 +68,75 @@ case "$Mhost" in ppc32osx) ;; ppc32osx) ;; arm64osx) ;; - ta6fb) Muni=a6fb ;; - ta6le) Muni=a6le ;; - ta6nb) Muni=a6nb ;; - ta6nt) Muni=a6nt ;; - ta6ob) Muni=a6ob ;; - ta6osx) Muni=a6osx ;; - ta6s2) Muni=a6s2 ;; - tarm32le) Muni=arm32le ;; - tarm64le) Muni=arm64le ;; - tarm64osx) Muni=arm64osx ;; - ti3fb) Muni=i3fb ;; - ti3le) Muni=i3le ;; - ti3nb) Muni=i3nb ;; - ti3nt) Muni=i3nt ;; - ti3ob) Muni=i3ob ;; - ti3osx) Muni=i3osx ;; - ti3qnx) Muni=i3qnx ;; - ti3s2) Muni=i3s2 ;; - tppc32le) Muni=ppc32le ;; - tppc32osx) Muni=ppc32osx ;; - tarm64osx) Muni=arm64osx ;; + ta6fb) ;; + ta6le) ;; + ta6nb) ;; + ta6nt) ;; + ta6ob) ;; + ta6osx) ;; + ta6s2) ;; + tarm32le) ;; + tarm64le) ;; + tarm64osx) ;; + ti3fb) ;; + ti3le) ;; + ti3nb) ;; + ti3nt) ;; + ti3ob) ;; + ti3osx) ;; + ti3s2) ;; + tppc32le) ;; + tppc32osx) ;; + tarm64osx) ;; *) echo "Unrecognized machine name $Mhost"; exit 1 ;; esac +Muni=`echo $M | sed -e 's/^t//'` + +# If Mtype is set, then Mf-$Mtype is used, +# otherwise Mf-$M and Mf-$Muni is used +case "$Mhost" in + *nt) ;; + *) Mtype=unix ;; +esac + if [ "$Muni" != "" ] ; then Muniarch=$Muni else Muniarch=$Mhost fi -case "$Muniarch" in - a6fb) March=a6 ;; - a6le) March=a6 ;; - a6nb) March=a6 ;; - a6nt) March=a6 ;; - a6ob) March=a6 ;; - a6osx) March=a6 ;; - a6s2) March=a6 ;; - arm32le) March=arm32 ;; - arm64le) March=arm64 ;; - arm64osx) March=arm64 ;; - i3fb) March=i3 ;; - i3le) March=i3 ;; - i3nb) March=i3 ;; - i3nt) March=i3 ;; - i3ob) March=i3 ;; - i3osx) March=i3 ;; - i3qnx) March=i3 ;; - i3s2) March=i3 ;; - ppc32le) March=ppc32 ;; - ppc32osx) March=ppc32 ;; - *) March="" ;; +case "$Muni" in + a6*) + March=a6 + archincludes=x86_64.ss + ;; + arm32*) + March=arm32 + archincludes=arm32.ss + ;; + arm64*) + March=arm64 + archincludes=arm64.ss + ;; + i3*) + March=i3 + archincludes=x86.ss + ;; + ppc32*) + March=ppc32 + archincludes=ppc32.ss + ;; + pb) + March=pb + archincludes=pb.ss + ;; + *) + March="" + archincludes="" + ;; esac - + case "$Muniarch" in a6nt) Mos=nt ;; i3nt) Mos=nt ;; @@ -182,6 +197,9 @@ workln() # attempts to create link even if source does not exist forceworkln() { + if [ -h $2 ] ; then + rm $2 + fi if [ ! -e $2 ] ; then ln -s "$1" $2 2> /dev/null fi @@ -205,14 +223,15 @@ workdir() workdir $W workdir $W/c -(cd $W/c; workln "$upupsrcdir"/c/Mf-$M Mf-$M) -(cd $W/c; forceworkln Mf-$M Makefile) -if [ "$Muni" != "" ] ; then - (cd $W/c; workln "$upupsrcdir"/c/Mf-$Muni Mf-$Muni) -fi -if [ "$Mpbhost" != "" ] ; then - (cd $W/c; workln "$upupsrcdir"/c/Mf-$Mpbhost Mf-$Mpbhost) - (cd $W/c; forceworkln Mf-$Mpbhost Mf-pbhost) +if [ "$Mtype" != "" ] ; then + (cd $W/c; workln "$upupsrcdir"/c/Mf-$Mtype Mf-$Mtype) + (cd $W/c; forceworkln Mf-$Mtype Makefile) +else + (cd $W/c; workln "$upupsrcdir"/c/Mf-$M Mf-$M) + (cd $W/c; forceworkln Mf-$M Makefile) + if [ "$Muni" != "" ] ; then + (cd $W/c; workln "$upupsrcdir"/c/Mf-$Muni Mf-$Muni) + fi fi (cd $W/c; workln "$upupsrcdir"/c/Mf-base Mf-base) if [ ! -e $W/c/config.h ] ; then @@ -228,14 +247,34 @@ case $M in esac workdir $W/s -(cd $W/s; workln ${upupsrcdir}/s/Mf-$M Mf-$M) -(cd $W/s; forceworkln Mf-$M Makefile) -if [ "$Muni" != "" ] ; then - (cd $W/s; workln ${upupsrcdir}/s/Mf-$Muni Mf-$Muni) +if [ "$Mtype" != "" ] ; then + (cd $W/s; workln ${upupsrcdir}/s/Mf-$Mtype Mf-$Mtype) + (cd $W/s; forceworkln Mf-$Mtype Makefile) +else + (cd $W/s; workln ${upupsrcdir}/s/Mf-$M Mf-$M) + (cd $W/s; forceworkln Mf-$M Makefile) + if [ "$Muni" != "" ] ; then + (cd $W/s; workln ${upupsrcdir}/s/Mf-$Muni Mf-$Muni) + fi fi (cd $W/s; workln "$upupsrcdir"/s/Mf-base Mf-base) (cd $W/s; workln "$upupsrcdir"/s/Mf-cross Mf-cross) -(cd $W/s; workln "$upupsrcdir"/s/$M.def $M.def) +if [ -e "$srcdir"/s/$M.def ] ; then + (cd $W/s; workln "$upupsrcdir"/s/$M.def $M.def) +else + # synthesize generic Unix .def file + if [ -h $W/s/$M.def ] ; then + rm $W/s/$M.def + fi + if [ $"M" = "$Muni" ] ; then + Munix=unix + else + Munix=tunix + fi + sed -e 's/$(M)/'$M'/g'\ + -e 's/$(March)/'$March'/g'\ + "$srcdir"/s/${Munix}.def > $W/s/$M.def +fi (cd $W/s; forceworkln2 $M.def machine.def) if [ "$March" != "" ] ; then (cd $W/s; workln "$upupsrcdir"/s/$March.def $March.def) @@ -246,10 +285,15 @@ fi (cd $W/s; workln "$upupsrcdir"/s/default.def default.def) workdir $W/mats -(cd $W/mats; workln "$upupsrcdir"/mats/Mf-$M Mf-$M) -(cd $W/mats; forceworkln Mf-$M Makefile) -if [ "$Muni" != "" ] ; then - (cd $W/mats; workln "$upupsrcdir"/mats/Mf-$Muni Mf-$Muni) +if [ "$Mtype" != "" ] ; then + (cd $W/mats; workln "$upupsrcdir"/mats/Mf-$Mtype Mf-$Mtype) + (cd $W/mats; forceworkln Mf-$Mtype Makefile) +else + (cd $W/mats; workln "$upupsrcdir"/mats/Mf-$M Mf-$M) + (cd $W/mats; forceworkln Mf-$M Makefile) + if [ "$Muni" != "" ] ; then + (cd $W/mats; workln "$upupsrcdir"/mats/Mf-$Muni Mf-$Muni) + fi fi if [ "$Mpbhost" != "" ] ; then (cd $W/mats; workln "$upupsrcdir"/mats/Mf-$Mpbhost Mf-$Mpbhost) @@ -385,14 +429,12 @@ esac cat > $W/s/Mf-config << END upupsrcdir=$upupsrcdir upupupbootdir=$upupupbootdir +m=$M +archincludes=$archincludes END cat > $W/Mf-config << END srcdir=$srcdir END -cat > $W/mats/Mf-config << END -upupsrcdir=$upupsrcdir -END - exit 0