Merge branch 'rickard/pcre-8.40'

OTP-14331

* rickard/pcre-8.40:
  Update documentation
  Update README.pcre_update.md
  Stack guard for PCRE
  Adjust for incompatibility between PCRE 8.40 and perl 5.22.1
  Generate re replacement and split tests with perl vsn 5.22.1
  Fix re_SUITE:pcre_compile_workspace_overflow/1
  Skip line with lockout of modifiers in PCRE tests
  Update tests for PCRE version 8.40
  Update PCRE to version 8.40

Conflicts:
	erts/emulator/beam/beam_debug.c

2 files changed, 18 insertions, 0 deletions

diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index b48b3f8804..f80f136d79 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -298,6 +298,18 @@ erts_sys_schedule_interrupt_timed(int set, ErtsMonotonicTime timeout_time)
 }
 #endif
 
+UWord
+erts_sys_get_page_size(void)
+{
+#if defined(_SC_PAGESIZE)
+    return (UWord) sysconf(_SC_PAGESIZE);
+#elif defined(HAVE_GETPAGESIZE)
+    return (UWord) getpagesize();
+#else
+    return (UWord) 4*1024; /* Guess 4 KB */
+#endif
+}
+
 Uint
 erts_sys_misc_mem_sz(void)
 {
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index 40e5595533..fa9ed308a2 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -186,6 +186,12 @@ void sys_primitive_init(HMODULE beam)
     beam_module = (HMODULE) beam;
 }
 
+UWord
+erts_sys_get_page_size(void)
+{
+    return (UWord) 4*1024; /* Guess 4 KB */
+}
+
 Uint
 erts_sys_misc_mem_sz(void)
 {