aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-04-01 15:31:14 +0200
committerSverker Eriksson <[email protected]>2011-04-01 15:31:14 +0200
commit14adb5f5cd8148ef251157a39fdc4a99530bb1d1 (patch)
tree6a769d07862ee4bbb15eba3da3cf0aac932b24c5
parent745c4af40595c8b029c2d61ddbe22c6d12950236 (diff)
parentb3c59c7ba43cf2fdaf0af9e4da189d68df62fd33 (diff)
downloadotp-14adb5f5cd8148ef251157a39fdc4a99530bb1d1.tar.gz
otp-14adb5f5cd8148ef251157a39fdc4a99530bb1d1.tar.bz2
otp-14adb5f5cd8148ef251157a39fdc4a99530bb1d1.zip
Merge branch 'sverker/config-hipe-halfword-prevent' into dev
* sverker/config-hipe-halfword-prevent: Prevent configuration of hipe and halfword emulator together
-rw-r--r--erts/configure.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/configure.in b/erts/configure.in
index a4c3ffb5c4..c93fa95ab1 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -2399,6 +2399,12 @@ if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then
if test -z "$M4"; then
enable_hipe=no
AC_MSG_NOTICE([HiPE disabled as no valid m4 is found in PATH])
+ elif test "$enable_halfword_emulator" = "yes"; then
+ if test X${enable_hipe} = Xyes; then
+ AC_MSG_ERROR([HiPE can not be combined with halfword emulator (yet)])
+ else
+ AC_MSG_NOTICE([HiPE auto-disabled on halfword emulator])
+ fi
else
case "$ARCH-$OPSYS" in
x86-linux|amd64-linux|x86-darwin*|amd64-darwin*|ppc-linux|ppc-darwin|arm-linux|amd64-freebsd|x86-freebsd|x86-sol2|amd64-sol2|ultrasparc-linux)