From 04c2b74a7776082802858a6d358d419a70df9925 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sun, 6 Jan 2019 23:17:58 +0000 Subject: [PATCH] Expose fasl-format:x86-64 as another name for the amd64 format. Relevant because MIT_SCHEME_NATIVE_CODE gets set to x86-64, and gets plopped into `fasl-format:@MIT_SCHEME_NATIVE_CODE' in the makefile. --- src/compiler/base/fasdump.scm | 2 ++ src/compiler/machines/C/compiler.pkg | 1 + src/compiler/machines/i386/compiler.pkg | 1 + src/compiler/machines/svm/compiler.pkg | 1 + src/compiler/machines/x86-64/compiler.pkg | 1 + 5 files changed, 6 insertions(+) diff --git a/src/compiler/base/fasdump.scm b/src/compiler/base/fasdump.scm index 82c243e50..1a31d55f1 100644 --- a/src/compiler/base/fasdump.scm +++ b/src/compiler/base/fasdump.scm @@ -223,6 +223,8 @@ USA. (define fasl-format:aarch64le (make-std64le-fasl-format 25)) (define fasl-format:aarch64be (make-std64be-fasl-format 25)) +(define fasl-format:x86-64 fasl-format:amd64) + (define fasl-format:svm1-32be (make-std32be-fasl-format 26)) (define fasl-format:svm1-32le (make-std32le-fasl-format 27)) (define fasl-format:svm1-64be (make-std64be-fasl-format 28)) diff --git a/src/compiler/machines/C/compiler.pkg b/src/compiler/machines/C/compiler.pkg index f50b51ba0..5fb982bc4 100644 --- a/src/compiler/machines/C/compiler.pkg +++ b/src/compiler/machines/C/compiler.pkg @@ -412,6 +412,7 @@ USA. fasl-format:svm1-32le fasl-format:svm1-64be fasl-format:svm1-64le + fasl-format:x86-64 portable-fasdump)) (define-package (compiler constraints) diff --git a/src/compiler/machines/i386/compiler.pkg b/src/compiler/machines/i386/compiler.pkg index 53b4f2a8e..8e7733193 100644 --- a/src/compiler/machines/i386/compiler.pkg +++ b/src/compiler/machines/i386/compiler.pkg @@ -398,6 +398,7 @@ USA. fasl-format:svm1-32le fasl-format:svm1-64be fasl-format:svm1-64le + fasl-format:x86-64 portable-fasdump)) (define-package (compiler constraints) diff --git a/src/compiler/machines/svm/compiler.pkg b/src/compiler/machines/svm/compiler.pkg index a938370b2..6c8a69a70 100644 --- a/src/compiler/machines/svm/compiler.pkg +++ b/src/compiler/machines/svm/compiler.pkg @@ -400,6 +400,7 @@ USA. fasl-format:svm1-32le fasl-format:svm1-64be fasl-format:svm1-64le + fasl-format:x86-64 portable-fasdump)) (define-package (compiler constraints) diff --git a/src/compiler/machines/x86-64/compiler.pkg b/src/compiler/machines/x86-64/compiler.pkg index b37968fc2..742e48852 100644 --- a/src/compiler/machines/x86-64/compiler.pkg +++ b/src/compiler/machines/x86-64/compiler.pkg @@ -398,6 +398,7 @@ USA. fasl-format:svm1-32le fasl-format:svm1-64be fasl-format:svm1-64le + fasl-format:x86-64 portable-fasdump)) (define-package (compiler constraints) -- 2.25.1