Mercurial > mxe-octave
comparison src/default-octave-1-inttypes.patch @ 4159:c190f2cae988
update patches for default-octave
* src/default-octave-1-inttypes.patch: New file. Temporary patch
until this issue is fixed in Octave sources.
* src/default-octave-1-fixes.patch: Delete obsolete patch.
* src/mingw-default-octave-1-msys-fixes.patch: Likewise.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 18 Jun 2016 18:49:15 -0400 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
4158:35c9886e1f60 | 4159:c190f2cae988 |
---|---|
1 diff -ur octave-4.1.0+.orig/liboctave/util/oct-inttypes.cc octave-4.1.0+/liboctave/util/oct-inttypes.cc | |
2 --- octave-4.1.0+.orig/liboctave/util/oct-inttypes.cc 2016-06-17 14:01:56.000000000 -0400 | |
3 +++ octave-4.1.0+/liboctave/util/oct-inttypes.cc 2016-06-17 19:52:03.943017663 -0400 | |
4 @@ -105,7 +105,31 @@ | |
5 | |
6 #if defined (OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED) | |
7 | |
8 -#define DEFINE_OCTAVE_LONG_DOUBLE_CMP_OP_TEMPLATES(T) \ | |
9 +typedef unsigned short fpucw_t; /* glibc calls this fpu_control_t */ | |
10 + | |
11 +# define FPU_PC_MASK 0x0300 | |
12 +# define FPU_PC_DOUBLE 0x200 /* glibc calls this _FPU_DOUBLE */ | |
13 +# define FPU_PC_EXTENDED 0x300 /* glibc calls this _FPU_EXTENDED */ | |
14 + | |
15 +# define GET_FPUCW() \ | |
16 + ({ fpucw_t _cw; \ | |
17 + __asm__ __volatile__ ("fnstcw %0" : "=m" (*&_cw)); \ | |
18 + _cw; \ | |
19 + }) | |
20 +# define SET_FPUCW(word) \ | |
21 + (void)({ fpucw_t _ncw = (word); \ | |
22 + __asm__ __volatile__ ("fldcw %0" : : "m" (*&_ncw)); \ | |
23 + }) | |
24 + | |
25 +# define DECL_LONG_DOUBLE_ROUNDING \ | |
26 + fpucw_t oldcw; | |
27 +# define BEGIN_LONG_DOUBLE_ROUNDING() \ | |
28 + (void)(oldcw = GET_FPUCW (), \ | |
29 + SET_FPUCW ((oldcw & ~FPU_PC_MASK) | FPU_PC_EXTENDED)) | |
30 +# define END_LONG_DOUBLE_ROUNDING() \ | |
31 + SET_FPUCW (oldcw) | |
32 + | |
33 +#define DEFINE_OCTAVE_LONG_DOUBLE_CMP_OP_TEMPLATES(T) \ | |
34 template <typename xop> \ | |
35 bool \ | |
36 octave_int_cmp_op::external_mop (double x, T y) \ |