Fixed order/dependency of macro definitions.

hfp · Jun 2, 2021 · f07e9d7 · f07e9d7
1 parent f5d9120
commit f07e9d7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/libxsmm_main.h b/src/libxsmm_main.h
@@ -61,6 +61,18 @@
 #if !defined(LIBXSMM_MALLOC_HOOK_CALLOC) && 1
 # define LIBXSMM_MALLOC_HOOK_CALLOC
 #endif
+/* map memory for scratch buffers */
+#if !defined(LIBXSMM_MALLOC_MMAP_SCRATCH) && 1
+# define LIBXSMM_MALLOC_MMAP_SCRATCH
+#endif
+/* map memory for hooked allocation */
+#if !defined(LIBXSMM_MALLOC_MMAP_HOOK) && 1
+# define LIBXSMM_MALLOC_MMAP_HOOK
+#endif
+/* map memory also for non-executable buffers */
+#if !defined(LIBXSMM_MALLOC_MMAP) && 0
+# define LIBXSMM_MALLOC_MMAP
+#endif
 /* align even if interceptor is disabled at runtime */
 #if !defined(LIBXSMM_MALLOC_ALIGN_ALL) && 1
 # define LIBXSMM_MALLOC_ALIGN_ALL

diff --git a/src/libxsmm_malloc.c b/src/libxsmm_malloc.c
@@ -194,18 +194,6 @@ LIBXSMM_EXTERN_C typedef struct iJIT_Method_Load_V2 {
 #elif !defined(NDEBUG)
 # define LIBXSMM_MALLOC_DELETE_SAFE
 #endif
-/* map memory for scratch buffers */
-#if !defined(LIBXSMM_MALLOC_MMAP_SCRATCH) && 1
-# define LIBXSMM_MALLOC_MMAP_SCRATCH
-#endif
-/* map memory for hooked allocation */
-#if !defined(LIBXSMM_MALLOC_MMAP_HOOK) && 1
-# define LIBXSMM_MALLOC_MMAP_HOOK
-#endif
-/* map memory also for non-executable buffers */
-#if !defined(LIBXSMM_MALLOC_MMAP) && 0
-# define LIBXSMM_MALLOC_MMAP
-#endif
 
 #define INTERNAL_MEMALIGN_REAL(RESULT, ALIGNMENT, SIZE) do { \
   const size_t internal_memalign_real_alignment_ = INTERNAL_MALLOC_AUTOALIGN(SIZE, ALIGNMENT); \

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-master-1.16.1-1517
+master-1.16.1-1518