diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 7b54e10d0..43429299c 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,4 +1,8 @@
-2015-07-17  Corinna Vinschen  <corinna@vinschen.de>
+2015-07-18  Corinna Vinschen  <corinna@vinschen.de>
+
+	* gendef: Remove unused 64 bit versions of __sjfault and __ljfault.
+
+2015-07-18  Corinna Vinschen  <corinna@vinschen.de>
 
 	* exceptions.cc (makecontext): Rearrange order of initialization and
 	document at great length.
diff --git a/winsup/cygwin/gendef b/winsup/cygwin/gendef
index 58b95eb66..480f2d93a 100755
--- a/winsup/cygwin/gendef
+++ b/winsup/cygwin/gendef
@@ -638,70 +638,6 @@ __setjmpex:
 	ret
 	.seh_endproc
 
-	.globl  __sjfault
-	.seh_proc __sjfault
-__sjfault:
-	.seh_endprologue
-	# Like setjmp, just w/o storing the alternate stackptr.
-	movq	%rdx,(%rcx)
-	movq	%rbx,0x8(%rcx)
-	movq	%rsp,0x10(%rcx)
-	movq	%rbp,0x18(%rcx)
-	movq	%rsi,0x20(%rcx)
-	movq	%rdi,0x28(%rcx)
-	movq	%r12,0x30(%rcx)
-	movq	%r13,0x38(%rcx)
-	movq	%r14,0x40(%rcx)
-	movq	%r15,0x48(%rcx)
-	movq	(%rsp),%r10
-	movq	%r10,0x50(%rcx)
-	# jmp_buf is potentially unaligned!
-	movdqu	%xmm6,0x60(%rcx)
-	movdqu	%xmm7,0x70(%rcx)
-	movdqu	%xmm8,0x80(%rcx)
-	movdqu	%xmm9,0x90(%rcx)
-	movdqu	%xmm10,0xa0(%rcx)
-	movdqu	%xmm11,0xb0(%rcx)
-	movdqu	%xmm12,0xc0(%rcx)
-	movdqu	%xmm13,0xd0(%rcx)
-	movdqu	%xmm14,0xe0(%rcx)
-	movdqu	%xmm15,0xf0(%rcx)
-	movl	\$0,%eax
-	ret
-	.seh_endproc
-
-	.globl  __ljfault
-	.seh_proc __ljfault
-__ljfault:
-	movq	0x8(%rcx),%rbx
-	movq	0x10(%rcx),%rsp
-	movq	0x18(%rcx),%rbp
-	movq	0x20(%rcx),%rsi
-	movq	0x28(%rcx),%rdi
-	movq	0x30(%rcx),%r12
-	movq	0x38(%rcx),%r13
-	movq	0x40(%rcx),%r14
-	movq	0x48(%rcx),%r15
-	movq	0x50(%rcx),%r10
-	movq	%r10,(%rsp)
-	# jmp_buf is potentially unaligned!
-	movdqu	0x60(%rcx),%xmm6
-	movdqu	0x70(%rcx),%xmm7
-	movdqu	0x80(%rcx),%xmm8
-	movdqu	0x90(%rcx),%xmm9
-	movdqu	0xa0(%rcx),%xmm10
-	movdqu	0xb0(%rcx),%xmm11
-	movdqu	0xc0(%rcx),%xmm12
-	movdqu	0xd0(%rcx),%xmm13
-	movdqu	0xe0(%rcx),%xmm14
-	movdqu	0xf0(%rcx),%xmm15
-	movl	%edx,%eax
-	testl	%eax,%eax
-	jne	0f
-	incl	%eax
-0:	ret
-	.seh_endproc
-
 	.globl  longjmp
 	.seh_proc longjmp
 longjmp: