am e6915e0e: Merge "Fix X86 sigsetjmp and siglongjmp"

* commit 'e6915e0e08a2a6b96f882e4b5e7fbdaa9496a43f':
  Fix X86 sigsetjmp and siglongjmp