Use x86_64 bits/mathdef.h for i386/x86_64

diff --git a/ChangeLog b/ChangeLog
index 150b592..5bde649 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [BZ #14117]
+       * sysdeps/i386/bits/mathdef.h: Removed.
+       * sysdeps/x86_64/bits/mathdef.h: Renamed to ...
+       * sysdeps/x86/bits/mathdef.h: This.
+
 2012-05-30  Andreas Schwab  <schwab@linux-m68k.org>
 
        [BZ #14132]

diff --git a/sysdeps/i386/bits/mathdef.h b/sysdeps/i386/bits/mathdef.h
deleted file mode 100644 (file)
index efb46de..0000000
--- a/sysdeps/i386/bits/mathdef.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2004, 2010 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined _MATH_H && !defined _COMPLEX_H
-# error "Never use <bits/mathdef.h> directly; include <math.h> instead"
-#endif
-
-#if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF
-# define _MATH_H_MATHDEF       1
-
-# if defined __FLT_EVAL_METHOD__ && __FLT_EVAL_METHOD__ == 0
-/* When using -mfpmath=sse, values are computed with the precission of the
-   used type.  */
-typedef float float_t;         /* `float' expressions are evaluated as `float'.  */
-typedef double double_t;       /* `double' expressions are evaluated as
-                                  `double'.  */
-# else
-/* The ix87 FPUs evaluate all values in the 80 bit floating-point format
-   which is also available for the user as `long double'.  Therefore we
-   define:  */
-typedef long double float_t;   /* `float' expressions are evaluated as
-                                  `long double'.  */
-typedef long double double_t;  /* `double' expressions are evaluated as
-                                  `long double'.  */
-# endif
-
-/* The values returned by `ilogb' for 0 and NaN respectively.  */
-# define FP_ILOGB0     (-2147483647 - 1)
-# define FP_ILOGBNAN   (-2147483647 - 1)
-
-/* The GCC 4.6 compiler will define __FP_FAST_FMA{,F,L} if the fma{,f,l}
-   builtins are supported.  */
-# if __FP_FAST_FMA
-#  define FP_FAST_FMA 1
-# endif
-
-# if __FP_FAST_FMAF
-#  define FP_FAST_FMAF 1
-# endif
-
-# if __FP_FAST_FMAL
-#  define FP_FAST_FMAL 1
-# endif
-
-#endif /* ISO C99 */

diff --git a/sysdeps/x86_64/bits/mathdef.h b/sysdeps/x86/bits/mathdef.h
similarity index 100%
rename from sysdeps/x86_64/bits/mathdef.h
rename to sysdeps/x86/bits/mathdef.h