From: Cyrus Harmon Date: Sun, 13 Jun 2010 02:39:40 +0000 (+0000) Subject: 1.0.39.14: prepend an underscore to ldso stubs X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=2ac45434d6065ae2d042a1e989e22ba8770e8481;p=sbcl.git 1.0.39.14: prepend an underscore to ldso stubs * a leading underscore keeps the cross-compiling linker happy and matches the way we do things on x86oid darwins. --- diff --git a/tools-for-build/ldso-stubs.lisp b/tools-for-build/ldso-stubs.lisp index 61c0a5f..62eb528 100644 --- a/tools-for-build/ldso-stubs.lisp +++ b/tools-for-build/ldso-stubs.lisp @@ -113,18 +113,18 @@ ldso_stub__ ## fct: ; \\ #!+(and darwin ppc) " #define LDSO_STUBIFY(fct) @\\ .text @\\ -.globl ldso_stub__ ## fct @\\ -ldso_stub__ ## fct: @\\ - b ldso_stub__ ## fct ## stub @\\ -.symbol_stub ldso_stub__ ## fct ## stub: @\\ +.globl _ldso_stub__ ## fct @\\ +_ldso_stub__ ## fct: @\\ + b _ldso_stub__ ## fct ## stub @\\ +.symbol_stub _ldso_stub__ ## fct ## stub: @\\ .indirect_symbol _ ## fct @\\ - lis r11,ha16(ldso_stub__ ## fct ## $lazy_ptr) @\\ - lwz r12,lo16(ldso_stub__ ## fct ## $lazy_ptr)(r11) @\\ + lis r11,ha16(_ldso_stub__ ## fct ## $lazy_ptr) @\\ + lwz r12,lo16(_ldso_stub__ ## fct ## $lazy_ptr)(r11) @\\ mtctr r12 @\\ - addi r11,r11,lo16(ldso_stub__ ## fct ## $lazy_ptr) @\\ + addi r11,r11,lo16(_ldso_stub__ ## fct ## $lazy_ptr) @\\ bctr @\\ .lazy_symbol_pointer @\\ -ldso_stub__ ## fct ## $lazy_ptr: @\\ +_ldso_stub__ ## fct ## $lazy_ptr: @\\ .indirect_symbol _ ## fct @\\ .long dyld_stub_binding_helper" diff --git a/version.lisp-expr b/version.lisp-expr index efb688d..b34242d 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.13" +"1.0.39.14"