Merge branch 'master' into v2.1

5 files changed, 10 insertions, 10 deletions

diff --git a/src/jit/dump.lua b/src/jit/dump.lua
index 06d1e258..d3425bda 100644
--- a/src/jit/dump.lua
+++ b/src/jit/dump.lua
@@ -614,7 +614,7 @@ local function dump_texit(tr, ex, ngpr, nfpr, ...)
   out:write("---- TRACE ", tr, " exit ", ex, "\n")
   if dumpmode.X then
     local regs = {...}
-    if jit.arch == "x64" then
+    if jit.arch:sub(-2) == "64" then
       for i=1,ngpr do
         out:write(format(" %016x", regs[i]))
         if i % 4 == 0 then out:write("\n") end
diff --git a/src/lib_base.c b/src/lib_base.c
index eb604538..c8409042 100644
--- a/src/lib_base.c
+++ b/src/lib_base.c
@@ -504,8 +504,8 @@ LJLIB_CF(print)
     lua_gettable(L, LUA_GLOBALSINDEX);
     tv = L->top-1;
   }
-  shortcut = (tvisfunc(tv) && funcV(tv)->c.ffid == FF_tostring)
-              && !gcrefu(basemt_it(G(L), LJ_TNUMX));
+  shortcut = (tvisfunc(tv) && funcV(tv)->c.ffid == FF_tostring) &&
+             !gcrefu(basemt_it(G(L), LJ_TNUMX));
   for (i = 0; i < nargs; i++) {
     cTValue *o = &L->base[i];
     const char *str;
diff --git a/src/lj_alloc.c b/src/lj_alloc.c
index 5de60b82..21fb7af5 100644
--- a/src/lj_alloc.c
+++ b/src/lj_alloc.c
@@ -6,7 +6,7 @@
 **
 **   This is a version (aka dlmalloc) of malloc/free/realloc written by
 **   Doug Lea and released to the public domain, as explained at
-**   http://creativecommons.org/licenses/publicdomain.
+**   https://creativecommons.org/licenses/publicdomain.
 **
 **   * Version pre-2.8.4 Wed Mar 29 19:46:29 2006    (dl at gee)
 **
@@ -16,8 +16,8 @@
 ** If you want to use dlmalloc in another project, you should get
 ** the original from: ftp://gee.cs.oswego.edu/pub/misc/
 ** For thread-safe derivatives, take a look at:
-** - ptmalloc: http://www.malloc.de/
-** - nedmalloc: http://www.nedprod.com/programs/portable/nedmalloc/
+** - ptmalloc: https://www.malloc.de/
+** - nedmalloc: https://www.nedprod.com/programs/portable/nedmalloc/
 */
 
 #define lj_alloc_c
diff --git a/src/lua.h b/src/lua.h
index 850bd796..6d1634d1 100644
--- a/src/lua.h
+++ b/src/lua.h
@@ -1,7 +1,7 @@
 /*
 ** $Id: lua.h,v 1.218.1.5 2008/08/06 13:30:12 roberto Exp $
 ** Lua - An Extensible Extension Language
-** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
+** Lua.org, PUC-Rio, Brazil (https://www.lua.org)
 ** See Copyright Notice at the end of this file
 */
 
diff --git a/src/luajit.h b/src/luajit.h
index 600031a1..d569fd40 100644
--- a/src/luajit.h
+++ b/src/luajit.h
@@ -1,5 +1,5 @@
 /*
-** LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
+** LuaJIT -- a Just-In-Time Compiler for Lua. https://luajit.org/
 **
 ** Copyright (C) 2005-2020 Mike Pall. All rights reserved.
 **
@@ -22,7 +22,7 @@
 ** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **
-** [ MIT license: http://www.opensource.org/licenses/mit-license.php ]
+** [ MIT license: https://www.opensource.org/licenses/mit-license.php ]
 */
 
 #ifndef _LUAJIT_H
@@ -34,7 +34,7 @@
 #define LUAJIT_VERSION_NUM      20100  /* Version 2.1.0 = 02.01.00. */
 #define LUAJIT_VERSION_SYM      luaJIT_version_2_1_0_beta3
 #define LUAJIT_COPYRIGHT        "Copyright (C) 2005-2020 Mike Pall"
-#define LUAJIT_URL              "http://luajit.org/"
+#define LUAJIT_URL              "https://luajit.org/"
 
 /* Modes for luaJIT_setmode. */
 #define LUAJIT_MODE_MASK        0x00ff