From 705c0dd51e1e58dd5cd5330a768ccfb57a145452 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 08 2020 11:32:34 +0000 Subject: Apply patch glibc-rh1764238-2.patch patch_name: glibc-rh1764238-2.patch present_in_specfile: true location_in_specfile: 219 --- diff --git a/bits/math-vector-fortran.h b/bits/math-vector-fortran.h deleted file mode 100644 index 7c1e095..0000000 --- a/bits/math-vector-fortran.h +++ /dev/null @@ -1,19 +0,0 @@ -! Platform-specific declarations of SIMD math functions for Fortran. -*- f90 -*- -! Copyright (C) 2019 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 -! . - -! No SIMD math functions are available for this platform. diff --git a/math/Makefile b/math/Makefile index 16e6875..df73d70 100644 --- a/math/Makefile +++ b/math/Makefile @@ -26,7 +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 \ + 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 \ diff --git a/math/finclude/math-vector-fortran.h b/math/finclude/math-vector-fortran.h new file mode 100644 index 0000000..7c1e095 --- /dev/null +++ b/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. +! 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 +! . + +! No SIMD math functions are available for this platform. diff --git a/scripts/check-installed-headers.sh b/scripts/check-installed-headers.sh index 4a062e9..7a1969b 100644 --- a/scripts/check-installed-headers.sh +++ b/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 diff --git a/sysdeps/x86/fpu/bits/math-vector-fortran.h b/sysdeps/x86/fpu/bits/math-vector-fortran.h deleted file mode 100644 index 36051cc..0000000 --- a/sysdeps/x86/fpu/bits/math-vector-fortran.h +++ /dev/null @@ -1,43 +0,0 @@ -! Platform-specific declarations of SIMD math functions for Fortran. -*- f90 -*- -! Copyright (C) 2019 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 -! . - -!GCC$ builtin (cos) attributes simd (notinbranch) if('x86_64') -!GCC$ builtin (cosf) attributes simd (notinbranch) if('x86_64') -!GCC$ builtin (sin) attributes simd (notinbranch) if('x86_64') -!GCC$ builtin (sinf) attributes simd (notinbranch) if('x86_64') -!GCC$ builtin (sincos) attributes simd (notinbranch) if('x86_64') -!GCC$ builtin (sincosf) attributes simd (notinbranch) if('x86_64') -!GCC$ builtin (log) attributes simd (notinbranch) if('x86_64') -!GCC$ builtin (logf) attributes simd (notinbranch) if('x86_64') -!GCC$ builtin (exp) attributes simd (notinbranch) if('x86_64') -!GCC$ builtin (expf) attributes simd (notinbranch) if('x86_64') -!GCC$ builtin (pow) attributes simd (notinbranch) if('x86_64') -!GCC$ builtin (powf) attributes simd (notinbranch) if('x86_64') - -!GCC$ builtin (cos) attributes simd (notinbranch) if('x32') -!GCC$ builtin (cosf) attributes simd (notinbranch) if('x32') -!GCC$ builtin (sin) attributes simd (notinbranch) if('x32') -!GCC$ builtin (sinf) attributes simd (notinbranch) if('x32') -!GCC$ builtin (sincos) attributes simd (notinbranch) if('x32') -!GCC$ builtin (sincosf) attributes simd (notinbranch) if('x32') -!GCC$ builtin (log) attributes simd (notinbranch) if('x32') -!GCC$ builtin (logf) attributes simd (notinbranch) if('x32') -!GCC$ builtin (exp) attributes simd (notinbranch) if('x32') -!GCC$ builtin (expf) attributes simd (notinbranch) if('x32') -!GCC$ builtin (pow) attributes simd (notinbranch) if('x32') -!GCC$ builtin (powf) attributes simd (notinbranch) if('x32') diff --git a/sysdeps/x86/fpu/finclude/math-vector-fortran.h b/sysdeps/x86/fpu/finclude/math-vector-fortran.h new file mode 100644 index 0000000..36051cc --- /dev/null +++ b/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. +! 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 +! . + +!GCC$ builtin (cos) attributes simd (notinbranch) if('x86_64') +!GCC$ builtin (cosf) attributes simd (notinbranch) if('x86_64') +!GCC$ builtin (sin) attributes simd (notinbranch) if('x86_64') +!GCC$ builtin (sinf) attributes simd (notinbranch) if('x86_64') +!GCC$ builtin (sincos) attributes simd (notinbranch) if('x86_64') +!GCC$ builtin (sincosf) attributes simd (notinbranch) if('x86_64') +!GCC$ builtin (log) attributes simd (notinbranch) if('x86_64') +!GCC$ builtin (logf) attributes simd (notinbranch) if('x86_64') +!GCC$ builtin (exp) attributes simd (notinbranch) if('x86_64') +!GCC$ builtin (expf) attributes simd (notinbranch) if('x86_64') +!GCC$ builtin (pow) attributes simd (notinbranch) if('x86_64') +!GCC$ builtin (powf) attributes simd (notinbranch) if('x86_64') + +!GCC$ builtin (cos) attributes simd (notinbranch) if('x32') +!GCC$ builtin (cosf) attributes simd (notinbranch) if('x32') +!GCC$ builtin (sin) attributes simd (notinbranch) if('x32') +!GCC$ builtin (sinf) attributes simd (notinbranch) if('x32') +!GCC$ builtin (sincos) attributes simd (notinbranch) if('x32') +!GCC$ builtin (sincosf) attributes simd (notinbranch) if('x32') +!GCC$ builtin (log) attributes simd (notinbranch) if('x32') +!GCC$ builtin (logf) attributes simd (notinbranch) if('x32') +!GCC$ builtin (exp) attributes simd (notinbranch) if('x32') +!GCC$ builtin (expf) attributes simd (notinbranch) if('x32') +!GCC$ builtin (pow) attributes simd (notinbranch) if('x32') +!GCC$ builtin (powf) attributes simd (notinbranch) if('x32')