diff options
| author | Sverker Eriksson <[email protected]> | 2011-11-18 17:42:28 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-11-18 17:42:28 +0100 |
| commit | 7d9ef0fdde8119e1be0a47e3e45c9cdb85f926d8 (patch) | |
| tree | f9cbbd41ccf67517b8d9c7423ee2b3d64c6bba31 /erts/emulator/beam/erl_process.c | |
| parent | b130455e73b0bcacee2bfd3dfe6bafa9dd497886 (diff) | |
| parent | 327c072661840f671fc0041bc5e88bc69691d5aa (diff) | |
| download | otp-7d9ef0fdde8119e1be0a47e3e45c9cdb85f926d8.tar.gz otp-7d9ef0fdde8119e1be0a47e3e45c9cdb85f926d8.tar.bz2 otp-7d9ef0fdde8119e1be0a47e3e45c9cdb85f926d8.zip | |
Merge branch 'sverk/hipe-without-fpe/OTP-9724'
* sverk/hipe-without-fpe/OTP-9724:
otp_build: Disable FPE by default on Linux
stdlib: Make sure qlc_SUITE:otp_6964 restores backtrace_depth
erts: Add test for inf/NaN intermediate float results
hipe,erts: Allow hipe without floating point exceptions
hipe: Fix bug in hipe_rtl_lcm:calc_killed_expr_bb
erts: Rename macros used by float instructions without FPE
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index a1f5069b2d..84c0ded016 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -7140,7 +7140,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader). p->pending_exit.bp = NULL; #endif -#if !defined(NO_FPE_SIGNALS) +#if !defined(NO_FPE_SIGNALS) || defined(HIPE) p->fp_exception = 0; #endif @@ -7314,7 +7314,7 @@ void erts_init_empty_process(Process *p) p->run_queue = ERTS_RUNQ_IX(0); #endif -#if !defined(NO_FPE_SIGNALS) +#if !defined(NO_FPE_SIGNALS) || defined(HIPE) p->fp_exception = 0; #endif |