[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r18834 - in /branches/eglibc-2_15: ./ libc/ libc/malloc/ libc/math/ libc/sysdeps/i386/ libc/sysdeps/ieee754/dbl-64/ libc/sys...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r18834 - in /branches/eglibc-2_15: ./ libc/ libc/malloc/ libc/math/ libc/sysdeps/i386/ libc/sysdeps/ieee754/dbl-64/ libc/sys...
- From: joseph@xxxxxxxxxx
- Date: Wed, 30 May 2012 19:59:25 -0000
Author: joseph
Date: Wed May 30 19:59:24 2012
New Revision: 18834
Log:
Merge changes between r18731 and r18833 from /fsf/glibc-2_15-branch.
Added:
branches/eglibc-2_15/libc/sysdeps/ieee754/dbl-64/Makefile
- copied unchanged from r18833, fsf/glibc-2_15-branch/libc/sysdeps/ieee754/dbl-64/Makefile
Removed:
branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/brandred-fma4.c
Modified:
branches/eglibc-2_15/ (props changed)
branches/eglibc-2_15/libc/ChangeLog
branches/eglibc-2_15/libc/NEWS
branches/eglibc-2_15/libc/config.h.in
branches/eglibc-2_15/libc/config.make.in
branches/eglibc-2_15/libc/configure
branches/eglibc-2_15/libc/configure.in
branches/eglibc-2_15/libc/malloc/arena.c
branches/eglibc-2_15/libc/math/math_private.h
branches/eglibc-2_15/libc/sysdeps/i386/configure
branches/eglibc-2_15/libc/sysdeps/i386/configure.in
branches/eglibc-2_15/libc/sysdeps/unix/sysv/linux/powerpc/configure
branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/math_private.h
branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/Makefile
branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_atan2.c
branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_exp.c
branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_log.c
branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_atan.c
branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c
branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_sin.c
branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c
branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_tan.c
Propchange: branches/eglibc-2_15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 30 19:59:24 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_15-branch:16509-18731
+/fsf/glibc-2_15-branch:16509-18833
/fsf/trunk:15224-16494
Modified: branches/eglibc-2_15/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_15/libc/ChangeLog (original)
+++ branches/eglibc-2_15/libc/ChangeLog Wed May 30 19:59:24 2012
@@ -27,6 +27,22 @@
* sysdeps/x86_64/multiarch/Makefile: Likewise.
* sysdeps/i386/i686/multiarch/test-multiarch.c: New file.
* sysdeps/x86_64/multiarch/test-multiarch.c: New file.
+
+2012-03-21 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * configure.in (libc_cv_cc_nofma): Check for option to disable
+ generation of FMA instructions.
+ * configure: Regenerate.
+ * config.make.in (config-cflags-nofma): Set from libc_cv_cc_nofma.
+ * sysdeps/ieee754/dbl-64/Makefile: New file.
+ * sysdeps/x86_64/fpu/multiarch/Makefile (libm-sysdep_routines):
+ Remove brandred-fma4.
+ (CFLAGS-brandred-fma4.c): Remove.
+ * sysdeps/x86_64/fpu/multiarch/brandred-fma4.c: Remove.
+ * sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c (__branred): Don't
+ define.
+ * sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c (__branred): Don't
+ define.
2012-02-27 David S. Miller <davem@xxxxxxxxxxxxx>
@@ -130,6 +146,41 @@
* sysdeps/i386/fpu/feupdateenv.c (__feupdateenv) Invoke __feraiseexcept
instead of feraiseexcept.
+
+2012-01-31 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * malloc/arena.c (arena_get2): Really don't call __get_nprocs if
+ ARENA_TEST says not to. Simplify test for creation of a new arena.
+ Partially based on a patch by Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>.
+
+2012-01-30 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * configure.in (libc_cv_cc_sse2avx): AC_SUBST.
+ * configure: Regenerate.
+ * config.make.in (config-cflags-sse2avx): Define.
+ * sysdeps/x86_64/fpu/multiarch/Makefile (CFLAGS-slowexp-avx.c):
+ Fix typo.
+
+2012-01-28 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * config.h.in: Define HAVE_SSE2AVX_SUPPORT.
+ * math/math_private.h: Remove libc_fegetround* and
+ libc_fesetround*.
+ * sysdeps/i386/configure.in: Check for -msse2avx.
+ * sysdeps/x86_64/fpu/math_private.h: Use VEX-encoded instructions
+ also if SSE2AVX is defined.
+ Remove libc_fegetround* and libc_fesetround*.
+ * sysdeps/x86_64/fpu/multiarch/Makefile: Compile *-avx functions
+ if config-cflags-sse2avx is yes. Also add -DSSE2AVX to defines.
+ * sysdeps/x86_64/fpu/multiarch/e_atan2.c: Use HAS_AVX again instead
+ of HAS_YMM_USABLE.
+ * sysdeps/x86_64/fpu/multiarch/e_exp.c: Likewise.
+ * sysdeps/x86_64/fpu/multiarch/e_log.c: Likewise.
+ * sysdeps/x86_64/fpu/multiarch/s_atan.c: Likewise.
+ * sysdeps/x86_64/fpu/multiarch/s_sin.c: Likewise.
+ * sysdeps/x86_64/fpu/multiarch/s_tan.c: Likewise.
+
+ * sysdeps/x86_64/fpu/math_private.h: Simplify use of AVX instructions.
2012-01-28 Chris Metcalf <cmetcalf@xxxxxxxxxx>
Modified: branches/eglibc-2_15/libc/NEWS
==============================================================================
--- branches/eglibc-2_15/libc/NEWS (original)
+++ branches/eglibc-2_15/libc/NEWS Wed May 30 19:59:24 2012
@@ -10,7 +10,7 @@
* The following bugs are resolved with this release:
411, 2547, 2548, 11365, 11494, 13583, 13731, 13732, 13733, 13747, 13748,
- 13749, 13753, 13771, 13774, 14059
+ 13749, 13753, 13771, 13774, 14059, 14167
Version 2.15
Modified: branches/eglibc-2_15/libc/config.h.in
==============================================================================
--- branches/eglibc-2_15/libc/config.h.in (original)
+++ branches/eglibc-2_15/libc/config.h.in Wed May 30 19:59:24 2012
@@ -102,7 +102,7 @@
certain registers (CR0, MQ, CTR, LR) in asm statements. */
#undef BROKEN_PPC_ASM_CR0
-/* Defined on SPARC if ld doesn't handle R_SPARC_WDISP22 against .hidden
+/* Defined on SPARC if ld does not handle R_SPARC_WDISP22 against .hidden
symbol. sysdeps/sparc/sparc32/elf/configure. */
#undef BROKEN_SPARC_WDISP22
@@ -118,17 +118,20 @@
/* Define if gcc supports AVX. */
#undef HAVE_AVX_SUPPORT
+/* Define if gcc supports VEX encoding. */
+#undef HAVE_SSE2AVX_SUPPORT
+
/* Define if gcc supports FMA4. */
#undef HAVE_FMA4_SUPPORT
-/* Define if the compiler's exception support is based on libunwind. */
+/* Define if the compiler\'s exception support is based on libunwind. */
#undef HAVE_CC_WITH_LIBUNWIND
/* Define if the access to static and hidden variables is position independent
and does not need relocations. */
#undef PI_STATIC_AND_HIDDEN
-/* Define this to disable the `hidden_proto' et al macros in
+/* Define this to disable the 'hidden_proto' et al macros in
include/libc-symbols.h that avoid PLT slots in the shared objects. */
#undef NO_HIDDEN
Modified: branches/eglibc-2_15/libc/config.make.in
==============================================================================
--- branches/eglibc-2_15/libc/config.make.in (original)
+++ branches/eglibc-2_15/libc/config.make.in Wed May 30 19:59:24 2012
@@ -36,7 +36,9 @@
config-cflags-sse4 = @libc_cv_cc_sse4@
config-cflags-avx = @libc_cv_cc_avx@
+config-cflags-sse2avx = @libc_cv_cc_sse2avx@
config-cflags-novzeroupper = @libc_cv_cc_novzeroupper@
+config-cflags-nofma = @libc_cv_cc_nofma@
config-asflags-i686 = @libc_cv_as_i686@
defines = @DEFINES@
Modified: branches/eglibc-2_15/libc/configure
==============================================================================
--- branches/eglibc-2_15/libc/configure (original)
+++ branches/eglibc-2_15/libc/configure Wed May 30 19:59:24 2012
@@ -657,8 +657,10 @@
ldd_rewrite_script
use_ldconfig
libc_cv_as_i686
+libc_cv_cc_nofma
libc_cv_cc_fma4
libc_cv_cc_novzeroupper
+libc_cv_cc_sse2avx
libc_cv_cc_avx
libc_cv_cc_sse4
libc_cv_cpp_asm_debuginfo
@@ -7723,6 +7725,19 @@
{ (exit 1); exit 1; }; }
fi
+{ $as_echo "$as_me:$LINENO: checking for compiler option to disable generation of FMA instructions" >&5
+$as_echo_n "checking for compiler option to disable generation of FMA instructions... " >&6; }
+if test "${libc_cv_cc_nofma+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ libc_cv_cc_nofma=
+for opt in -ffp-contract=off -mno-fused-madd; do
+ LIBC_TRY_CC_OPTION($opt, libc_cv_cc_nofma=$opt; break)
+done
+fi
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_cc_nofma" >&5
+$as_echo "$libc_cv_cc_nofma" >&6; }
+
if test -n "$submachine"; then
{ $as_echo "$as_me:$LINENO: checking for compiler option for CPU variant" >&5
$as_echo_n "checking for compiler option for CPU variant... " >&6; }
@@ -8926,6 +8941,8 @@
{ $as_echo "$as_me:$LINENO: WARNING: *** be removed." >&5
$as_echo "$as_me: WARNING: *** be removed." >&2;}
fi
+
+
Modified: branches/eglibc-2_15/libc/configure.in
==============================================================================
--- branches/eglibc-2_15/libc/configure.in (original)
+++ branches/eglibc-2_15/libc/configure.in Wed May 30 19:59:24 2012
@@ -2225,6 +2225,14 @@
AC_MSG_ERROR([support for the tls_model attribute is required])
fi
+dnl Determine how to disable generation of FMA instructions.
+AC_CACHE_CHECK([for compiler option to disable generation of FMA instructions],
+ libc_cv_cc_nofma, [dnl
+libc_cv_cc_nofma=
+for opt in -ffp-contract=off -mno-fused-madd; do
+ LIBC_TRY_CC_OPTION([$opt], [libc_cv_cc_nofma=$opt; break])
+done])
+
if test -n "$submachine"; then
AC_CACHE_CHECK([for compiler option for CPU variant],
libc_cv_cc_submachine, [dnl
@@ -2366,8 +2374,10 @@
AC_SUBST(libc_cv_cpp_asm_debuginfo)
AC_SUBST(libc_cv_cc_sse4)
AC_SUBST(libc_cv_cc_avx)
+AC_SUBST(libc_cv_cc_sse2avx)
AC_SUBST(libc_cv_cc_novzeroupper)
AC_SUBST(libc_cv_cc_fma4)
+AC_SUBST(libc_cv_cc_nofma)
AC_SUBST(libc_cv_as_i686)
AC_SUBST(use_ldconfig)
Modified: branches/eglibc-2_15/libc/malloc/arena.c
==============================================================================
--- branches/eglibc-2_15/libc/malloc/arena.c (original)
+++ branches/eglibc-2_15/libc/malloc/arena.c Wed May 30 19:59:24 2012
@@ -828,7 +828,7 @@
{
if (mp_.arena_max != 0)
narenas_limit = mp_.arena_max;
- else
+ else if (narenas > mp_.arena_test)
{
int n = __get_nprocs ();
@@ -842,7 +842,14 @@
}
repeat:;
size_t n = narenas;
- if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0))
+ /* NB: the following depends on the fact that (size_t)0 - 1 is a
+ very large number and that the underflow is OK. If arena_max
+ is set the value of arena_test is irrelevant. If arena_test
+ is set but narenas is not yet larger or equal to arena_test
+ narenas_limit is 0. There is no possibility for narenas to
+ be too big for the test to always fail since there is not
+ enough address space to create that many arenas. */
+ if (__builtin_expect (n <= narenas_limit - 1, 0))
{
if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n))
goto repeat;
Modified: branches/eglibc-2_15/libc/math/math_private.h
==============================================================================
--- branches/eglibc-2_15/libc/math/math_private.h (original)
+++ branches/eglibc-2_15/libc/math/math_private.h Wed May 30 19:59:24 2012
@@ -365,14 +365,6 @@
know what operations are going to be performed. Therefore we
define additional interfaces. By default they refer to the normal
interfaces. */
-#define libc_fegetround() fegetround ()
-#define libc_fegetroundf() fegetround ()
-#define libc_fegetroundl() fegetround ()
-
-#define libc_fesetround(r) (void) fesetround (r)
-#define libc_fesetroundf(r) (void) fesetround (r)
-#define libc_fesetroundl(r) (void) fesetround (r)
-
#define libc_feholdexcept(e) (void) feholdexcept (e)
#define libc_feholdexceptf(e) (void) feholdexcept (e)
#define libc_feholdexceptl(e) (void) feholdexcept (e)
Modified: branches/eglibc-2_15/libc/sysdeps/i386/configure
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/i386/configure (original)
+++ branches/eglibc-2_15/libc/sysdeps/i386/configure Wed May 30 19:59:24 2012
@@ -682,6 +682,31 @@
fi
+{ $as_echo "$as_me:$LINENO: checking for AVX encoding of SSE instructions" >&5
+$as_echo_n "checking for AVX encoding of SSE instructions... " >&6; }
+if test "${libc_cv_cc_sse2avx+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if { ac_try='${CC-cc} -msse2avx -xc /dev/null -S -o /dev/null'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ libc_cv_cc_sse2avx=yes
+else
+ libc_cv_cc_sse2avx=no
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_cc_sse2avx" >&5
+$as_echo "$libc_cv_cc_sse2avx" >&6; }
+if test $libc_cv_cc_sse2avx = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SSE2AVX_SUPPORT 1
+_ACEOF
+
+fi
+
{ $as_echo "$as_me:$LINENO: checking for FMA4 support" >&5
$as_echo_n "checking for FMA4 support... " >&6; }
if test "${libc_cv_cc_fma4+set}" = set; then
Modified: branches/eglibc-2_15/libc/sysdeps/i386/configure.in
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/i386/configure.in (original)
+++ branches/eglibc-2_15/libc/sysdeps/i386/configure.in Wed May 30 19:59:24 2012
@@ -67,6 +67,17 @@
AC_DEFINE(HAVE_AVX_SUPPORT)
fi
+dnl Check if -msse2avx works.
+AC_CACHE_CHECK(for AVX encoding of SSE instructions, libc_cv_cc_sse2avx, [dnl
+if AC_TRY_COMMAND([${CC-cc} -msse2avx -xc /dev/null -S -o /dev/null]); then
+ libc_cv_cc_sse2avx=yes
+else
+ libc_cv_cc_sse2avx=no
+fi])
+if test $libc_cv_cc_sse2avx = yes; then
+ AC_DEFINE(HAVE_SSE2AVX_SUPPORT)
+fi
+
dnl Check if -mfma4 works.
AC_CACHE_CHECK(for FMA4 support, libc_cv_cc_fma4, [dnl
if AC_TRY_COMMAND([${CC-cc} -mfma4 -xc /dev/null -S -o /dev/null]); then
Modified: branches/eglibc-2_15/libc/sysdeps/unix/sysv/linux/powerpc/configure
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/unix/sysv/linux/powerpc/configure (original)
+++ branches/eglibc-2_15/libc/sysdeps/unix/sysv/linux/powerpc/configure Wed May 30 19:59:24 2012
@@ -1,19 +1,135 @@
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+
+
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
+ sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
+ N
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+}
+
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
# Local configure fragment for sysdeps/unix/sysv/linux/powerpc/.
-{ $as_echo "$as_me:$LINENO: checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format" >&5
$as_echo_n "checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format... " >&6; }
-if test "${libc_cv_mlong_double_128ibm+set}" = set; then
+if ${libc_cv_mlong_double_128ibm+:} false; then :
$as_echo_n "(cached) " >&6
else
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -mlong-double-128"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <float.h>
int
@@ -28,51 +144,26 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
libc_cv_mlong_double_128ibm=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- libc_cv_mlong_double_128ibm=no
+ libc_cv_mlong_double_128ibm=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
fi
-{ $as_echo "$as_me:$LINENO: result: $libc_cv_mlong_double_128ibm" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mlong_double_128ibm" >&5
$as_echo "$libc_cv_mlong_double_128ibm" >&6; }
if test "$libc_cv_mlong_double_128ibm" = no; then
- { $as_echo "$as_me:$LINENO: checking whether $CC $CFLAGS supports -mabi=ibmlongdouble" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC $CFLAGS supports -mabi=ibmlongdouble" >&5
$as_echo_n "checking whether $CC $CFLAGS supports -mabi=ibmlongdouble... " >&6; }
-if test "${libc_cv_mabi_ibmlongdouble+set}" = set; then
+if ${libc_cv_mabi_ibmlongdouble+:} false; then :
$as_echo_n "(cached) " >&6
else
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -mlong-double-128 -mabi=ibmlongdouble"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <float.h>
int
@@ -87,43 +178,20 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
libc_cv_mabi_ibmlongdouble=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- libc_cv_mabi_ibmlongdouble=no
+ libc_cv_mabi_ibmlongdouble=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
fi
-{ $as_echo "$as_me:$LINENO: result: $libc_cv_mabi_ibmlongdouble" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mabi_ibmlongdouble" >&5
$as_echo "$libc_cv_mabi_ibmlongdouble" >&6; }
if test "$libc_cv_mabi_ibmlongdouble" = yes; then
CFLAGS="$CFLAGS -mabi=ibmlongdouble"
else
- { { $as_echo "$as_me:$LINENO: error: this configuration requires -mlong-double-128 IBM extended format support" >&5
-$as_echo "$as_me: error: this configuration requires -mlong-double-128 IBM extended format support" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "this configuration requires -mlong-double-128 IBM extended format support" "$LINENO" 5
fi
fi
Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/math_private.h
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/math_private.h (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/math_private.h Wed May 30 19:59:24 2012
@@ -19,7 +19,7 @@
/* We can do a few things better on x86-64. */
-#ifdef __AVX__
+#if defined __AVX__ || defined SSE2AVX
# define MOVD "vmovd"
#else
# define MOVD "movd"
@@ -86,7 +86,7 @@
({ int __di; GET_FLOAT_WORD (__di, (float) d); \
(__di & 0x7fffffff) < 0x7f800000; })
-#ifdef __AVX__
+#if defined __AVX__ || defined SSE2AVX
# define __ieee754_sqrt(d) \
({ double __res; \
asm ("vsqrtsd %1, %0, %0" : "=x" (__res) : "xm" ((double) (d))); \
@@ -112,7 +112,7 @@
#ifdef __SSE4_1__
# ifndef __rint
-# ifdef __AVX__
+# if defined __AVX__ || defined SSE2AVX
# define __rint(d) \
({ double __res; \
asm ("vroundsd $4, %1, %0, %0" : "=x" (__res) : "xm" ((double) (d))); \
@@ -125,7 +125,7 @@
# endif
# endif
# ifndef __rintf
-# ifdef __AVX__
+# if defined __AVX__ || defined SSE2AVX
# define __rintf(d) \
({ float __res; \
asm ("vroundss $4, %1, %0, %0" : "=x" (__res) : "xm" ((float) (d))); \
@@ -139,7 +139,7 @@
# endif
# ifndef __floor
-# ifdef __AVX__
+# if defined __AVX__ || defined SSE2AVX
# define __floor(d) \
({ double __res; \
asm ("vroundsd $1, %1, %0, %0" : "=x" (__res) : "xm" ((double) (d))); \
@@ -152,7 +152,7 @@
# endif
# endif
# ifndef __floorf
-# ifdef __AVX__
+# if defined __AVX__ || defined SSE2AVX
# define __floorf(d) \
({ float __res; \
asm ("vroundss $1, %1, %0, %0" : "=x" (__res) : "xm" ((float) (d))); \
@@ -169,29 +169,6 @@
/* Specialized variants of the <fenv.h> interfaces which only handle
either the FPU or the SSE unit. */
-#undef libc_fegetround
-#define libc_fegetround() \
- ({ \
- unsigned int mxcsr; \
- asm volatile ("stmxcsr %0" : "=m" (*&mxcsr)); \
- (mxcsr & 0x6000) >> 3; \
- })
-#undef libc_fegetroundf
-#define libc_fegetroundf() libc_fegetround ()
-// #define libc_fegetroundl() fegetround ()
-
-#undef libc_fesetround
-#define libc_fesetround(r) \
- do { \
- unsigned int mxcsr; \
- asm ("stmxcsr %0" : "=m" (*&mxcsr)); \
- mxcsr = (mxcsr & ~0x6000) | ((r) << 3); \
- asm volatile ("ldmxcsr %0" : : "m" (*&mxcsr)); \
- } while (0)
-#undef libc_fesetroundf
-#define libc_fesetroundf(r) libc_fesetround (r)
-// #define libc_fesetroundl(r) (void) fesetround (r)
-
#undef libc_feholdexcept
#ifdef __AVX__
# define libc_feholdexcept(e) \
Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/Makefile
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/Makefile (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/Makefile Wed May 30 19:59:24 2012
@@ -7,10 +7,9 @@
e_asin-fma4 e_atan2-fma4 s_sin-fma4 s_tan-fma4 \
mplog-fma4 mpa-fma4 slowexp-fma4 slowpow-fma4 \
sincos32-fma4 doasin-fma4 dosincos-fma4 \
- brandred-fma4 halfulp-fma4 mpexp-fma4 \
+ halfulp-fma4 mpexp-fma4 \
mpatan2-fma4 mpatan-fma4 mpsqrt-fma4 mptan-fma4
-CFLAGS-brandred-fma4.c = -mfma4
CFLAGS-doasin-fma4.c = -mfma4
CFLAGS-dosincos-fma4.c = -mfma4
CFLAGS-e_asin-fma4.c = -mfma4
@@ -34,21 +33,21 @@
CFLAGS-s_tan-fma4.c = -mfma4
endif
-ifeq ($(config-cflags-avx),yes)
+ifeq ($(config-cflags-sse2avx),yes)
libm-sysdep_routines += e_exp-avx e_log-avx s_atan-avx \
e_atan2-avx s_sin-avx s_tan-avx \
mplog-avx mpa-avx slowexp-avx \
mpexp-avx
-CFLAGS-e_atan2-avx.c = -mavx
-CFLAGS-e_exp-avx.c = -mavx
-CFLAGS-e_log-avx.c = -mavx
-CFLAGS-mpa-avx.c = -mavx
-CFLAGS-mpexp-avx.c = -mavx
-CFLAGS-mplog-avx.c = -mavx
-CFLAGS-s_atan-avx.c = -mavx
-CFLAGS-s_sin-avx.c = -mavx
-CFLAGS-slowexp-avx.c = -mavx
-CFLAGS-s_tan-avx.c = -mavx
+CFLAGS-e_atan2-avx.c = -msse2avx -DSSE2AVX
+CFLAGS-e_exp-avx.c = -msse2avx -DSSE2AVX
+CFLAGS-e_log-avx.c = -msse2avx -DSSE2AVX
+CFLAGS-mpa-avx.c = -msse2avx -DSSE2AVX
+CFLAGS-mpexp-avx.c = -msse2avx -DSSE2AVX
+CFLAGS-mplog-avx.c = -msse2avx -DSSE2AVX
+CFLAGS-s_atan-avx.c = -msse2avx -DSSE2AVX
+CFLAGS-s_sin-avx.c = -msse2avx -DSSE2AVX
+CFLAGS-slowexp-avx.c = -msse2avx -DSSE2AVX
+CFLAGS-s_tan-avx.c = -msse2avx -DSSE2AVX
endif
endif
Removed: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/brandred-fma4.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/brandred-fma4.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/brandred-fma4.c (removed)
@@ -1,4 +1,0 @@
-#define __branred __branred_fma4
-#define SECTION __attribute__ ((section (".text.fma4")))
-
-#include <sysdeps/ieee754/dbl-64/branred.c>
Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_atan2.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_atan2.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_atan2.c Wed May 30 19:59:24 2012
@@ -14,7 +14,7 @@
libm_ifunc (__ieee754_atan2,
HAS_FMA4 ? __ieee754_atan2_fma4
- : (HAS_YMM_USABLE ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
+ : (HAS_AVX ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
strong_alias (__ieee754_atan2, __atan2_finite)
# define __ieee754_atan2 __ieee754_atan2_sse2
Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_exp.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_exp.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_exp.c Wed May 30 19:59:24 2012
@@ -14,7 +14,7 @@
libm_ifunc (__ieee754_exp,
HAS_FMA4 ? __ieee754_exp_fma4
- : (HAS_YMM_USABLE ? __ieee754_exp_avx : __ieee754_exp_sse2));
+ : (HAS_AVX ? __ieee754_exp_avx : __ieee754_exp_sse2));
strong_alias (__ieee754_exp, __exp_finite)
# define __ieee754_exp __ieee754_exp_sse2
Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_log.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_log.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_log.c Wed May 30 19:59:24 2012
@@ -14,8 +14,7 @@
libm_ifunc (__ieee754_log,
HAS_FMA4 ? __ieee754_log_fma4
- : (HAS_YMM_USABLE ? __ieee754_log_avx
- : __ieee754_log_sse2));
+ : (HAS_AVX ? __ieee754_log_avx : __ieee754_log_sse2));
strong_alias (__ieee754_log, __log_finite)
# define __ieee754_log __ieee754_log_sse2
Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_atan.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_atan.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_atan.c Wed May 30 19:59:24 2012
@@ -13,7 +13,7 @@
# endif
libm_ifunc (atan, (HAS_FMA4 ? __atan_fma4 :
- HAS_YMM_USABLE ? __atan_avx : __atan_sse2));
+ HAS_AVX ? __atan_avx : __atan_sse2));
# define atan __atan_sse2
#endif
Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_sin-fma4.c Wed May 30 19:59:24 2012
@@ -1,6 +1,5 @@
#define __cos __cos_fma4
#define __sin __sin_fma4
-#define __branred __branred_fma4
#define __docos __docos_fma4
#define __dubsin __dubsin_fma4
#define __mpcos __mpcos_fma4
Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_sin.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_sin.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_sin.c Wed May 30 19:59:24 2012
@@ -18,11 +18,11 @@
# endif
libm_ifunc (__cos, (HAS_FMA4 ? __cos_fma4 :
- HAS_YMM_USABLE ? __cos_avx : __cos_sse2));
+ HAS_AVX ? __cos_avx : __cos_sse2));
weak_alias (__cos, cos)
libm_ifunc (__sin, (HAS_FMA4 ? __sin_fma4 :
- HAS_YMM_USABLE ? __sin_avx : __sin_sse2));
+ HAS_AVX ? __sin_avx : __sin_sse2));
weak_alias (__sin, sin)
# define __cos __cos_sse2
Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_tan-fma4.c Wed May 30 19:59:24 2012
@@ -1,5 +1,4 @@
#define tan __tan_fma4
-#define __branred __branred_fma4
#define __dbl_mp __dbl_mp_fma4
#define __mpranred __mpranred_fma4
#define __mptan __mptan_fma4
Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_tan.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_tan.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_tan.c Wed May 30 19:59:24 2012
@@ -13,7 +13,7 @@
# endif
libm_ifunc (tan, (HAS_FMA4 ? __tan_fma4 :
- HAS_YMM_USABLE ? __tan_avx : __tan_sse2));
+ HAS_AVX ? __tan_avx : __tan_sse2));
# define tan __tan_sse2
#endif
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits