Merge git://factorcode.org/git/factor

core/bootstrap/ui/tools/tools.factor

@@ -8,3 +8,5 @@ USING: kernel vocabs vocabs.loader sequences ;
         "ui.cocoa.tools" require
     ] when
 ] when
+
+macosx? [ "ui.tools.deploy" require ] when

core/bootstrap/ui/ui.factor

@@ -12,5 +12,3 @@ vocabs vocabs.loader ;
 
     "ui.freetype" require
 ] when
-
-macosx? [ "ui.tools.deploy" require ] when

core/cpu/arm/architecture/architecture.factor

@@ -278,7 +278,7 @@ M: arm-backend %alien-indirect ( -- )
 
 M: arm-backend %alien-callback ( quot -- )
     R0 load-indirect
-    "run_callback" f %alien-invoke ;
+    "c_to_factor" f %alien-invoke ;
 
 M: arm-backend %callback-value ( ctype -- )
     ! Save top of data stack

core/cpu/arm/arm.factor

@@ -3,7 +3,7 @@
 USING: alien alien.c-types kernel math namespaces
 cpu.architecture cpu.arm.architecture cpu.arm.assembler
 cpu.arm.intrinsics generator generator.registers continuations
-compiler io vocabs.loader sequences ;
+compiler io vocabs.loader sequences system ;
 
 ! EABI passes floats in integer registers.
 [ alien-float ]
@@ -53,4 +53,4 @@ T{ arm-backend } compiler-backend set-global
     t have-BLX? set-global
 ] when
 
-7 cells set-profiler-prologue
+7 cells set-profiler-prologues