[glibc] 01/02: debian/patches/alpha/submitted-fminmax.diff: new patch to fix fmin and fmax on alpha.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 6c5cd602d4c754532713c6784242e2ee4a95bd0c
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Dec 31 17:41:12 2017 +0100
debian/patches/alpha/submitted-fminmax.diff: new patch to fix fmin and fmax on alpha.
---
debian/changelog | 2 +
debian/patches/alpha/submitted-fminmax.diff | 136 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 139 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e0076c3..ad1137d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ glibc (2.25-6) UNRELEASED; urgency=medium
* debian/control.in/main: bump Standards-Version to 4.1.3.
* debian/patches/alpha/submitted-rlimit.diff: new patch to fix getrlimit
and setrlimit with RLIM_INFINITY on alpha.
+ * debian/patches/alpha/submitted-fminmax.diff: new patch to fix fmin and
+ fmax on alpha.
-- Aurelien Jarno <aurel32@debian.org> Wed, 20 Dec 2017 22:29:01 +0100
diff --git a/debian/patches/alpha/submitted-fminmax.diff b/debian/patches/alpha/submitted-fminmax.diff
new file mode 100644
index 0000000..3aff040
--- /dev/null
+++ b/debian/patches/alpha/submitted-fminmax.diff
@@ -0,0 +1,136 @@
+2017-12-31 Aurelien Jarno <aurelien@aurel32.net>
+
+ [BZ #20947]
+ * sysdeps/alpha/fpu/s_fmax.S: Remove file.
+ * sysdeps/alpha/fpu/s_fmaxf.S: Likewise.
+ * sysdeps/alpha/fpu/s_fmin.S: Likewise.
+ * sysdeps/alpha/fpu/s_fminf.S: Likewise.
+
+--- a/sysdeps/alpha/fpu/s_fmax.S
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/* Copyright (C) 2007-2017 Free Software Foundation, Inc.
+- This file is part of the GNU C Library.
+- Contributed by Richard Henderson.
+-
+- 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/>. */
+-
+-#include <sysdep.h>
+-#include <math_ldbl_opt.h>
+-
+- .set noat
+- .set noreorder
+-
+- .text
+-ENTRY (__fmax)
+- .prologue 0
+-
+- cmptun/su $f16, $f16, $f10
+- cmptun/su $f17, $f17, $f11
+- fmov $f17, $f0
+- unop
+-
+- trapb
+- fbne $f10, $ret
+- fmov $f16, $f0
+- fbne $f11, $ret
+-
+- cmptlt/su $f16, $f17, $f11
+- trapb
+- fcmovne $f11, $f17, $f0
+-$ret: ret
+-
+-END (__fmax)
+-
+-/* Given the in-register format of single-precision, this works there too. */
+-strong_alias (__fmax, __fmaxf)
+-weak_alias (__fmaxf, fmaxf)
+-
+-weak_alias (__fmax, fmax)
+-#ifdef NO_LONG_DOUBLE
+-strong_alias (__fmax, __fmaxl)
+-weak_alias (__fmaxl, fmaxl)
+-#endif
+-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+-compat_symbol (libm, __fmax, fmaxl, GLIBC_2_1);
+-#endif
+--- a/sysdeps/alpha/fpu/s_fmaxf.S
++++ /dev/null
+@@ -1 +0,0 @@
+-/* __fmaxf is in s_fmax.c */
+--- a/sysdeps/alpha/fpu/s_fmin.S
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/* Copyright (C) 2007-2017 Free Software Foundation, Inc.
+- This file is part of the GNU C Library.
+- Contributed by Richard Henderson.
+-
+- 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/>. */
+-
+-#include <sysdep.h>
+-#include <math_ldbl_opt.h>
+-
+- .set noat
+- .set noreorder
+-
+- .text
+-ENTRY (__fmin)
+- .prologue 0
+-
+- cmptun/su $f16, $f16, $f10
+- cmptun/su $f17, $f17, $f11
+- fmov $f17, $f0
+- unop
+-
+- trapb
+- fbne $f10, $ret
+- fmov $f16, $f0
+- fbne $f11, $ret
+-
+- cmptlt/su $f17, $f16, $f11
+- trapb
+- fcmovne $f11, $f17, $f0
+-$ret: ret
+-
+-END (__fmin)
+-
+-/* Given the in-register format of single-precision, this works there too. */
+-strong_alias (__fmin, __fminf)
+-weak_alias (__fminf, fminf)
+-
+-weak_alias (__fmin, fmin)
+-#ifdef NO_LONG_DOUBLE
+-strong_alias (__fmin, __fminl)
+-weak_alias (__fminl, fminl)
+-#endif
+-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+-compat_symbol (libm, __fmin, fminl, GLIBC_2_1);
+-#endif
+--- a/sysdeps/alpha/fpu/s_fminf.S
++++ /dev/null
+@@ -1 +0,0 @@
+-/* __fminf is in s_fmin.c */
diff --git a/debian/patches/series b/debian/patches/series
index f526d89..580d5c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,6 +36,7 @@ alpha/local-string-functions.diff
alpha/submitted-termios_h.diff
alpha/submitted-fts64.diff
alpha/submitted-rlimit.diff
+alpha/submitted-fminmax.diff
arm/local-sigaction.diff
arm/unsubmitted-ldconfig-cache-abi.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: