archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-28 22:57:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/webkit2gtk: fix patch

Browse source
This commit is contained in:
Kevin Mihelich 2018-09-22 00:37:30 +00:00
parent dd11ad18f0
commit 93f92faa00
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extra/webkit2gtk/PKGBUILD
View file

@ -25,7 +25,7 @@ source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}
armv7-build-fix.patch)
sha256sums=('051794adb25c1d5f7cb24b84ef0f1b04d9030441a8a708282f53539752007a12'
'SKIP'
'3699970053fbf22c7c1ea820c87b398af22aa08ee5b5c6d3436e888b8960ab45')
'd8a3c330f3ac3a28d7947d557a2bfbb1f723644a991bb4dc817b3e8009251146')
validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
prepare() {

23
extra/webkit2gtk/armv7-build-fix.patch
View file

@ -1,19 +1,18 @@
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h b/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h
index 81d4f7ef268..790a39da444 100644
--- a/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h
@@ -1942,6 +1942,14 @@ public:
return PatchableJump(result);
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h
index 266a818f570..fa4df51734a 100644
--- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h
@@ -981,6 +981,13 @@ public:
return PatchableJump(m_assembler.jmp(ARMAssembler::AL, 1));
}
+ PatchableJump patchableBranch8(RelationalCondition cond, Address left, TrustedImm32 imm)
+ PatchableJump patchableBranch8(RelationalCondition cond, Address address, TrustedImm32 imm)
+ {
+ m_makeJumpPatchable = true;
+ Jump result = branch8(cond, left, imm);
+ m_makeJumpPatchable = false;
+ return PatchableJump(result);
+ TrustedImm32 imm8 = MacroAssemblerHelpers::mask8OnCondition(*this, cond, imm);
+ MacroAssemblerHelpers::load8OnCondition(*this, cond, address, dataTempRegister);
+ return patchableBranch32(cond, dataTempRegister, imm8);
+ }
+
PatchableJump patchableBranch32(RelationalCondition cond, RegisterID reg, TrustedImm32 imm)
{
m_makeJumpPatchable = true;
internalCompare32(reg, imm);