aboutsummaryrefslogtreecommitdiffstats
path: root/tools/lua/patches/030-archindependent-bytecode.patch
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2008-08-24 16:06:34 +0000
committerSteven Barth <cyrus@openwrt.org>2008-08-24 16:06:34 +0000
commit4f18ba92490710a97d23ab9b652805a53ff8a981 (patch)
tree5521c4f6bc253fa73b18a3c372c1cdb2cdef8ca6 /tools/lua/patches/030-archindependent-bytecode.patch
parent4b7249183c701e85161d3105f39583c7fce1d635 (diff)
downloadupstream-4f18ba92490710a97d23ab9b652805a53ff8a981.tar.gz
upstream-4f18ba92490710a97d23ab9b652805a53ff8a981.tar.bz2
upstream-4f18ba92490710a97d23ab9b652805a53ff8a981.zip
Updated Lua host compiler to 5.1.4
SVN-Revision: 12384
Diffstat (limited to 'tools/lua/patches/030-archindependent-bytecode.patch')
-rw-r--r--tools/lua/patches/030-archindependent-bytecode.patch22
1 files changed, 12 insertions, 10 deletions
diff --git a/tools/lua/patches/030-archindependent-bytecode.patch b/tools/lua/patches/030-archindependent-bytecode.patch
index 4ba58ebfb3..b27592fbd7 100644
--- a/tools/lua/patches/030-archindependent-bytecode.patch
+++ b/tools/lua/patches/030-archindependent-bytecode.patch
@@ -1,6 +1,7 @@
-diff -ur lua-5.1.3-pt2/src/ldump.c lua-5.1.3-pt3/src/ldump.c
---- lua-5.1.3-pt2/src/ldump.c 2008-04-05 14:25:13.000000000 +0200
-+++ lua-5.1.3-pt3/src/ldump.c 2008-04-05 14:28:27.000000000 +0200
+Index: lua-5.1.4/src/ldump.c
+===================================================================
+--- lua-5.1.4.orig/src/ldump.c 2008-08-24 16:48:20.000000000 +0200
++++ lua-5.1.4/src/ldump.c 2008-08-24 16:48:52.000000000 +0200
@@ -67,12 +67,12 @@
{
if (s==NULL || getstr(s)==NULL)
@@ -16,9 +17,10 @@ diff -ur lua-5.1.3-pt2/src/ldump.c lua-5.1.3-pt3/src/ldump.c
DumpVar(size,D);
DumpBlock(getstr(s),size,D);
}
-diff -ur lua-5.1.3-pt2/src/lundump.c lua-5.1.3-pt3/src/lundump.c
---- lua-5.1.3-pt2/src/lundump.c 2008-04-05 14:25:13.000000000 +0200
-+++ lua-5.1.3-pt3/src/lundump.c 2008-04-05 14:28:27.000000000 +0200
+Index: lua-5.1.4/src/lundump.c
+===================================================================
+--- lua-5.1.4.orig/src/lundump.c 2008-08-24 16:48:20.000000000 +0200
++++ lua-5.1.4/src/lundump.c 2008-08-24 16:48:52.000000000 +0200
@@ -25,6 +25,7 @@
ZIO* Z;
Mbuffer* b;
@@ -35,7 +37,7 @@ diff -ur lua-5.1.3-pt2/src/lundump.c lua-5.1.3-pt3/src/lundump.c
#define LoadByte(S) (lu_byte)LoadChar(S)
#define LoadVar(S,x) LoadMem(S,&x,1,sizeof(x))
#define LoadVector(S,b,n,size) LoadMem(S,b,n,size)
-@@ -52,6 +52,49 @@
+@@ -51,6 +51,49 @@
IF (r!=0, "unexpected end");
}
@@ -85,7 +87,7 @@ diff -ur lua-5.1.3-pt2/src/lundump.c lua-5.1.3-pt3/src/lundump.c
static int LoadChar(LoadState* S)
{
char x;
-@@ -83,7 +126,7 @@
+@@ -82,7 +125,7 @@
static TString* LoadString(LoadState* S)
{
@@ -94,7 +96,7 @@ diff -ur lua-5.1.3-pt2/src/lundump.c lua-5.1.3-pt3/src/lundump.c
LoadVar(S,size);
if (size==0)
return NULL;
-@@ -194,6 +237,7 @@
+@@ -196,6 +239,7 @@
char s[LUAC_HEADERSIZE];
luaU_header(h);
LoadBlock(S,s,LUAC_HEADERSIZE);
@@ -102,7 +104,7 @@ diff -ur lua-5.1.3-pt2/src/lundump.c lua-5.1.3-pt3/src/lundump.c
IF (memcmp(h,s,LUAC_HEADERSIZE)!=0, "bad header");
}
-@@ -228,7 +272,7 @@
+@@ -230,7 +274,7 @@
*h++=(char)LUAC_FORMAT;
*h++=(char)*(char*)&x; /* endianness */
*h++=(char)sizeof(int);