diff options
| author | Mike Pall <mike> | 2014-04-22 11:29:05 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-04-22 11:29:05 +0200 |
| commit | c8d1aff0bafcbfadb4a119685708c19788158cd6 (patch) | |
| tree | 9501d4b89549058b727c386aac980da075df4995 /src/Makefile | |
| parent | 39acdb8b7f8542373d6a47538f9a712baa8fe7d6 (diff) | |
| parent | 2715fe3aee7c8202b4b5d04748d1c5faa6d8fd9c (diff) | |
| download | luajit-c8d1aff0bafcbfadb4a119685708c19788158cd6.tar.gz luajit-c8d1aff0bafcbfadb4a119685708c19788158cd6.tar.bz2 luajit-c8d1aff0bafcbfadb4a119685708c19788158cd6.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 722efc33..fae4c7ba 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -119,8 +119,10 @@ XCFLAGS= | |||
| 119 | # | 119 | # |
| 120 | # Use the system provided memory allocator (realloc) instead of the | 120 | # Use the system provided memory allocator (realloc) instead of the |
| 121 | # bundled memory allocator. This is slower, but sometimes helpful for | 121 | # bundled memory allocator. This is slower, but sometimes helpful for |
| 122 | # debugging. It's helpful for Valgrind's memcheck tool, too. This option | 122 | # debugging. This option cannot be enabled on x64, since realloc usually |
| 123 | # cannot be enabled on x64, since the built-in allocator is mandatory. | 123 | # doesn't return addresses in the right address range. |
| 124 | # OTOH this option is mandatory for Valgrind's memcheck tool on x64 and | ||
| 125 | # the only way to get useful results from it for all other architectures. | ||
| 124 | #XCFLAGS+= -DLUAJIT_USE_SYSMALLOC | 126 | #XCFLAGS+= -DLUAJIT_USE_SYSMALLOC |
| 125 | # | 127 | # |
| 126 | # This define is required to run LuaJIT under Valgrind. The Valgrind | 128 | # This define is required to run LuaJIT under Valgrind. The Valgrind |