Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_146788980592550"
MIME-Version: 1.0
Date: Thu, 7 Jul 2016 11:10:05 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/print/luatex
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20160707111005.C2214FBB5@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_146788980592550
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Thu Jul  7 11:10:05 UTC 2016

Modified Files:
	pkgsrc/print/luatex: distinfo
Added Files:
	pkgsrc/print/luatex/patches:
	    patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc

Log Message:
Add one more SunOS assembly patch to fix 64-bit.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/luatex/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_146788980592550
Content-Disposition: inline
Content-Length: 1989
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/print/luatex/distinfo
diff -u pkgsrc/print/luatex/distinfo:1.22 pkgsrc/print/luatex/distinfo:1.23
--- pkgsrc/print/luatex/distinfo:1.22	Wed Jul  6 09:47:52 2016
+++ pkgsrc/print/luatex/distinfo	Thu Jul  7 11:10:05 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2016/07/06 09:47:52 jperkin Exp $
+$NetBSD: distinfo,v 1.23 2016/07/07 11:10:05 jperkin Exp $
 
 SHA1 (texlive-20160523-source.tar.xz) = 8cdcc00492fc642db59a9a07f9ea080ff6765460
 RMD160 (texlive-20160523-source.tar.xz) = 4ffc4d92f8c6408c23a34815e2d4b0f4877d9c3f
@@ -6,3 +6,4 @@ SHA512 (texlive-20160523-source.tar.xz) 
 Size (texlive-20160523-source.tar.xz) = 258176464 bytes
 SHA1 (patch-ac) = 1ee83833a03eace2eada892130ddb2198e829f3d
 SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69
+SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f

Added files:

Index: pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc
diff -u /dev/null pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc:1.1
--- /dev/null	Thu Jul  7 11:10:05 2016
+++ pkgsrc/print/luatex/patches/patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc	Thu Jul  7 11:10:05 2016
@@ -0,0 +1,18 @@
+$NetBSD: patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc,v 1.1 2016/07/07 11:10:05 jperkin Exp $
+
+Generate SunOS compatible assembly.
+
+--- libs/luajit/LuaJIT-src/src/vm_x86.dasc.orig	2016-03-09 22:32:00.000000000 +0000
++++ libs/luajit/LuaJIT-src/src/vm_x86.dasc
+@@ -5496,7 +5496,11 @@ static void emit_asm_debug(BuildCtx *ctx
+ 	"\t.byte " REG_RA "\n"
+ 	"\t.uleb128 6\n"			/* augmentation length */
+ 	"\t.byte 0x1b\n"			/* pcrel|sdata4 */
++#ifdef __sun
++	"\t.long lj_err_unwind_dwarf@PLT-.\n"
++#else
+ 	"\t.long lj_err_unwind_dwarf-.\n"
++#endif
+ 	"\t.byte 0x1b\n"			/* pcrel|sdata4 */
+ 	"\t.byte 0xc\n\t.uleb128 " REG_SP "\n\t.uleb128 " SZPTR "\n"
+ 	"\t.byte 0x80+" REG_RA "\n\t.uleb128 0x1\n"


--_----------=_146788980592550--