Merge branch 'master' of git://factorcode.org/git/factor

diff --cc vm/cpu-x86.32.S
index 44155519d7ad1694f6abd542a075f6bcb28c28c5,10cd7f23833b01a51320e3b38bc6682a886b031d..f308bf0b9252e5c3fbcfc0565acdf1fb9c1e0990
--- 1/vm/cpu-x86.32.S
--- 2/vm/cpu-x86.32.S
+++ b/vm/cpu-x86.32.S
@@@ -98,10 -61,5 +87,9 @@@ DEF(void,set_x87_env,(const void*))
  
  #ifdef WINDOWS
        .section .drectve
-       .ascii " -export:check_sse2"
        .ascii " -export:read_timestamp_counter"
 +      .ascii " -export:get_sse_env"
 +      .ascii " -export:set_sse_env"
 +      .ascii " -export:get_x87_env"
 +      .ascii " -export:set_x87_env"
  #endif

diff --cc vm/errors.cpp
Simple merge