github.com/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty synced 2025-02-23 08:19:34 +01:00
Code Releases Wiki Activity

change: we now enable the GC64 mode by default in our bundled LuaJIT build for x86_64 architectures; this can be disabled with ./configure --without-luajit-gc64.

Browse Source
This commit is contained in:
Thibault Charbonnier 2019-01-29 20:00:58 -08:00 committed by GitHub
parent 2879e59e7b
commit 3f42731e50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 492 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

698
t/sanity.t
View File

File diff suppressed because it is too large Load Diff

15
util/configure vendored
View File

@ -4,6 +4,7 @@ use 5.006;
use strict; use strict;
use warnings; use warnings;
use Config;
use File::Spec; use File::Spec;
use File::Temp qw( tempfile tmpnam ); use File::Temp qw( tempfile tmpnam );
@ -129,6 +130,7 @@ my $cores;
my $luajit_xcflags = ''; my $luajit_xcflags = '';
my $user_luajit_xcflags; my $user_luajit_xcflags;
my $no_luajit_lua52; my $no_luajit_lua52;
my $no_luajit_gc64;
my (@ngx_opts, @ngx_cc_opts, @ngx_ld_opts); my (@ngx_opts, @ngx_cc_opts, @ngx_ld_opts);
@ -263,6 +265,9 @@ for my $opt (@ARGV) {
} elsif ($opt =~ /^--without-luajit-lua52/) { } elsif ($opt =~ /^--without-luajit-lua52/) {
$no_luajit_lua52 = 1; $no_luajit_lua52 = 1;
} elsif ($opt =~ /^--without-luajit-gc64/) {
$no_luajit_gc64 = 1;
} elsif ($opt =~ /^--with-libdrizzle=(.*)/) { } elsif ($opt =~ /^--with-libdrizzle=(.*)/) {
$resty_opts{libdrizzle} = $1; $resty_opts{libdrizzle} = $1;
@ -701,6 +706,14 @@ _END_
$luajit_xcflags .= " -DLUAJIT_ENABLE_LUA52COMPAT"; $luajit_xcflags .= " -DLUAJIT_ENABLE_LUA52COMPAT";
} }
if (!$no_luajit_gc64
&& $Config{"archname"} =~ /\bx86_64\b/
&& (!$user_luajit_xcflags
|| $user_luajit_xcflags !~ /-DLUAJIT_ENABLE_GC64\b/))
{
$luajit_xcflags .= " -DLUAJIT_ENABLE_GC64";
}
if (!$user_luajit_xcflags if (!$user_luajit_xcflags
|| $user_luajit_xcflags !~ /-msse4\.2\b/) || $user_luajit_xcflags !~ /-msse4\.2\b/)
{ {
@ -1316,6 +1329,8 @@ _EOC_
--with-luajit-xcflags=FLAGS Specify extra C compiler flags for LuaJIT 2.1 --with-luajit-xcflags=FLAGS Specify extra C compiler flags for LuaJIT 2.1
--without-luajit-lua52 Turns off the LuaJIT extensions from Lua 5.2 that may break --without-luajit-lua52 Turns off the LuaJIT extensions from Lua 5.2 that may break
backward compatibility. backward compatibility.
--without-luajit-gc64 Turns off the LuaJIT GC64 mode (which is enabled by default
on x86_64)
--with-libdrizzle=DIR specify the libdrizzle 1.0 (or drizzle) installation prefix --with-libdrizzle=DIR specify the libdrizzle 1.0 (or drizzle) installation prefix
--with-libpq=DIR specify the libpq (or postgresql) installation prefix --with-libpq=DIR specify the libpq (or postgresql) installation prefix