diff options
| author | Mike Pall <mike> | 2015-01-06 00:12:45 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-01-06 00:12:45 +0100 |
| commit | 0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535 (patch) | |
| tree | 79adfce53c856e0b066683352fd95cb40c97b3c5 /src/host | |
| parent | c71cdf4c36145dd052734779d297fdbd7455468f (diff) | |
| parent | 86913b9bbf75c78a5dcfa2bf6071db8db7df7c51 (diff) | |
| download | luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.gz luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.bz2 luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.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 865236d7..c3e7dad2 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-2014 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2015 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 b321bbda..55885553 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-2014 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2015 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 d1f5224f..fe1b589a 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-2014 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2015 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 7f5d9f2f..daed7ecc 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-2014 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2015 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 db95977f..e928673d 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-2014 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2015 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 138b0423..4279f500 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-2014 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2015 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 f1e12429..4398d8e7 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-2014 Mike Pall. All rights reserved. | 5 | -- Copyright (C) 2005-2015 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 04c55188..cd0d9466 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-2014 Mike Pall. All rights reserved. | 5 | -- Copyright (C) 2005-2015 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 | ||
