From 6eee26d55f32113e3ea4575e5500f2fc3c312fff Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 4 Oct 2016 21:46:53 +0200
Subject: erts: Enable exec_alloc for all hipe architectures

For non-amd64 it's a "normal" allocator with a
wrapper around mseg_alloc to call mprotect(PROT_EXEC).
---
 erts/emulator/sys/common/erl_mmap.c | 4 ++--
 erts/emulator/sys/common/erl_mmap.h | 5 +++--
 erts/emulator/sys/common/erl_mseg.c | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'erts/emulator/sys')

diff --git a/erts/emulator/sys/common/erl_mmap.c b/erts/emulator/sys/common/erl_mmap.c
index 7bbb406f29..3ab03971a5 100644
--- a/erts/emulator/sys/common/erl_mmap.c
+++ b/erts/emulator/sys/common/erl_mmap.c
@@ -21,6 +21,7 @@
 #  include "config.h"
 #endif
 
+#define ERTS_WANT_MEM_MAPPERS
 #include "sys.h"
 #include "erl_process.h"
 #include "erl_smp.h"
@@ -358,12 +359,11 @@ char* erts_literals_start;
 UWord erts_literals_size;
 #endif
 
-#ifdef ERTS_ALC_A_EXEC
+#ifdef ERTS_HAVE_EXEC_MMAPPER
 ErtsMemMapper erts_exec_mmapper;
 #endif
 
 
-
 #define ERTS_MMAP_SIZE_SC_SA_INC(SZ) 						\
     do {									\
 	mm->size.supercarrier.used.total += (SZ);			\
diff --git a/erts/emulator/sys/common/erl_mmap.h b/erts/emulator/sys/common/erl_mmap.h
index fa51b663fa..92e9eb9e41 100644
--- a/erts/emulator/sys/common/erl_mmap.h
+++ b/erts/emulator/sys/common/erl_mmap.h
@@ -159,9 +159,10 @@ Eterm erts_mmap_info_options(ErtsMemMapper*,
 extern ErtsMemMapper erts_dflt_mmapper;
 #  if defined(ARCH_64) && defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
 extern ErtsMemMapper erts_literal_mmapper;
-#  endif
-#  ifdef ERTS_ALC_A_EXEC
+#    ifdef ERTS_ALC_A_EXEC
+#      define ERTS_HAVE_EXEC_MMAPPER
 extern ErtsMemMapper erts_exec_mmapper;
+#    endif
 #  endif
 #endif /* ERTS_WANT_MEM_MAPPERS */
 
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c
index f3306a888c..e76082177e 100644
--- a/erts/emulator/sys/common/erl_mseg.c
+++ b/erts/emulator/sys/common/erl_mseg.c
@@ -1414,7 +1414,7 @@ erts_mseg_init(ErtsMsegInit_t *init)
 
     erts_mtx_init(&init_atoms_mutex, "mseg_init_atoms");
 
-#ifdef ERTS_ALC_A_EXEC
+#ifdef ERTS_HAVE_EXEC_MMAPPER
     /* Initialize erts_exec_mapper *FIRST*, to increase probability
      * of getting low memory for HiPE AMD64's small code model.
      */
-- 
cgit v1.2.3