aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-03-20 08:54:58 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-03-20 08:54:58 -0700
commitd1af992d0d8184db0a4d264c00a2720722e1a280 (patch)
tree79643123b6ed44403cf279a8234db1892cddc94a
parent114883e00a8aebc3ce48831aa60bef8f963c7e95 (diff)
downloadglibc-d1af992d0d8184db0a4d264c00a2720722e1a280.tar
glibc-d1af992d0d8184db0a4d264c00a2720722e1a280.tar.gz
glibc-d1af992d0d8184db0a4d264c00a2720722e1a280.tar.bz2
glibc-d1af992d0d8184db0a4d264c00a2720722e1a280.zip
Check __x86_64__ instead of __WORDSIZE in mathinline.h
-rw-r--r--ChangeLog9
-rw-r--r--sysdeps/x86_64/fpu/bits/mathinline.h8
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 04d9d83115..268d0ac846 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2012-03-20 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/x86_64/fpu/bits/mathinline.h: Don't include
+ <bits/wordsize.h>.
+ (__signbitf): Check __x86_64__ instead of __WORDSIZE.
+ (__signbit): Likwise.
+ (llrintf): Likwise.
+ (llrint): Likwise.
+
+2012-03-20 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/x86_64/bits/setjmp.h (__jmp_buf): Support x86-64 with
__WORDSIZE != 64.
diff --git a/sysdeps/x86_64/fpu/bits/mathinline.h b/sysdeps/x86_64/fpu/bits/mathinline.h
index 5a9ce8b1b0..c072f16a21 100644
--- a/sysdeps/x86_64/fpu/bits/mathinline.h
+++ b/sysdeps/x86_64/fpu/bits/mathinline.h
@@ -20,8 +20,6 @@
# error "Never use <bits/mathinline.h> directly; include <math.h> instead."
#endif
-#include <bits/wordsize.h>
-
#ifndef __extern_always_inline
# define __MATH_INLINE __inline
#else
@@ -38,7 +36,7 @@ __BEGIN_NAMESPACE_C99
__MATH_INLINE int
__NTH (__signbitf (float __x))
{
-# if __WORDSIZE == 32
+# ifndef __x86_64__
__extension__ union { float __f; int __i; } __u = { __f: __x };
return __u.__i < 0;
# else
@@ -50,7 +48,7 @@ __NTH (__signbitf (float __x))
__MATH_INLINE int
__NTH (__signbit (double __x))
{
-# if __WORDSIZE == 32
+# ifndef __x86_64__
__extension__ union { double __d; int __i[2]; } __u = { __d: __x };
return __u.__i[1] < 0;
# else
@@ -94,7 +92,7 @@ __NTH (lrint (double __x))
return __res;
}
# endif
-# if __WORDSIZE == 64
+# ifdef __x86_64__
__MATH_INLINE long long int
__NTH (llrintf (float __x))
{