Fix conflict

diff --cc basis/compiler/cfg/instructions/instructions.factor
Simple merge

diff --cc basis/compiler/codegen/codegen.factor
Simple merge

diff --cc basis/cpu/architecture/architecture.factor
Simple merge

diff --cc basis/cpu/x86/32/32.factor
Simple merge

diff --cc basis/cpu/x86/64/64.factor
Simple merge

diff --cc basis/cpu/x86/x86.factor
index 62caf1ffe9e4ae8cfd7cba047febb4e2a1c252c3,d8e02fe516ed3842ffa47ee2e889e2d07d19fa1e..d40e03cdb61f0b2b1bffe860ee56eba4493cf56c
--- 1/basis/cpu/x86/x86.factor
--- 2/basis/cpu/x86/x86.factor
+++ b/basis/cpu/x86/x86.factor
@@@ -4,8 -4,7 +4,9 @@@ USING: accessors assocs alien alien.c-t
  cpu.x86.assembler cpu.x86.assembler.private cpu.x86.assembler.operands
  cpu.architecture kernel kernel.private math memory namespaces make
  sequences words system layouts combinators math.order fry locals
 +compiler.constants byte-arrays io macros quotations cpu.x86.features
 +cpu.x86.features.private compiler compiler.units init
+ compiler.constants vm byte-arrays
  compiler.cfg.registers
  compiler.cfg.instructions
  compiler.cfg.intrinsics
@@@ -884,29 -767,15 +888,29 @@@ M: x86 small-enough? ( n -- ? 
      #! set up by the caller.
      stack-frame get total-size>> + stack@ ;
  
 -: enable-sse2 ( -- )
 -    enable-float-intrinsics
 -    enable-fsqrt
 -    enable-float-min/max
 -    enable-sse2-simd ;
++enable-simd
++enable-min/max
++enable-fixnum-log2
+ 
 -: enable-sse3 ( -- )
 -    enable-sse2
 -    enable-sse3-simd ;
 +:: install-sse2-check ( -- )
 +    [
 +        sse-version 20 < [
 +            "This image was built to use SSE2 but your CPU does not support it." print
 +            "You will need to bootstrap Factor again." print
 +            flush
 +            1 exit
 +        ] when
 +    ] "cpu.x86" add-init-hook ;
 +
 +: enable-sse2 ( version -- )
 +    20 >= [
 +        enable-float-intrinsics
 +        enable-fsqrt
 +        enable-float-min/max
 +        install-sse2-check
 +    ] when ;
  
- 
- enable-simd
--enable-min/max
- 
 -enable-fixnum-log2
 +: check-sse ( -- )
 +    [ { sse_version } compile ] with-optimizer
 +    "Checking for multimedia extensions: " write sse-version
 +    [ sse-string write " detected" print ] [ enable-sse2 ] bi ;

diff --cc vm/cpu-x86.S
Simple merge