aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-04-11 14:48:55 +0200
committerGitHub <[email protected]>2017-04-11 14:48:55 +0200
commitf6e1e5615f7c9e0e887762738c400d779e211a2e (patch)
treecdc0d305be1458a0e5bd2631bb9c9f094508ad57 /erts
parenta7307600a2b8dbcf628ae8ccf26137bc32f060cc (diff)
parentd9a6b8d2f761f6c16fd0772b65a3c4b6169f3b64 (diff)
downloadotp-f6e1e5615f7c9e0e887762738c400d779e211a2e.tar.gz
otp-f6e1e5615f7c9e0e887762738c400d779e211a2e.tar.bz2
otp-f6e1e5615f7c9e0e887762738c400d779e211a2e.zip
Merge PR-1397 from margnus1/hipe-m32-build OTP-14330
Allow HiPE-enabled VMs to be built with --enable-m32-build
Diffstat (limited to 'erts')
-rw-r--r--erts/configure.in13
1 files changed, 8 insertions, 5 deletions
diff --git a/erts/configure.in b/erts/configure.in
index d7d56d45b6..eb3d975edc 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -381,7 +381,6 @@ if test X${enable_m64_build} = Xyes; then
else
if test X${enable_m32_build} = Xyes;
then
- enable_hipe=no;
case $CFLAGS in
*-m32*)
;;
@@ -642,10 +641,6 @@ dnl Ditto between ultrasparc and sparc64.
dnl
AC_MSG_CHECKING(whether compilation mode forces ARCH adjustment)
case "$ARCH-$ac_cv_sizeof_void_p" in
-i386-8)
- AC_MSG_RESULT(yes: adjusting ARCH=x86 to ARCH=amd64)
- ARCH=amd64
- ;;
x86-8)
AC_MSG_RESULT(yes: adjusting ARCH=x86 to ARCH=amd64)
ARCH=amd64
@@ -666,6 +661,14 @@ ppc64-4)
AC_MSG_RESULT(yes: adjusting ARCH=ppc64 to ARCH=ppc)
ARCH=ppc
;;
+ppc-8)
+ AC_MSG_RESULT(yes: adjusting ARCH=ppc to ARCH=ppc64)
+ ARCH=ppc64
+ ;;
+arm-8)
+ AC_MSG_RESULT(yes: adjusting ARCH=arm to ARCH=noarch)
+ ARCH=noarch
+ ;;
*)
AC_MSG_RESULT(no)
;;