From: Cyrus Harmon Date: Sat, 12 Jun 2010 22:59:53 +0000 (+0000) Subject: 1.0.39.13: restore darwin/ppc building X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=55c7345f18c442abbbe46c66b51bcab612cae65f;p=sbcl.git 1.0.39.13: restore darwin/ppc building * fix ldso stubs to work without the dlshim * hack to avoid calling dlclose on the main executable for darwin/ppc --- diff --git a/src/code/unix-foreign-load.lisp b/src/code/unix-foreign-load.lisp index e54250b..4e42440 100644 --- a/src/code/unix-foreign-load.lisp +++ b/src/code/unix-foreign-load.lisp @@ -46,6 +46,9 @@ (dlerror) (let (dlerror) (cond ((and (not objp) *runtime-dlhandle*) + ;; CLH: if we're on darwin/ppc we can't close + ;; *runtime-dlhandle* for some reason, so don't. + #!-(and darwin ppc) (dlclose *runtime-dlhandle*) (setf dlerror (dlerror) *runtime-dlhandle* nil)) diff --git a/tools-for-build/ldso-stubs.lisp b/tools-for-build/ldso-stubs.lisp index bff22d8..61c0a5f 100644 --- a/tools-for-build/ldso-stubs.lisp +++ b/tools-for-build/ldso-stubs.lisp @@ -113,8 +113,8 @@ ldso_stub__ ## fct: ; \\ #!+(and darwin ppc) " #define LDSO_STUBIFY(fct) @\\ .text @\\ -.globl _ldso_stub___ ## fct @\\ -_ldso_stub___ ## fct: @\\ +.globl ldso_stub__ ## fct @\\ +ldso_stub__ ## fct: @\\ b ldso_stub__ ## fct ## stub @\\ .symbol_stub ldso_stub__ ## fct ## stub: @\\ .indirect_symbol _ ## fct @\\ diff --git a/version.lisp-expr b/version.lisp-expr index 6e159a8..efb688d 100644 --- a/version.lisp-expr +++ b/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.12" +"1.0.39.13"