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/emulator/Makefile.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/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index c6adf35cef..2fe12be43e 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -167,6 +167,9 @@ ifeq ($(OPSYS),linux) ppcBEAMLDFLAGS=-Wl,-m,elf32ppc ppc64BEAMLDFLAGS=-Wl,-m,elf64ppc,-T,hipe/elf64ppc.x endif +ifeq ($(OPSYS),darwin) +amd64BEAMLDFLAGS=-pagezero_size 0x10000000 +endif HIPEBEAMLDFLAGS=$($(ARCH)BEAMLDFLAGS) endif |