diff options
| author | volth <volth@volth.com> | 2019-04-30 14:39:05 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2019-04-30 14:39:18 +0000 |
| commit | 3d3f83dc514d4fe8716df41f6d5ccb6f217b1c25 (patch) | |
| tree | 6bfc324fe84466f8ac0b42c5924adbf1efba5709 /pkgs/development/libraries/gsl | |
| parent | 5ad79dc4bb22326e5a98db7bf2b69a76a2e6f01e (diff) | |
| download | nixpkgs-3d3f83dc514d4fe8716df41f6d5ccb6f217b1c25.tar nixpkgs-3d3f83dc514d4fe8716df41f6d5ccb6f217b1c25.tar.gz nixpkgs-3d3f83dc514d4fe8716df41f6d5ccb6f217b1c25.tar.bz2 nixpkgs-3d3f83dc514d4fe8716df41f6d5ccb6f217b1c25.tar.lz nixpkgs-3d3f83dc514d4fe8716df41f6d5ccb6f217b1c25.tar.xz nixpkgs-3d3f83dc514d4fe8716df41f6d5ccb6f217b1c25.tar.zst nixpkgs-3d3f83dc514d4fe8716df41f6d5ccb6f217b1c25.zip | |
gsl: remove disable-fma.patch
`NIX_CFLAGS_COMPILE = [ "-mno-fma" ];` disables FMA in a more reliable way. `platform.gcc.arch = "skylake"` resulting in gcc command line flag -march=skylake was able to enable FMA even with disable-fma.patch applied
Diffstat (limited to 'pkgs/development/libraries/gsl')
| -rw-r--r-- | pkgs/development/libraries/gsl/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/gsl/disable-fma.patch | 32 | ||||
| -rw-r--r-- | pkgs/development/libraries/gsl/gsl-1_16.nix | 2 |
3 files changed, 0 insertions, 39 deletions
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 1867d6cb8f6..6e6b74d514e 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -10,11 +10,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-mno-fma" ]; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - patches = [ - # ToDo: there might be more impurities than FMA support check - ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html - ]; - # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux"; diff --git a/pkgs/development/libraries/gsl/disable-fma.patch b/pkgs/development/libraries/gsl/disable-fma.patch deleted file mode 100644 index bb1eda9cccc..00000000000 --- a/pkgs/development/libraries/gsl/disable-fma.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/configure.ac 2011-09-22 16:13:22 +0000 -+++ b/configure.ac 2011-11-26 23:55:24 +0000 -@@ -381,6 +381,28 @@ - AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE) - AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE) - -+dnl check for compiler flags to disable use of FMA -+save_cflags="$CFLAGS" -+AC_CACHE_CHECK([for compiler flags to disable use of FMA], ac_cv_c_fma_flags, -+[ -+if test X"$GCC" = Xyes; then -+ fma_flags='-ffp-contract=off' -+else -+ fma_flags= -+fi -+if test X"$fma_flags" != X; then -+ CFLAGS="$fma_flags $CFLAGS" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int foo;]])],[ac_cv_c_fma_flags="$fma_flags"],[ac_cv_c_fma_flags="none"]) -+else -+ ac_cv_c_fma_flags="none" -+fi]) -+ -+if test "$ac_cv_c_fma_flags" != "none" ; then -+ CFLAGS="$ac_cv_c_fma_flags $save_cflags" -+else -+ CFLAGS="$save_cflags" -+fi -+ - dnl Check for IEEE control flags - - save_cflags="$CFLAGS" - diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index 02d88e67cdd..07dee287714 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-mno-fma" ]; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) patches = [ - # ToDo: there might be more impurities than FMA support check - ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html (fetchpatch { name = "bug-39055.patch"; url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d"; |