Index: /trunk/source/compiler/ARM/arm-vinsns.lisp
===================================================================
--- /trunk/source/compiler/ARM/arm-vinsns.lisp	(revision 15096)
+++ /trunk/source/compiler/ARM/arm-vinsns.lisp	(revision 15097)
@@ -359,5 +359,5 @@
       (idx :u32const))
      ())
-  (ldr dest (:@ v (:$ (:apply + arm::misc-data-offset (:apply ash idx -5)))))
+  (ldr dest (:@ v (:$ (:apply + arm::misc-data-offset (:apply ash (:apply ash idx -5) arm::word-shift)))))
   (mov dest (:lsr dest (:$ (:apply logand idx #x1f))))
   (and dest dest (:$ 1)))
@@ -368,5 +368,5 @@
       (idx :u32const))
      ((temp :u32)))
-  (ldr temp (:@ v (:$ (:apply + arm::misc-data-offset (:apply ash idx -5)))))
+  (ldr temp (:@ v (:$ (:apply + arm::misc-data-offset (:apply ash (:apply ash idx -5) arm::word-shift)))))
   (mov temp (:ror temp (:$ (:apply logand #x1f (:apply - (:apply logand idx #x1f) arm::fixnumshift)))))
   (and dest temp (:$ arm::fixnumone)))
@@ -2032,4 +2032,5 @@
       (default :label))
      ((temp :s32)))
+  (:drain-constant-pool)
   (tst reg (:$ arm::fixnummask))
   (mov idx (:asr reg (:$  arm::fixnumshift)))
@@ -2634,7 +2635,6 @@
                                 ((tempa :u32)
                                  (tempb :u32)))
-  (mov tempb (:$ #x7f00))
+  (movw tempb (:$ #x7fff))
   (mov tempa (:lsr src (:$ (+ arm::fixnumshift 1))))
-  (orr tempb tempb (:$ #xff))
   (cmp tempa tempb)
   (mov tempa (:lsr src (:$ (+ arm::fixnumshift 11))))
Index: /trunk/source/lib/ccl-export-syms.lisp
===================================================================
--- /trunk/source/lib/ccl-export-syms.lisp	(revision 15096)
+++ /trunk/source/lib/ccl-export-syms.lisp	(revision 15097)
@@ -295,4 +295,5 @@
      *always-eval-user-defvars*
      *disassemble-verbose*
+     target-fasl-version
 
 					;These 3 need to be set by the user in order for the correspondingly named
Index: /trunk/source/lib/nfcomp.lisp
===================================================================
--- /trunk/source/lib/nfcomp.lisp	(revision 15096)
+++ /trunk/source/lib/nfcomp.lisp	(revision 15097)
@@ -1492,5 +1492,6 @@
       (error "~a not defined in target package ~s." name package))
     (logior #xff00 (logand #xff (symbol-value sym)))))
-  
+
+;;; This is an exported, public interface.
 (defun target-fasl-version ()
   (target-symbol-value "FASL-VERSION"))