--- a/libs/context/src/asm/jump_x86_64_ms_pe_gas.asm	2015-10-21 15:15:01.000000000 +0200
+++ b/libs/context/src/asm/jump_x86_64_ms_pe_gas.asm	2016-01-28 17:24:41.483358305 +0100
@@ -176,13 +176,13 @@
 
 2:
     /* set offset of stack */
-    movq  0xa8, %rcx
+    movq  $0xa8, %rcx
 
     /* test for indicator */
     testq  %r10, %r10
     je  3f
 
-    addq  0x8, %rcx
+    addq  $0x8, %rcx
 
 3:
     /* prepare stack for FPU */

--- a/libs/context/src/asm/make_x86_64_ms_pe_gas.asm	2015-10-21 15:15:01.000000000 +0200
+++ b/libs/context/src/asm/make_x86_64_ms_pe_gas.asm	2016-01-28 17:25:11.619357130 +0100
@@ -94,7 +94,7 @@
     movq  %rcx, %rax
 
     /* reserve 32byte shadow-space for context-function */
-    leaq  -0x28(%rax), %rax
+    subq  $0x28, %rax
 
     /* shift address in RAX to lower 16 byte boundary */
     /* == pointer to fcontext_t and address of context stack */
@@ -103,7 +103,7 @@
     /* reserve space for context-data on context-stack */
     /* size for fc_mxcsr .. RIP + return-address for context-function */
     /* on context-function entry: (RSP -0x8) % 16 == 0 */
-    leaq  -0x128(%rax), %rax
+    subq  $0x128, %rax
 
     /* third arg of make_fcontext() == address of context-function */
     movq  %r8, 0x118(%rax)
@@ -133,7 +133,7 @@
     movq  %rcx, 0x120(%rax)
 
     /* set indicator */
-    movq  1, %rcx
+    mov  $0x1, %rcx
     movq  %rcx, (%rax)
 
     ret /* return pointer to context-data */