GNU C Library master sources branch master updated. glibc-2.26.9000-846-g6940bd9

[jsm28 at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  6940bd966b8b5cf26661c32eae88135143713ba6 (commit)
      from  22c69b6ad63dce90955d3a1d654dd152e7972fdd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6940bd966b8b5cf26661c32eae88135143713ba6

commit 6940bd966b8b5cf26661c32eae88135143713ba6
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Tue Nov 28 17:18:20 2017 +0000

    Use libm_alias_double for s390.
    
    Continuing the preparation for additional _FloatN / _FloatNx function
    aliases, this patch makes s390 libm function implementations use
    libm_alias_double to define function aliases.  This allows
    sysdeps/unix/sysv/linux/s390/fpu/s_fma.c to be removed, as
    libm_alias_double handles symbol versioning for long double compat
    symbols.
    
    Tested with build-many-glibcs.py for s390-linux-gnu and
    s390x-linux-gnu that installed stripped shared libraries are unchanged
    by the patch.
    
    	* sysdeps/s390/fpu/s_fma.c: Include <libm-alias-double.h>.
    	[!__fma] (fma): Define using libm_alias_double.
    	* sysdeps/unix/sysv/linux/s390/fpu/s_fma.c: Remove.

diff --git a/ChangeLog b/ChangeLog
index 9307f40..4b7e1f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/s390/fpu/s_fma.c: Include <libm-alias-double.h>.
+	[!__fma] (fma): Define using libm_alias_double.
+	* sysdeps/unix/sysv/linux/s390/fpu/s_fma.c: Remove.
+
 2017-11-28  Mike FABIAN  <mfabian@redhat.com>
 
 	[BZ #22336]
diff --git a/sysdeps/s390/fpu/s_fma.c b/sysdeps/s390/fpu/s_fma.c
index fb7210b..3f37400 100644
--- a/sysdeps/s390/fpu/s_fma.c
+++ b/sysdeps/s390/fpu/s_fma.c
@@ -18,6 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 double
 __fma (double x, double y, double z)
@@ -27,10 +28,5 @@ __fma (double x, double y, double z)
   return r;
 }
 #ifndef __fma
-weak_alias (__fma, fma)
-#endif
-
-#ifdef NO_LONG_DOUBLE
-strong_alias (__fma, __fmal)
-weak_alias (__fmal, fmal)
+libm_alias_double (__fma, fma)
 #endif
diff --git a/sysdeps/unix/sysv/linux/s390/fpu/s_fma.c b/sysdeps/unix/sysv/linux/s390/fpu/s_fma.c
deleted file mode 100644
index 2b2d505..0000000
--- a/sysdeps/unix/sysv/linux/s390/fpu/s_fma.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/s390/fpu/s_fma.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __fma, fmal, GLIBC_2_1);
-#endif

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                |    6 ++++++
 sysdeps/s390/fpu/s_fma.c                 |    8 ++------
 sysdeps/unix/sysv/linux/s390/fpu/s_fma.c |    5 -----
 3 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/s390/fpu/s_fma.c


hooks/post-receive
-- 
GNU C Library master sources