mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 22:53:42 +00:00
66 lines
2.0 KiB
Diff
66 lines
2.0 KiB
Diff
|
From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Will Dietz <w@wdtz.org>
|
||
|
|
Date: Tue, 17 Oct 2017 22:57:02 -0500
|
||
|
|
Subject: [PATCH] use fenv instead of non-standard fpu_control
|
||
|
|
|
||
|
|
---
|
||
|
|
core/Main.cc | 8 ++++++--
|
||
|
|
simp/Main.cc | 8 ++++++--
|
||
|
|
utils/System.h | 2 +-
|
||
|
|
3 files changed, 13 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/core/Main.cc b/core/Main.cc
|
||
|
|
index 2b0d97b..8ad95fb 100644
|
||
|
|
--- a/core/Main.cc
|
||
|
|
+++ b/core/Main.cc
|
||
|
|
@@ -78,8 +78,12 @@ int main(int argc, char** argv)
|
||
|
|
// printf("This is MiniSat 2.0 beta\n");
|
||
|
|
|
||
|
|
#if defined(__linux__)
|
||
|
|
- fpu_control_t oldcw, newcw;
|
||
|
|
- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
|
||
|
|
+ fenv_t fenv;
|
||
|
|
+
|
||
|
|
+ fegetenv(&fenv);
|
||
|
|
+ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
|
||
|
|
+ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
|
||
|
|
+ fesetenv(&fenv);
|
||
|
|
printf("WARNING: for repeatability, setting FPU to use double precision\n");
|
||
|
|
#endif
|
||
|
|
// Extra options:
|
||
|
|
diff --git a/simp/Main.cc b/simp/Main.cc
|
||
|
|
index 2804d7f..39bfb71 100644
|
||
|
|
--- a/simp/Main.cc
|
||
|
|
+++ b/simp/Main.cc
|
||
|
|
@@ -79,8 +79,12 @@ int main(int argc, char** argv)
|
||
|
|
// printf("This is MiniSat 2.0 beta\n");
|
||
|
|
|
||
|
|
#if defined(__linux__)
|
||
|
|
- fpu_control_t oldcw, newcw;
|
||
|
|
- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
|
||
|
|
+ fenv_t fenv;
|
||
|
|
+
|
||
|
|
+ fegetenv(&fenv);
|
||
|
|
+ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
|
||
|
|
+ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
|
||
|
|
+ fesetenv(&fenv);
|
||
|
|
printf("WARNING: for repeatability, setting FPU to use double precision\n");
|
||
|
|
#endif
|
||
|
|
// Extra options:
|
||
|
|
diff --git a/utils/System.h b/utils/System.h
|
||
|
|
index 1758192..c0ad13a 100644
|
||
|
|
--- a/utils/System.h
|
||
|
|
+++ b/utils/System.h
|
||
|
|
@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
|
||
|
|
#define Minisat_System_h
|
||
|
|
|
||
|
|
#if defined(__linux__)
|
||
|
|
-#include <fpu_control.h>
|
||
|
|
+#include <fenv.h>
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#include "mtl/IntTypes.h"
|
||
|
|
--
|
||
|
|
2.14.2
|
||
|
|
|