1.0.39.15: delete all traces of the darwin dlshim

 * following up on previous commits which still used the shim with the
   :dlshim feature, now completely remover all traces of the dlshim.

src/code/foreign.lisp

@@ -16,8 +16,7 @@
 
 (defun extern-alien-name (name)
  (handler-case
- #!+(or elf (and mach-o (not dlshim))) (coerce name 'base-string)
- #!+(or (and mach-o dlshim) win32) (concatenate 'base-string "_" name)
+ (coerce name 'base-string)
  (error ()
  (error "invalid external alien name: ~S" name))))
 
@@ -34,11 +33,7 @@
  (let ((extern (extern-alien-name name)))
  (values
  (or (gethash extern table)
- (gethash (concatenate 'base-string
- #!+(and mach-o dlshim) "_ldso_stub_"
- #!+(and mach-o (not dlshim)) "ldso_stub__"
- #!-mach-o "ldso_stub__"
- extern) table)))))
+ (gethash (concatenate 'base-string "ldso_stub__" extern) table)))))
 
 (defun find-foreign-symbol-address (name)
  "Returns the address of the foreign symbol NAME, or NIL. Does not enter the

src/compiler/generic/genesis.lisp

@@ -1597,11 +1597,11 @@ core and return a descriptor to it."
  (subseq line (1+ p2)))
  (values (parse-integer line :end p1 :radix 16)
  (subseq line (1+ p2))))
- ; KLUDGE CLH 2010-05-31: on darwin, nm gives us
+ ;; KLUDGE CLH 2010-05-31: on darwin, nm gives us
  ;; _function but dlsym expects us to look up
  ;; function, without the leading _ . Therefore, we
  ;; strip it off here.
- #!+(and darwin (not dlshim))
+ #!+darwin
  (when (equal (char name 0) #\_)
  (setf name (subseq name 1)))
  (multiple-value-bind (old-value found)

src/runtime/Config.ppc-darwin

@@ -13,9 +13,6 @@ CFLAGS = -g -Wall -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4
 LINKFLAGS += -mmacosx-version-min=10.4
 
 OS_SRC = bsd-os.c darwin-os.c ppc-darwin-os.c
-ifdef LISP_FEATURE_DLSHIM
- OS_SRC += darwin-dlshim.c
-endif
 
 OS_LIBS = -lSystem -lc
 

src/runtime/Config.x86-64-darwin

@@ -22,9 +22,6 @@ CFLAGS += -D_DARWIN_USE_64_BIT_INODE
 endif
 
 OS_SRC = bsd-os.c x86-64-bsd-os.c darwin-os.c x86-64-darwin-os.c
-ifdef LISP_FEATURE_DLSHIM
- OS_SRC += darwin-dlshim.c
-endif
 
 OS_LIBS = -lSystem -lc -ldl
 ifdef LISP_FEATURE_SB_THREAD

src/runtime/Config.x86-darwin

@@ -20,9 +20,6 @@ LINKFLAGS += -mmacosx-version-min=10.4
 endif
 
 OS_SRC = bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c
-ifdef LISP_FEATURE_DLSHIM
- OS_SRC += darwin-dlshim.c
-endif
 
 OS_LIBS = -lSystem -lc -ldl
 ifdef LISP_FEATURE_SB_THREAD

src/runtime/darwin-os.c

@@ -22,10 +22,7 @@
 #include <mach-o/dyld.h>
 #include "bsd-os.h"
 #include <errno.h>
-
-#ifndef LISP_FEATURE_DLSHIM
 #include <dlfcn.h>
-#endif
 
 char *
 os_get_runtime_executable_path(int external)

tools-for-build/grovel-headers.c

@@ -37,11 +37,7 @@
  #include <sys/ioctl.h>
  #include <sys/termios.h>
  #include <langinfo.h>
- #ifdef LISP_FEATURE_DLSHIM
- #include "../src/runtime/darwin-dlshim.h"
- #else
- #include <dlfcn.h>
- #endif
+ #include <dlfcn.h>
 #endif
 
 #include <sys/stat.h>

tools-for-build/ldso-stubs.lisp

@@ -324,7 +324,6 @@ ldso_stub__ ## fct: ; \\
  "unlockpt")
  #!+openbsd
  '("openpty")
- #!-dlshim
  '("dlclose"
  "dlerror"
  "dlopen"

version.lisp-expr

@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.39.14"
+"1.0.39.15"