Dr. Werner Fink 2020-04-29 10:11:51 +00:00 committed by Git OBS Bridge
parent 6e63803a14
commit e8e4738043
4 changed files with 3569 additions and 2 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,29 @@
From: Jason Teplitz <jason@tensyr.com>
Date: Mon, 9 Oct 2017 23:03:09 +0000
Subject: Fix register allocation bug in arm64
---
src/lj_asm_arm64.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lj_asm_arm64.h b/src/lj_asm_arm64.h
index 8fd92e7..549f8a6 100644
--- a/src/lj_asm_arm64.h
+++ b/src/lj_asm_arm64.h
@@ -871,7 +871,7 @@ static void asm_hrefk(ASMState *as, IRIns *ir)
int bigofs = !emit_checkofs(A64I_LDRx, ofs);
RegSet allow = RSET_GPR;
Reg dest = (ra_used(ir) || bigofs) ? ra_dest(as, ir, RSET_GPR) : RID_NONE;
- Reg node = ra_alloc1(as, ir->op1, allow);
+ Reg node = ra_alloc1(as, ir->op1, ra_hasreg(dest) ? rset_clear(allow, dest) : allow);
Reg key = ra_scratch(as, rset_clear(allow, node));
Reg idx = node;
uint64_t k;
@@ -879,7 +879,6 @@ static void asm_hrefk(ASMState *as, IRIns *ir)
rset_clear(allow, key);
if (bigofs) {
idx = dest;
- rset_clear(allow, dest);
kofs = (int32_t)offsetof(Node, key);
} else if (ra_hasreg(dest)) {
emit_opk(as, A64I_ADDx, dest, node, ofs, allow);

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Apr 29 09:56:08 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add patch 0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
*Support luajit on ppc64/ppc64le
- Add patch 0006-Fix-register-allocation-bug-in-arm64.patch
* luajit fix for arm64
- Modify spec file to build luajit based programs on ppc64*
-------------------------------------------------------------------
Wed Apr 22 11:20:57 UTC 2020 - Dr. Werner Fink <werner@suse.de>

View File

@ -19,7 +19,7 @@
%define texlive_version 2020
%define texlive_previous 2019
%define texlive_release 20200327
%define texlive_noarch 171
%define texlive_noarch 172
%define texlive_source texlive-20200327-source
%define __perl_requires %{nil}
@ -42,7 +42,7 @@
%ifarch %ix86 x86_64 ppc %arml aarch64 mips
%global with_LuaJIT 1
%endif
%bcond_with LuaJIT
%bcond_without LuaJIT
#
# poppler -- use system wide libpoppler
@ -283,6 +283,10 @@ Patch61: source-poppler0.83.0.patch
Patch62: source-psutils-kpathsea.dif
# PATCH-FIX-UPSTREAM source-poppler0.86.0.patch
Patch64: source-poppler0.86.0.patch
# PATCH-FIX-SUSE Support luajit on ppc64/ppc64le
Patch104: 0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
# PATCH-FIX-SUSE Support luajit fix for arm64
Patch106: 0006-Fix-register-allocation-bug-in-arm64.patch
Prefix: %{_bindir}
Provides: pdfjam = %{version}
Obsoletes: pdfjam < %{version}
@ -3802,6 +3806,10 @@ This package is required by the package texlive-biber-bin.
%patch18 -p0 -b .a2p
%patch19 -p0 -b .dvipng
%patch20 -p0 -b .missed
pushd libs/luajit/LuaJIT-src/
%patch104 -p1 -b .ppc64
%patch106 -p1 -b .arm64
popd
%patch0 -p0 -b .p0
%if %{with buildbiber}
pushd ../*biber-*/