diff options
author | Mike Pall <mike> | 2017-01-17 12:41:05 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2017-01-17 12:41:05 +0100 |
commit | 71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd (patch) | |
tree | 898e706d4b2455c2c3799cc179f3bc7adf096858 /src/host | |
parent | c94b921f924c1b37fea52e34f4e01ba8b37d77d0 (diff) | |
parent | b93a1dd0c831cab22f98163d0dde792a493c0eef (diff) | |
download | luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.gz luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.bz2 luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.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 57b4dc97..de23fabd 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-2016 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2017 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 90d21b15..b90428dc 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-2016 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2017 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 28419c07..addf281f 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-2016 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2017 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 e87a0af3..d579f4d4 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-2016 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2017 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 1adc3cbd..2956fdb6 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-2016 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2017 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 42f6ac84..2eb2bb7b 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-2016 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2017 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 7a17a3d0..6f5a05cc 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-2016 Mike Pall. All rights reserved. | 5 | -- Copyright (C) 2005-2017 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 16a81a23..50feff01 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-2016 Mike Pall. All rights reserved. | 5 | -- Copyright (C) 2005-2017 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 | ||