From a7ec329873625dada8defa5d4db06d96cf421a97 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Thu, 20 Oct 2016 16:19:18 +0200
Subject: erts: Refactor hipe config test

Just merge the two if's
---
 erts/configure.in | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/erts/configure.in b/erts/configure.in
index 86defd5119..5bd8afeea6 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -2744,29 +2744,29 @@ ERL_TIME_CORRECTION
 AC_CHECK_PROG(M4, m4, m4)
 
 
-dnl HiPE cannot run on 64-bit without MAP_FIXED and MAP_NORESERVE
-if test X${enable_hipe} != Xno && test X$ac_cv_sizeof_void_p != X4; then
-   AC_CHECK_DECLS([MAP_FIXED, MAP_NORESERVE], [], [], [#include <sys/mman.h>])
-   if test X$ac_cv_have_decl_MAP_FIXED != Xyes || test X$ac_cv_have_decl_MAP_NORESERVE != Xyes; then
-      if test X${enable_hipe} = Xyes; then
-	 AC_MSG_ERROR([HiPE on 64-bit needs MAP_FIXED and MAP_NORESERVE flags for mmap()])
-      else
-	 enable_hipe=no
-	 AC_MSG_WARN([Disable HiPE due to lack of MAP_FIXED and MAP_NORESERVE flags for mmap()])
-      fi
-   fi
-fi
-
-dnl HiPE cannot run on 32-bit without mprotect()
-if test X${enable_hipe} != Xno && test X$ac_cv_sizeof_void_p == X4; then
-   if test X$ac_cv_func_mprotect != Xyes; then
-      if test X${enable_hipe} = Xyes; then
-	 AC_MSG_ERROR([HiPE on 32-bit needs mprotect()])
-      else
-	 enable_hipe=no
-	 AC_MSG_WARN([Disable HiPE due to lack of mprotect()])
-      fi
-   fi
+if test X${enable_hipe} != Xno; then
+    if test X$ac_cv_sizeof_void_p != X4; then
+        dnl HiPE cannot run on 64-bit without MAP_FIXED and MAP_NORESERVE
+	AC_CHECK_DECLS([MAP_FIXED, MAP_NORESERVE], [], [], [#include <sys/mman.h>])
+	if test X$ac_cv_have_decl_MAP_FIXED != Xyes || test X$ac_cv_have_decl_MAP_NORESERVE != Xyes; then
+	    if test X${enable_hipe} = Xyes; then
+	        AC_MSG_ERROR([HiPE on 64-bit needs MAP_FIXED and MAP_NORESERVE flags for mmap()])
+	    else
+	        enable_hipe=no
+	        AC_MSG_WARN([Disable HiPE due to lack of MAP_FIXED and MAP_NORESERVE flags for mmap()])
+	    fi
+        fi
+    else
+        dnl HiPE cannot run on 32-bit without mprotect()
+        if test X$ac_cv_func_mprotect != Xyes; then
+            if test X${enable_hipe} = Xyes; then
+	        AC_MSG_ERROR([HiPE on 32-bit needs mprotect()])
+            else
+	        enable_hipe=no
+	        AC_MSG_WARN([Disable HiPE due to lack of mprotect()])
+            fi
+        fi
+    fi
 fi
 
 dnl check to auto-enable hipe here...
-- 
cgit v1.2.3