From 114883e00a8aebc3ce48831aa60bef8f963c7e95 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 20 Mar 2012 08:53:42 -0700
Subject: [PATCH] Support x86-64 __jmp_buf with __WORDSIZE != 64

---
 ChangeLog                    | 5 +++++
 sysdeps/x86_64/bits/setjmp.h | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index fefa778..04d9d83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/bits/setjmp.h (__jmp_buf): Support x86-64 with
+	__WORDSIZE != 64.
+
 2012-03-20  Joseph Myers  <joseph@codesourcery.com>
 
 	* math/gen-libm-test.pl (%beautify): Add OVERFLOW_EXCEPTION and
diff --git a/sysdeps/x86_64/bits/setjmp.h b/sysdeps/x86_64/bits/setjmp.h
index a66ca0f..bb6920d 100644
--- a/sysdeps/x86_64/bits/setjmp.h
+++ b/sysdeps/x86_64/bits/setjmp.h
@@ -29,6 +29,8 @@
 
 # if __WORDSIZE == 64
 typedef long int __jmp_buf[8];
+# elif defined  __x86_64__
+typedef long long int __jmp_buf[8];
 # else
 typedef int __jmp_buf[6];
 # endif
-- 
2.7.4