This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
PATCH: Check __x86_64__ instead of __WORDSIZE in bits/setjmp.h
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Mon, 19 Mar 2012 15:13:37 -0700
- Subject: PATCH: Check __x86_64__ instead of __WORDSIZE in bits/setjmp.h
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
Hi,
__jmp_buf is 8 * 8 bytes for __x86_64__, regardless __WORDSIZE. OK
to install?
Thanks.
2012-03-19 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86_64/bits/setjmp.h: Don't include <bits/wordsize.h>.
(__jmp_buf): Check __x86_64__ instead of __WORDSIZE. Use long
long int.
diff --git a/sysdeps/x86_64/bits/setjmp.h b/sysdeps/x86_64/bits/setjmp.h
index a66ca0f..fe900f5 100644
--- a/sysdeps/x86_64/bits/setjmp.h
+++ b/sysdeps/x86_64/bits/setjmp.h
@@ -23,12 +23,10 @@
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
-#include <bits/wordsize.h>
-
#ifndef _ASM
-# if __WORDSIZE == 64
-typedef long int __jmp_buf[8];
+# if __x86_64__
+typedef long long int __jmp_buf[8];
# else
typedef int __jmp_buf[6];
# endif