diff options
author | Mike Pall <mike> | 2021-01-02 21:56:07 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2021-01-02 21:56:07 +0100 |
commit | 1e66d0f9e6698fdee672c40a9a5b4159c9254091 (patch) | |
tree | 06a019f1a74515bdcd11232f974390c590f5dfa7 /src/host | |
parent | 3134359734062604f0554b77fde6812a02c1e2b4 (diff) | |
parent | f47c864b0186fc92a2264e68e1151d0d2b24969e (diff) | |
download | luajit-1e66d0f9e6698fdee672c40a9a5b4159c9254091.tar.gz luajit-1e66d0f9e6698fdee672c40a9a5b4159c9254091.tar.bz2 luajit-1e66d0f9e6698fdee672c40a9a5b4159c9254091.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/host')
-rw-r--r-- | src/host/buildvm.c | 2 | ||||
-rw-r--r-- | src/host/buildvm.h | 2 | ||||
-rw-r--r-- | src/host/buildvm_asm.c | 2 | ||||
-rw-r--r-- | src/host/buildvm_fold.c | 2 | ||||
-rw-r--r-- | src/host/buildvm_lib.c | 2 | ||||
-rw-r--r-- | src/host/buildvm_peobj.c | 2 | ||||
-rw-r--r-- | src/host/genlibbc.lua | 2 | ||||
-rw-r--r-- | src/host/genminilua.lua | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/src/host/buildvm.c b/src/host/buildvm.c index 27e14d57..9dc328fc 100644 --- a/src/host/buildvm.c +++ b/src/host/buildvm.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** LuaJIT VM builder. | 2 | ** LuaJIT VM builder. |
3 | ** Copyright (C) 2005-2020 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2021 Mike Pall. See Copyright Notice in luajit.h |
4 | ** | 4 | ** |
5 | ** This is a tool to build the hand-tuned assembler code required for | 5 | ** This is a tool to build the hand-tuned assembler code required for |
6 | ** LuaJIT's bytecode interpreter. It supports a variety of output formats | 6 | ** LuaJIT's bytecode interpreter. It supports a variety of output formats |
diff --git a/src/host/buildvm.h b/src/host/buildvm.h index 3fdff65b..f81ef7e0 100644 --- a/src/host/buildvm.h +++ b/src/host/buildvm.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** LuaJIT VM builder. | 2 | ** LuaJIT VM builder. |
3 | ** Copyright (C) 2005-2020 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2021 Mike Pall. See Copyright Notice in luajit.h |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #ifndef _BUILDVM_H | 6 | #ifndef _BUILDVM_H |
diff --git a/src/host/buildvm_asm.c b/src/host/buildvm_asm.c index b9cfa049..01a1ba06 100644 --- a/src/host/buildvm_asm.c +++ b/src/host/buildvm_asm.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** LuaJIT VM builder: Assembler source code emitter. | 2 | ** LuaJIT VM builder: Assembler source code emitter. |
3 | ** Copyright (C) 2005-2020 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2021 Mike Pall. See Copyright Notice in luajit.h |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "buildvm.h" | 6 | #include "buildvm.h" |
diff --git a/src/host/buildvm_fold.c b/src/host/buildvm_fold.c index 65e19e26..02b51c4e 100644 --- a/src/host/buildvm_fold.c +++ b/src/host/buildvm_fold.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** LuaJIT VM builder: IR folding hash table generator. | 2 | ** LuaJIT VM builder: IR folding hash table generator. |
3 | ** Copyright (C) 2005-2020 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2021 Mike Pall. See Copyright Notice in luajit.h |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "buildvm.h" | 6 | #include "buildvm.h" |
diff --git a/src/host/buildvm_lib.c b/src/host/buildvm_lib.c index 88014b23..17e0111c 100644 --- a/src/host/buildvm_lib.c +++ b/src/host/buildvm_lib.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** LuaJIT VM builder: library definition compiler. | 2 | ** LuaJIT VM builder: library definition compiler. |
3 | ** Copyright (C) 2005-2020 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2021 Mike Pall. See Copyright Notice in luajit.h |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "buildvm.h" | 6 | #include "buildvm.h" |
diff --git a/src/host/buildvm_peobj.c b/src/host/buildvm_peobj.c index 01f9dac4..aa061e6e 100644 --- a/src/host/buildvm_peobj.c +++ b/src/host/buildvm_peobj.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** LuaJIT VM builder: PE object emitter. | 2 | ** LuaJIT VM builder: PE object emitter. |
3 | ** Copyright (C) 2005-2020 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2021 Mike Pall. See Copyright Notice in luajit.h |
4 | ** | 4 | ** |
5 | ** Only used for building on Windows, since we cannot assume the presence | 5 | ** Only used for building on Windows, since we cannot assume the presence |
6 | ** of a suitable assembler. The host and target byte order must match. | 6 | ** of a suitable assembler. The host and target byte order must match. |
diff --git a/src/host/genlibbc.lua b/src/host/genlibbc.lua index 56899546..921769f7 100644 --- a/src/host/genlibbc.lua +++ b/src/host/genlibbc.lua | |||
@@ -2,7 +2,7 @@ | |||
2 | -- Lua script to dump the bytecode of the library functions written in Lua. | 2 | -- Lua script to dump the bytecode of the library functions written in Lua. |
3 | -- The resulting 'buildvm_libbc.h' is used for the build process of LuaJIT. | 3 | -- The resulting 'buildvm_libbc.h' is used for the build process of LuaJIT. |
4 | ---------------------------------------------------------------------------- | 4 | ---------------------------------------------------------------------------- |
5 | -- Copyright (C) 2005-2020 Mike Pall. All rights reserved. | 5 | -- Copyright (C) 2005-2021 Mike Pall. All rights reserved. |
6 | -- Released under the MIT license. See Copyright Notice in luajit.h | 6 | -- Released under the MIT license. See Copyright Notice in luajit.h |
7 | ---------------------------------------------------------------------------- | 7 | ---------------------------------------------------------------------------- |
8 | 8 | ||
diff --git a/src/host/genminilua.lua b/src/host/genminilua.lua index c23e2365..c05ed63c 100644 --- a/src/host/genminilua.lua +++ b/src/host/genminilua.lua | |||
@@ -2,7 +2,7 @@ | |||
2 | -- Lua script to generate a customized, minified version of Lua. | 2 | -- Lua script to generate a customized, minified version of Lua. |
3 | -- The resulting 'minilua' is used for the build process of LuaJIT. | 3 | -- The resulting 'minilua' is used for the build process of LuaJIT. |
4 | ---------------------------------------------------------------------------- | 4 | ---------------------------------------------------------------------------- |
5 | -- Copyright (C) 2005-2020 Mike Pall. All rights reserved. | 5 | -- Copyright (C) 2005-2021 Mike Pall. All rights reserved. |
6 | -- Released under the MIT license. See Copyright Notice in luajit.h | 6 | -- Released under the MIT license. See Copyright Notice in luajit.h |
7 | ---------------------------------------------------------------------------- | 7 | ---------------------------------------------------------------------------- |
8 | 8 | ||