Skip to content
Snippets Groups Projects
Commit 7889e989 authored by Raymond Toy's avatar Raymond Toy
Browse files

Wrap exports in eval-when for x86 as was done for sparc and add

CHAR-BYTES to x86-x86 cross-compile script.

Only the change for CHAR-BYTES is needed for cross-compiling from x86
to x86, but I think the other changes will be needed if you do a
cross-compile from some other arch to x86.
parent e5a2fa14
No related branches found
No related tags found
No related merge requests found
...@@ -15,8 +15,10 @@ ...@@ -15,8 +15,10 @@
(intl:textdomain "cmucl-x86-vm") (intl:textdomain "cmucl-x86-vm")
;;; Support for callbacks to Lisp. ;;; Support for callbacks to Lisp.
(eval-when (:compile-toplevel :load-toplevel :execute)
(export '(make-callback-trampoline callback-accessor-form (export '(make-callback-trampoline callback-accessor-form
compatible-function-types-p)) compatible-function-types-p))
)
(defun callback-accessor-form (type sp offset) (defun callback-accessor-form (type sp offset)
`(alien:deref (sap-alien `(alien:deref (sap-alien
......
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
;;;; Machine Architecture parameters: ;;;; Machine Architecture parameters:
(eval-when (:compile-toplevel :load-toplevel :execute)
(export '(word-bits byte-bits char-bits word-shift word-bytes char-bytes (export '(word-bits byte-bits char-bits word-shift word-bytes char-bytes
fixnum-tag-bits fixnum-tag-mask positive-fixnum-bits fixnum-tag-bits fixnum-tag-mask positive-fixnum-bits
float-sign-shift float-sign-shift
...@@ -96,6 +97,7 @@ ...@@ -96,6 +97,7 @@
float-underflow-trap-bit float-overflow-trap-bit float-underflow-trap-bit float-overflow-trap-bit
float-imprecise-trap-bit float-invalid-trap-bit float-imprecise-trap-bit float-invalid-trap-bit
float-divide-by-zero-trap-bit)) float-divide-by-zero-trap-bit))
)
#+double-double #+double-double
(export '(double-double-float-digits)) (export '(double-double-float-digits))
...@@ -224,11 +226,13 @@ ...@@ -224,11 +226,13 @@
;;;; Description of the target address space. ;;;; Description of the target address space.
(eval-when (:compile-toplevel :load-toplevel :execute)
(export '(target-read-only-space-start (export '(target-read-only-space-start
target-static-space-start target-static-space-start
target-dynamic-space-start target-dynamic-space-start
target-foreign-linkage-space-start target-foreign-linkage-space-start
target-foreign-linkage-entry-size)) target-foreign-linkage-entry-size))
)
;;; Where to put the different spaces. ;;; Where to put the different spaces.
;;; ;;;
...@@ -253,6 +257,7 @@ ...@@ -253,6 +257,7 @@
;;;; Other random constants. ;;;; Other random constants.
(eval-when (:compile-toplevel :load-toplevel :execute)
(export '(halt-trap pending-interrupt-trap error-trap cerror-trap (export '(halt-trap pending-interrupt-trap error-trap cerror-trap
breakpoint-trap function-end-breakpoint-trap breakpoint-trap function-end-breakpoint-trap
single-step-breakpoint-trap single-step-breakpoint-trap
...@@ -261,6 +266,7 @@ ...@@ -261,6 +266,7 @@
object-not-list-trap object-not-instance-trap object-not-list-trap object-not-instance-trap
trace-table-normal trace-table-call-site trace-table-normal trace-table-call-site
trace-table-function-prologue trace-table-function-epilogue)) trace-table-function-prologue trace-table-function-epilogue))
)
(defenum (:suffix -trap :start 8) (defenum (:suffix -trap :start 8)
halt halt
...@@ -288,7 +294,9 @@ ...@@ -288,7 +294,9 @@
;;;; Static symbols. ;;;; Static symbols.
(eval-when (:compile-toplevel :load-toplevel :execute)
(export '(static-symbols static-functions)) (export '(static-symbols static-functions))
)
;;; These symbols are loaded into static space directly after NIL so ;;; These symbols are loaded into static space directly after NIL so
;;; that the system can compute their address by adding a constant ;;; that the system can compute their address by adding a constant
......
...@@ -141,6 +141,7 @@ ...@@ -141,6 +141,7 @@
syms)))) syms))))
(frob OLD-VM:BYTE-BITS OLD-VM:WORD-BITS (frob OLD-VM:BYTE-BITS OLD-VM:WORD-BITS
OLD-VM:CHAR-BITS OLD-VM:CHAR-BITS
OLD-VM:CHAR-BYTES
#+long-float OLD-VM:SIMPLE-ARRAY-LONG-FLOAT-TYPE #+long-float OLD-VM:SIMPLE-ARRAY-LONG-FLOAT-TYPE
OLD-VM:SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE OLD-VM:SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE
OLD-VM:SIMPLE-ARRAY-SINGLE-FLOAT-TYPE OLD-VM:SIMPLE-ARRAY-SINGLE-FLOAT-TYPE
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment