Changeset 10813

Timestamp:

06/20/05 16:22:49 (3 years ago)

Author:

rtoy

Message:

• code/foreign.lisp (load-object-file): Take the truename of FILE in case we're given a logical pathname.

Files:

• trunk/src/code/foreign.lisp (modified) (5 diffs)

trunk/src/code/foreign.lisp

@@ -29 +29 @@
 
 (defvar *previous-linked-object-file* nil)
-#-(or openbsd linux irix)
+#-(or linux bsd svr4 irix)
 (defvar *foreign-segment-free-pointer* foreign-segment-start)
 
@@ -87 +87 @@
 ;;; /usr/include/sys/elf_common.h and /usr/include/sys/elf32.h.
 ;;;
-#+(or linux bsd svr4)
+#+(or linux (and bsd (not darwin)) svr4)
 (progn
 (alien:def-alien-type elf-address      (alien:unsigned 32))
@@ -207 +207 @@
         (when (elf-p (alien:slot header 'elf-ident))
           (eql et-shared-object (alien:slot header 'elf-type)))))))
-) ;; #+(or linux bsd svr4)
+) ;; #+(or linux (and bsd (not darwin)) svr4)
+
+
+
+;; Darwin loading of foreign code.  This uses the dlopen shims and thus
+;; appears like ELF to the rest of the code in this file.  However testing
+;; for shared libs obviously needs to test for Mach-O dylibs, and not
+;; ELF shared libraries...
+#+darwin
+(progn
+
+(alien:def-alien-type machheader
+  (alien:struct nil
+    (magic       (alien:unsigned 32))
+    (cputype     (alien:signed 32))
+    (cpusubtype  (alien:signed 32))
+    (filetype    (alien:unsigned 32))
+    (ncmds       (alien:unsigned 32))
+    (sizeofcmds  (alien:unsigned 32))
+    (flags       (alien:unsigned 32))))
+
+;; values for magic
+(defconstant mh-magic   #xfeedface)
+
+;; values for filetype
+(defconstant mh-object        #x1)
+(defconstant mh-execute       #x2)
+(defconstant mh-fvmlib        #x3)
+(defconstant mh-core          #x4)
+(defconstant mh-preload       #x5)
+(defconstant mh-dylib         #x6)
+(defconstant mh-dylinker      #x7)
+(defconstant mh-bundle        #x8)
+(defconstant mh-dylib-stub    #x9)
+
+(defun mach-o-p (h)
+  "Make sure the header starts with the mach-o magic value."
+  (eql (alien:slot h 'magic) mh-magic))
+
+(defun file-shared-library-p (pathname)
+  (with-open-file (obj pathname
+                       :direction :input
+                       :element-type '(unsigned-byte 8))
+    (let ((fd (lisp::fd-stream-fd obj)))
+      (alien:with-alien ((header machheader))
+        (unix:unix-read fd (alien:alien-sap header)
+                        (alien:alien-size machheader :bytes))
+        (when (mach-o-p header)
+          (or (eql mh-dylib (alien:slot header 'filetype))
+              (eql mh-bundle (alien:slot header 'filetype))))))))
+) ; #+darwin
 
 
@@ -706 +756 @@
                         (list*
                          #+(or solaris linux FreeBSD4) "-G"
-                         #+(or OpenBSD irix) "-shared"
+                         #+(or OpenBSD NetBSD irix) "-shared"
+                         #+darwin "-dylib"
                          "-o"
                          output-file
                          ;; Cause all specified libs to be loaded in full
-                         #+(or OpenBSD linux FreeBSD4) "--whole-archive"
+                         #+(or OpenBSD linux FreeBSD4 NetBSD) "--whole-archive"
                          #+solaris "-z" #+solaris "allextract"
+                         #+darwin "-all_load"
                          (append (mapcar
                                   #'(lambda (name)
@@ -726 +778 @@
                                  ;; Return to default ld behaviour for libs
                                  (list
-                                  #+(or OpenBSD linux FreeBSD4)
+                                  #+(or OpenBSD linux FreeBSD4 NetBSD)
                                   "--no-whole-archive"
                                   #+solaris "-z" #+solaris "defaultextract")