commit fc653e9de001fd38e6bed96405f66959ebc97a34

-3

pkgs/applications/science/logic/avy/default.nix

··· 43 license = lib.licenses.mit; 44 maintainers = with lib.maintainers; [ thoughtpolice ]; 45 platforms = lib.platforms.linux; 46 - # See pkgs/applications/science/logic/glucose/default.nix 47 - # (The error is different due to glucose-fenv.patch, but the same) 48 - badPlatforms = [ "aarch64-linux" ]; 49 }; 50 }

··· 43 license = lib.licenses.mit; 44 maintainers = with lib.maintainers; [ thoughtpolice ]; 45 platforms = lib.platforms.linux; 46 }; 47 }

+16 -24

pkgs/applications/science/logic/avy/glucose-fenv.patch

··· 1 - From d6e0cb60270e8653bda3f339e3a07ce2cd2d6eb0 Mon Sep 17 00:00:00 2001 2 - From: Will Dietz <w@wdtz.org> 3 - Date: Tue, 17 Oct 2017 23:01:36 -0500 4 - Subject: [PATCH] glucose: use fenv to set double precision 5 - 6 - --- 7 - core/Main.cc | 8 ++++++-- 8 - simp/Main.cc | 8 ++++++-- 9 - utils/System.h | 2 +- 10 - 3 files changed, 13 insertions(+), 5 deletions(-) 11 - 12 diff --git a/core/Main.cc b/core/Main.cc 13 - index c96aadd..994132b 100644 14 --- a/core/Main.cc 15 +++ b/core/Main.cc 16 - @@ -96,8 +96,12 @@ int main(int argc, char** argv) 17 // printf("This is MiniSat 2.0 beta\n"); 18 - 19 - #if defined(__linux__) 20 - fpu_control_t oldcw, newcw; 21 - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); 22 + fenv_t fenv; 23 + 24 + fegetenv(&fenv); ··· 29 #endif 30 // Extra options: 31 diff --git a/simp/Main.cc b/simp/Main.cc 32 - index 4f4772d..70c2e4b 100644 33 --- a/simp/Main.cc 34 +++ b/simp/Main.cc 35 - @@ -97,8 +97,12 @@ int main(int argc, char** argv) 36 37 38 - #if defined(__linux__) 39 - fpu_control_t oldcw, newcw; 40 - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); 41 + fenv_t fenv; 42 + 43 + fegetenv(&fenv); ··· 48 #endif 49 // Extra options: 50 diff --git a/utils/System.h b/utils/System.h 51 - index 004d498..a768e99 100644 52 --- a/utils/System.h 53 +++ b/utils/System.h 54 - @@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA 55 #define Glucose_System_h 56 57 - #if defined(__linux__) 58 -#include <fpu_control.h> 59 +#include <fenv.h> 60 #endif 61 62 #include "glucose/mtl/IntTypes.h" 63 - -- 64 - 2.14.2 65 -

··· 1 diff --git a/core/Main.cc b/core/Main.cc 2 + index fd8fca1..37d2ed5 100644 3 --- a/core/Main.cc 4 +++ b/core/Main.cc 5 + @@ -95,9 +95,13 @@ int main(int argc, char** argv) 6 + setUsageHelp("c USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n"); 7 // printf("This is MiniSat 2.0 beta\n"); 8 + 9 + -#if defined(__linux__) 10 - fpu_control_t oldcw, newcw; 11 - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); 12 + +#if defined(__linux__) && defined(__x86_64__) 13 + fenv_t fenv; 14 + 15 + fegetenv(&fenv); ··· 20 #endif 21 // Extra options: 22 diff --git a/simp/Main.cc b/simp/Main.cc 23 + index 4f4772d..c605f6e 100644 24 --- a/simp/Main.cc 25 +++ b/simp/Main.cc 26 + @@ -96,9 +96,13 @@ int main(int argc, char** argv) 27 + setUsageHelp("c USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n"); 28 29 30 + -#if defined(__linux__) 31 - fpu_control_t oldcw, newcw; 32 - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); 33 + +#if defined(__linux__) && defined(__x86_64__) 34 + fenv_t fenv; 35 + 36 + fegetenv(&fenv); ··· 41 #endif 42 // Extra options: 43 diff --git a/utils/System.h b/utils/System.h 44 + index 004d498..2f6d922 100644 45 --- a/utils/System.h 46 +++ b/utils/System.h 47 + @@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA 48 + #ifndef Glucose_System_h 49 #define Glucose_System_h 50 51 + -#if defined(__linux__) 52 -#include <fpu_control.h> 53 + +#if defined(__linux__) && defined(__x86_64__) 54 +#include <fenv.h> 55 #endif 56 57 #include "glucose/mtl/IntTypes.h"

