--- boost_1_63_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.asm.orig	2017-04-16 23:04:57.612629800 +0200
+++ boost_1_63_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.asm	2017-04-17 12:39:57.847864400 +0200
@@ -143,7 +143,7 @@
     /* restore RSP (pointing to context-data) from RDX */
     movq  %rdx, %rsp
 
-    /* save XMM storage */
+    /* restore XMM storage */
     movaps  0x0(%rsp), %xmm6
     movaps  0x10(%rsp), %xmm7
     movaps  0x20(%rsp), %xmm8
@@ -154,6 +154,10 @@
     movaps  0x70(%rsp), %xmm13
     movaps  0x80(%rsp), %xmm14
     movaps  0x90(%rsp), %xmm15
+    /* restore MMX control- and status-word */
+    ldmxcsr  0xa0(%rsp)
+    /* restore x87 control-word */
+    fldcw   0xa4(%rsp)
 
     /* load NT_TIB */
     movq  %gs:(0x30), %r10
@@ -179,7 +183,7 @@
     movq  0x100(%rsp), %rbx  /* restore RBX */
     movq  0x108(%rsp), %rbp  /* restore RBP */
 
-    movq  0x110(%rsp), %rcx  /* restore hidden address of transport_t */
+    movq  0x110(%rsp), %rax  /* restore hidden address of transport_t */
 
     leaq  0x118(%rsp), %rsp /* prepare stack */
 
--- boost_1_63_0/libs/context/src/asm/ontop_x86_64_ms_pe_gas.asm.orig	2017-04-16 23:07:17.512359800 +0200
+++ boost_1_63_0/libs/context/src/asm/ontop_x86_64_ms_pe_gas.asm	2017-04-17 12:44:42.388839600 +0200
@@ -143,7 +143,7 @@
     /* restore RSP (pointing to context-data) from RDX */
     movq  %rdx, %rsp
 
-    /* save XMM storage */
+    /* restore XMM storage */
     movaps  0x0(%rsp), %xmm6
     movaps  0x10(%rsp), %xmm7
     movaps  0x20(%rsp), %xmm8
@@ -154,6 +154,10 @@
     movaps  0x70(%rsp), %xmm13
     movaps  0x80(%rsp), %xmm14
     movaps  0x90(%rsp), %xmm15
+    /* restore MMX control- and status-word */
+    ldmxcsr  0xa0(%rsp)
+    /* restore x87 control-word */
+    fldcw   0xa4(%rsp)
 
     /* load NT_TIB */
     movq  %gs:(0x30), %r10
@@ -179,7 +183,7 @@
     movq  0x100(%rsp), %rbx  /* restore RBX */
     movq  0x108(%rsp), %rbp  /* restore RBP */
 
-    movq  0x110(%rsp), %rcx  /* restore hidden address of transport_t */
+    movq  0x110(%rsp), %rax  /* restore hidden address of transport_t */
 
     leaq  0x118(%rsp), %rsp /* prepare stack */