aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
Diffstat (limited to 'erts')
-rw-r--r--erts/configure.in1
-rw-r--r--erts/preloaded/ebin/prim_file.beambin27724 -> 27760 bytes
-rw-r--r--erts/preloaded/src/prim_file.erl2
3 files changed, 2 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in
index f66445ec25..10ea0b5e4b 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -2706,6 +2706,7 @@ dnl On x86/amd64, floating points exceptions have
dnl unresolved stability issues.
AC_MSG_CHECKING([for unreliable floating point exceptions])
FPE=unreliable
+AC_SUBST(FPE)
AC_MSG_RESULT([unreliable])
AC_DEFINE(NO_FPE_SIGNALS,[],[Define if floating points exceptions are non-existing/not reliable])
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index b11e428229..2f1e55442a 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
Binary files differ
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 558a0f883f..2921b9df1d 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -562,7 +562,7 @@ list_dir_convert([RawName | Rest], SkipInvalid, Result) ->
logger ! {log,warning,"Non-unicode filename ~p ignored\n", [RawName],
#{pid=>self(),
gl=>group_leader(),
- time=>erlang:monotonic_time(microsecond),
+ time=>erlang:system_time(microsecond),
error_logger=>#{tag=>warning_msg}}},
list_dir_convert(Rest, SkipInvalid, Result);
{error, _} ->