Changeset 15357


Ignore:
Timestamp:
May 7, 2012, 2:59:25 PM (7 years ago)
Author:
gb
Message:

Propagate r15355 to 1.8.
Fixes ticket:963 in 1.8.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release/1.8/source/level-0/l0-cfm-support.lisp

    r15086 r15357  
    711711          (when (%simple-string= name shlibname 0 0 namelen shlibnamelen)
    712712            (unless (shlib.base lib)
    713               (setf (shlib.base lib) addr
    714                     (shlib.soname lib) (soname-from-mach-header addr)))
     713              (setf (shlib.base lib) addr)
     714              (let* ((soname  (soname-from-mach-header addr)))
     715                (when soname
     716                  (setf (shlib.soname lib) soname))))
    715717            (return lib))))))))
    716718
     
    746748           (nameptr (ff-call *dyld-get-image-name* :unsigned-fullword i :address))
    747749           (name (%get-cstring nameptr ))
    748            (lib (%cons-shlib (soname-from-mach-header addr) name nil addr)))
     750           (lib (%cons-shlib (or (soname-from-mach-header addr) name) name nil addr)))
    749751      (setf (shlib.handle lib)
    750752            (ff-call *dlopen-entry* :address nameptr :unsigned-fullword (logior #$RTLD_GLOBAL #$RTLD_NOLOAD)))
Note: See TracChangeset for help on using the changeset viewer.