diff options
| author | Björn Gustavsson <[email protected]> | 2016-03-16 12:00:54 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-03-16 12:00:54 +0100 |
| commit | ae61174845dde2ddda537d57ace5b1124b7f4191 (patch) | |
| tree | 6464a94a1c323e397cd6dd5cbb9fd8469587f31d /erts/emulator/sys/unix/sys_float.c | |
| parent | cee5b753e8dbd294b2677f684c404d16dcfcd643 (diff) | |
| parent | 395fbd8d02cb314b8ae57b9c02b4293037ca6890 (diff) | |
| download | otp-ae61174845dde2ddda537d57ace5b1124b7f4191.tar.gz otp-ae61174845dde2ddda537d57ace5b1124b7f4191.tar.bz2 otp-ae61174845dde2ddda537d57ace5b1124b7f4191.zip | |
Merge branch 'bjorn/fix-broken-osx-build'
* bjorn/fix-broken-osx-build:
Take out (parts of) broken fp exception support for MacOS X
configure.in: Fix compilation error in ethread.c
run_erl: Don't define _XOPEN_SOURCE on OS X
Diffstat (limited to 'erts/emulator/sys/unix/sys_float.c')
| -rw-r--r-- | erts/emulator/sys/unix/sys_float.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/erts/emulator/sys/unix/sys_float.c b/erts/emulator/sys/unix/sys_float.c index 8fe7e599e5..89e2484b17 100644 --- a/erts/emulator/sys/unix/sys_float.c +++ b/erts/emulator/sys/unix/sys_float.c @@ -499,18 +499,8 @@ static int mask_fpe(void) #define mc_pc(mc) ((mc)->gregs[REG_RIP]) #elif defined(__linux__) && defined(__i386__) #define mc_pc(mc) ((mc)->gregs[REG_EIP]) -#elif defined(__DARWIN__) && defined(__i386__) -#ifdef DARWIN_MODERN_MCONTEXT -#define mc_pc(mc) ((mc)->__ss.__eip) -#else -#define mc_pc(mc) ((mc)->ss.eip) -#endif -#elif defined(__DARWIN__) && defined(__x86_64__) -#ifdef DARWIN_MODERN_MCONTEXT -#define mc_pc(mc) ((mc)->__ss.__rip) -#else -#define mc_pc(mc) ((mc)->ss.rip) -#endif +#elif defined(__DARWIN__) +# error "Floating-point exceptions not supported on MacOS X" #elif defined(__FreeBSD__) && defined(__x86_64__) #define mc_pc(mc) ((mc)->mc_rip) #elif defined(__FreeBSD__) && defined(__i386__) @@ -575,17 +565,7 @@ static void fpe_sig_action(int sig, siginfo_t *si, void *puc) regs[PT_FPSCR] = 0x80|0x40|0x10; /* VE, OE, ZE; not UE or XE */ #endif #elif defined(__DARWIN__) && (defined(__i386__) || defined(__x86_64__)) -#ifdef DARWIN_MODERN_MCONTEXT - mcontext_t mc = uc->uc_mcontext; - pc = mc_pc(mc); - mc->__fs.__fpu_mxcsr = 0x1F80; - *(unsigned short *)&mc->__fs.__fpu_fsw &= ~0xFF; -#else - mcontext_t mc = uc->uc_mcontext; - pc = mc_pc(mc); - mc->fs.fpu_mxcsr = 0x1F80; - *(unsigned short *)&mc->fs.fpu_fsw &= ~0xFF; -#endif /* DARWIN_MODERN_MCONTEXT */ +# error "Floating-point exceptions not supported on MacOS X" #elif defined(__DARWIN__) && defined(__ppc__) mcontext_t mc = uc->uc_mcontext; pc = mc->ss.srr0; |