From 3a257e668e41fa6bab6b758adbe508b8fe32e2d2 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 30 May 2012 17:25:23 -0700 Subject: Use x86_64 bits/wordsize.h for both i386/x86_64 --- ChangeLog | 3 +++ sysdeps/x86/bits/wordsize.h | 13 +++++++++++++ sysdeps/x86_64/bits/wordsize.h | 13 ------------- 3 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 sysdeps/x86/bits/wordsize.h delete mode 100644 sysdeps/x86_64/bits/wordsize.h diff --git a/ChangeLog b/ChangeLog index c7249f6d7e..1a609eb4e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2012-05-30 H.J. Lu [BZ #14117] + * sysdeps/x86_64/bits/wordsize.h: Renamed to ... + * sysdeps/x86/bits/wordsize.h: This. + * sysdeps/i386/bits/huge_vall.h: Renamed to ... * sysdeps/x86/bits/huge_vall.h: This. diff --git a/sysdeps/x86/bits/wordsize.h b/sysdeps/x86/bits/wordsize.h new file mode 100644 index 0000000000..e25af287e8 --- /dev/null +++ b/sysdeps/x86/bits/wordsize.h @@ -0,0 +1,13 @@ +/* Determine the wordsize from the preprocessor defines. */ + +#if defined __x86_64__ && !defined __ILP32__ +# define __WORDSIZE 64 +#else +# define __WORDSIZE 32 +#endif + +#ifdef __x86_64__ +# define __WORDSIZE_TIME64_COMPAT32 1 +/* Both x86-64 and x32 use the 64-bit system call interface. */ +# define __SYSCALL_WORDSIZE 64 +#endif diff --git a/sysdeps/x86_64/bits/wordsize.h b/sysdeps/x86_64/bits/wordsize.h deleted file mode 100644 index e25af287e8..0000000000 --- a/sysdeps/x86_64/bits/wordsize.h +++ /dev/null @@ -1,13 +0,0 @@ -/* Determine the wordsize from the preprocessor defines. */ - -#if defined __x86_64__ && !defined __ILP32__ -# define __WORDSIZE 64 -#else -# define __WORDSIZE 32 -#endif - -#ifdef __x86_64__ -# define __WORDSIZE_TIME64_COMPAT32 1 -/* Both x86-64 and x32 use the 64-bit system call interface. */ -# define __SYSCALL_WORDSIZE 64 -#endif -- cgit v1.2.3