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.

diff --git a/src/compiler/base/fasdump.scm b/src/compiler/base/fasdump.scm
index 82c243e5007f08e04361ea1a7c94b03d4e162ff5..1a31d55f12d5abc8fe87196cd7a29d0c2a77539e 100644 (file)
--- 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 f50b51ba0307cff647bacf66add352009d29631d..5fb982bc4f33a3f985553cbc982c783778c91439 100644 (file)
--- 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 53b4f2a8e0f60c662a9be3ed218433c466341543..8e7733193d2b19c35fc7b619c90cd6128864dd3a 100644 (file)
--- 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 a938370b28aa6c5b4818952e2d3d00ff9bb07727..6c8a69a70b7504b8bdb450f848e1849c341a08b9 100644 (file)
--- 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 b37968fc286c0e065114a7dd0c926a175148497a..742e488524a6278d32477aa75dd584bcacebbf09 100644 (file)
--- 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)