0.9.17.12: restore win32 and x86-darwin buildability

 * trivial assembler directive fixes

diff --git a/src/runtime/x86-assem.S b/src/runtime/x86-assem.S
index 4ed9afb..9434c3e 100644 (file)
--- a/src/runtime/x86-assem.S
+++ b/src/runtime/x86-assem.S
@@ -364,14 +364,14 @@ GNAME(closure_tramp):
 
        .text
        .align  align_4byte,0x90
-       .global GNAME(funcallable_instance_tramp)
-       .type   GNAME(funcallable_instance_tramp),@function
+       .globl GNAME(funcallable_instance_tramp)
+       TYPE(GNAME(funcallable_instance_tramp))
 GNAME(funcallable_instance_tramp):
        movl    FUNCALLABLE_INSTANCE_FUNCTION_OFFSET(%eax),%eax 
        /* KLUDGE: on this platform, whatever kind of function is in %rax
         * now, the first word of it contains the address to jump to. */
        jmp     *CLOSURE_FUN_OFFSET(%eax)
-       .size   GNAME(funcallable_instance_tramp), .-GNAME(funcallable_instance_tramp)
+       SIZE(GNAME(funcallable_instance_tramp))
        
 /*
  * fun-end breakpoint magic

diff --git a/version.lisp-expr b/version.lisp-expr
index 2d6d820..a5f9eb5 100644 (file)
--- 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".)
-"0.9.17.11"
+"0.9.17.12"