diff options
| author | Erlang/OTP <[email protected]> | 2010-02-08 15:39:26 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-02-08 15:39:26 +0000 |
| commit | 52f763526c95a7eb12fcfbdf07bb1216a1b756b4 (patch) | |
| tree | b0acc94c554812650f9974106490f2ef05f18234 /erts/configure.in | |
| parent | a4e2377c72f2e6f018792dff10ed967f08cfac5f (diff) | |
| parent | 56c0170c68a83634c6e2d955723b92c70b117c64 (diff) | |
| download | otp-52f763526c95a7eb12fcfbdf07bb1216a1b756b4.tar.gz otp-52f763526c95a7eb12fcfbdf07bb1216a1b756b4.tar.bz2 otp-52f763526c95a7eb12fcfbdf07bb1216a1b756b4.zip | |
Merge branch 'gc/hipe_darwin_amd64' into ccase/r13b04_dev
* gc/hipe_darwin_amd64:
Fix hipe memory allocation problems on darwin/amd64
Porting x86 darwin fixes to amd64 darwin hipe asm/m4 code
Automatically enable hipe for darwin/amd64 builds
Allow configure to enable_hipe for darwin/amd64 builds
OTP-8416 HiPE now works in the 64-bit emulator on Mac OS X. (Thanks to
Geoff Cant.)
Diffstat (limited to 'erts/configure.in')
| -rw-r--r-- | erts/configure.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in index 0115ae2ff5..a3b6fe319f 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -316,7 +316,6 @@ if test X${enable_darwin_64bit} = Xyes; then esac fi if test X${enable_darwin_64bit} = Xyes -o X${enable_m64_build} = Xyes; then - enable_hipe=no case $CFLAGS in *-m64*) ;; @@ -2180,7 +2179,7 @@ if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then AC_MSG_NOTICE([HiPE disabled as no valid m4 is found in PATH]) else case "$ARCH-$OPSYS" in - x86-linux|amd64-linux|ppc-linux|ppc-darwin|arm-linux|amd64-freebsd|x86-freebsd|x86-sol2|amd64-sol2|ultrasparc-linux) + x86-linux|amd64-linux|x86-darwin*|amd64-darwin*|ppc-linux|ppc-darwin|arm-linux|amd64-freebsd|x86-freebsd|x86-sol2|amd64-sol2|ultrasparc-linux) enable_hipe=yes ;; esac |