Changeset 5739

Timestamp:

Jan 18, 2007, 10:15:21 PM (18 years ago)

Author:

Gary Byers

Message:

Deal with the new ffi-backend sources.

File:

• trunk/ccl/lib/compile-ccl.lisp (modified) (3 diffs)

trunk/ccl/lib/compile-ccl.lisp

@@ -128 +128 @@
 
 (defun target-env-modules (&optional (target
-                                      (backend-target-arch-name
-                                       *host-backend*)))
-  (declare (ignore target))
-  *env-modules*)
+                                      (backend-name *host-backend*)))
+  (append *env-modules*
+          (list
+           (ecase target
+             (:linuxppc32 'ffi-linuxppc32)
+             (:darwinppc32 'ffi-darwinppc32)
+             (:darwinppc64 'ffi-darwinppc64)
+             (:linuxppc64 'ffi-linuxppc64)
+             (:linuxx8664 'ffi-linuxx8664)
+             (:darwinx8664 'ffi-darwinx8664)
+             (:freebsdx8664 'ffi-freebsdx8664)))))
+
 
 (defun target-compiler-modules (&optional (target
@@ -162 +170 @@
           
 
-(defun target-lib-modules (&optional (target
-                                      (backend-target-arch-name *target-backend*)))
-  (append (target-env-modules target) (target-other-lib-modules target)))
+(defun target-lib-modules (&optional (backend-name
+                                      (backend-name *host-backend*)))
+  (let* ((backend (or (find-backend backend-name) *host-backend*))
+         (arch-name (backend-target-arch-name backend)))
+    (append (target-env-modules backend-name) (target-other-lib-modules arch-name))))
 
 
@@ -381 +391 @@
     (target-compile-modules (target-compiler-modules arch) target force)
     (target-compile-modules (target-level-1-modules target) target force)
-    (target-compile-modules (target-lib-modules arch) target force)
+    (target-compile-modules (target-lib-modules target) target force)
     (target-compile-modules *aux-modules* target force)
     (target-compile-modules *code-modules* target force)