+15 -23

pkgs/applications/science/logic/avy/minisat-fenv.patch

··· 1 - From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001 2 - From: Will Dietz <w@wdtz.org> 3 - Date: Tue, 17 Oct 2017 22:57:02 -0500 4 - Subject: [PATCH] use fenv instead of non-standard fpu_control 5 - 6 - --- 7 - core/Main.cc | 8 ++++++-- 8 - simp/Main.cc | 8 ++++++-- 9 - utils/System.h | 2 +- 10 - 3 files changed, 13 insertions(+), 5 deletions(-) 11 - 12 diff --git a/core/Main.cc b/core/Main.cc 13 - index 2b0d97b..8ad95fb 100644 14 --- a/core/Main.cc 15 +++ b/core/Main.cc 16 - @@ -78,8 +78,12 @@ int main(int argc, char** argv) 17 // printf("This is MiniSat 2.0 beta\n"); 18 19 - #if defined(__linux__) 20 - fpu_control_t oldcw, newcw; 21 - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); 22 + fenv_t fenv; 23 + 24 + fegetenv(&fenv); ··· 29 #endif 30 // Extra options: 31 diff --git a/simp/Main.cc b/simp/Main.cc 32 - index 2804d7f..39bfb71 100644 33 --- a/simp/Main.cc 34 +++ b/simp/Main.cc 35 - @@ -79,8 +79,12 @@ int main(int argc, char** argv) 36 // printf("This is MiniSat 2.0 beta\n"); 37 38 - #if defined(__linux__) 39 - fpu_control_t oldcw, newcw; 40 - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); 41 + fenv_t fenv; 42 + 43 + fegetenv(&fenv); ··· 48 #endif 49 // Extra options: 50 diff --git a/utils/System.h b/utils/System.h 51 - index 1758192..c0ad13a 100644 52 --- a/utils/System.h 53 +++ b/utils/System.h 54 - @@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA 55 #define Minisat_System_h 56 57 - #if defined(__linux__) 58 -#include <fpu_control.h> 59 +#include <fenv.h> 60 #endif 61 62 #include "mtl/IntTypes.h" 63 - -- 64 - 2.14.2 65 -

··· 1 diff --git a/core/Main.cc b/core/Main.cc 2 + index 2b0d97b..9ba985d 100644 3 --- a/core/Main.cc 4 +++ b/core/Main.cc 5 + @@ -77,9 +77,13 @@ int main(int argc, char** argv) 6 + setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n"); 7 // printf("This is MiniSat 2.0 beta\n"); 8 9 + -#if defined(__linux__) 10 - fpu_control_t oldcw, newcw; 11 - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); 12 + +#if defined(__linux__) && defined(__x86_64__) 13 + fenv_t fenv; 14 + 15 + fegetenv(&fenv); ··· 20 #endif 21 // Extra options: 22 diff --git a/simp/Main.cc b/simp/Main.cc 23 + index 2804d7f..7fbdb33 100644 24 --- a/simp/Main.cc 25 +++ b/simp/Main.cc 26 + @@ -78,9 +78,13 @@ int main(int argc, char** argv) 27 + setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n"); 28 // printf("This is MiniSat 2.0 beta\n"); 29 30 + -#if defined(__linux__) 31 - fpu_control_t oldcw, newcw; 32 - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); 33 + +#if defined(__linux__) && defined(__x86_64__) 34 + fenv_t fenv; 35 + 36 + fegetenv(&fenv); ··· 41 #endif 42 // Extra options: 43 diff --git a/utils/System.h b/utils/System.h 44 + index 1758192..840bee5 100644 45 --- a/utils/System.h 46 +++ b/utils/System.h 47 + @@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA 48 + #ifndef Minisat_System_h 49 #define Minisat_System_h 50 51 + -#if defined(__linux__) 52 -#include <fpu_control.h> 53 + +#if defined(__linux__) && defined(__x86_64__) 54 +#include <fenv.h> 55 #endif 56 57 #include "mtl/IntTypes.h"