Accepting request 682399 from Base:System

- add-new-Fortran-vector-math-header-file.patch: Update from upstream (forwarded request 682398 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/682399
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=228
This commit is contained in:
Dominique Leuenberger 2019-03-12 08:43:38 +00:00 committed by Git OBS Bridge
commit 0e81591415
2 changed files with 51 additions and 35 deletions

View File

@ -1,22 +1,34 @@
From dc0afac3252d0c53716ccaf0b424f7769a66d695 Mon Sep 17 00:00:00 2001
From: marxin <mliska@suse.cz>
Date: Wed, 20 Feb 2019 14:54:35 +0100
Subject: [PATCH] Add new Fortran vector math header file.
2019-03-07 Martin Liska <mliska@suse.cz>
---
ChangeLog | 6 +++
bits/math-vector-fortran.h | 19 ++++++++++
math/Makefile | 1 +
sysdeps/x86/fpu/bits/math-vector-fortran.h | 43 ++++++++++++++++++++++
4 files changed, 69 insertions(+)
create mode 100644 bits/math-vector-fortran.h
create mode 100644 sysdeps/x86/fpu/bits/math-vector-fortran.h
* math/Makefile: Change location where math-vector-fortran.h is
installed.
* math/finclude/math-vector-fortran.h: Move from bits/math-vector-fortran.h.
* sysdeps/x86/fpu/finclude/math-vector-fortran.h: Move
from sysdeps/x86/fpu/bits/math-vector-fortran.h.
* scripts/check-installed-headers.sh: Skip Fortran header files.
diff --git a/bits/math-vector-fortran.h b/bits/math-vector-fortran.h
new file mode 100644
index 0000000000..7c1e095094
2019-02-20 Martin Liska <mliska@suse.cz>
* math/Makefile: Install math-vector-fortran.h.
* bits/math-vector-fortran.h: New file.
* sysdeps/x86/fpu/bits/math-vector-fortran.h: New file.
Index: glibc-2.29/math/Makefile
===================================================================
--- glibc-2.29.orig/math/Makefile
+++ glibc-2.29/math/Makefile
@@ -26,6 +26,7 @@ headers := math.h bits/mathcalls.h bits
fpu_control.h complex.h bits/cmathcalls.h fenv.h \
bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h \
bits/math-finite.h bits/math-vector.h \
+ finclude/math-vector-fortran.h \
bits/libm-simd-decl-stubs.h bits/iscanonical.h \
bits/flt-eval-method.h bits/fp-fast.h bits/fp-logb.h \
bits/long-double.h bits/mathcalls-helper-functions.h \
Index: glibc-2.29/math/finclude/math-vector-fortran.h
===================================================================
--- /dev/null
+++ b/bits/math-vector-fortran.h
+++ glibc-2.29/math/finclude/math-vector-fortran.h
@@ -0,0 +1,19 @@
+! Platform-specific declarations of SIMD math functions for Fortran. -*- f90 -*-
+! Copyright (C) 2019 Free Software Foundation, Inc.
@ -37,23 +49,25 @@ index 0000000000..7c1e095094
+! <http://www.gnu.org/licenses/>.
+
+! No SIMD math functions are available for this platform.
diff --git a/math/Makefile b/math/Makefile
index 76e8edac19..fc4191089d 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -26,6 +26,7 @@ headers := math.h bits/mathcalls.h bits/mathinline.h \
fpu_control.h complex.h bits/cmathcalls.h fenv.h \
bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h \
bits/math-finite.h bits/math-vector.h \
+ bits/math-vector-fortran.h \
bits/libm-simd-decl-stubs.h bits/iscanonical.h \
bits/flt-eval-method.h bits/fp-fast.h bits/fp-logb.h \
bits/long-double.h bits/mathcalls-helper-functions.h \
diff --git a/sysdeps/x86/fpu/bits/math-vector-fortran.h b/sysdeps/x86/fpu/bits/math-vector-fortran.h
new file mode 100644
index 0000000000..36051cc73e
Index: glibc-2.29/scripts/check-installed-headers.sh
===================================================================
--- glibc-2.29.orig/scripts/check-installed-headers.sh
+++ glibc-2.29/scripts/check-installed-headers.sh
@@ -84,6 +84,10 @@ for header in "$@"; do
(sys/elf.h)
continue;;
+ # Skip Fortran headers.
+ (finclude/*)
+ continue;;
+
# sys/sysctl.h is unsupported for x32.
(sys/sysctl.h)
case "$is_x32" in
Index: glibc-2.29/sysdeps/x86/fpu/finclude/math-vector-fortran.h
===================================================================
--- /dev/null
+++ b/sysdeps/x86/fpu/bits/math-vector-fortran.h
+++ glibc-2.29/sysdeps/x86/fpu/finclude/math-vector-fortran.h
@@ -0,0 +1,43 @@
+! Platform-specific declarations of SIMD math functions for Fortran. -*- f90 -*-
+! Copyright (C) 2019 Free Software Foundation, Inc.
@ -98,6 +112,3 @@ index 0000000000..36051cc73e
+!GCC$ builtin (expf) attributes simd (notinbranch) if('x32')
+!GCC$ builtin (pow) attributes simd (notinbranch) if('x32')
+!GCC$ builtin (powf) attributes simd (notinbranch) if('x32')
--
2.20.1

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Mar 7 09:01:37 UTC 2019 - Andreas Schwab <schwab@suse.de>
- add-new-Fortran-vector-math-header-file.patch: Update from upstream
-------------------------------------------------------------------
Tue Mar 5 10:38:30 UTC 2019 - Andreas Schwab <schwab@suse.de>