diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-06-26 11:47:42 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-06-26 11:47:42 -0300 |
| commit | cac6d23b14503b514d21d497fd4ccb0fcceddaed (patch) | |
| tree | 9681d53c02c168351837830432e4a20957f7de95 | |
| parent | 5a378c86387f75b0bc91c5fce2f8379e33a354d5 (diff) | |
| download | qtdeclarative-cac6d23b14503b514d21d497fd4ccb0fcceddaed.tar.gz | |
Remove v4_yarr_jit_push_pop_addressTempRegister.patch, applied upstream.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/v4_yarr_jit_push_pop_addressTempRegister.patch | 39 |
3 files changed, 1 insertions, 40 deletions
diff --git a/debian/changelog b/debian/changelog index 483a0ec..1a0b8a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ qtdeclarative-opensource-src (5.3.1-1) UNRELEASED; urgency=medium * New upstream release. * Update symbols files with buildds' logs and mips64[el] logs. * Bump Qt build depends. + * Remove v4_yarr_jit_push_pop_addressTempRegister.patch, applied upstream. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 26 Jun 2014 11:30:33 -0300 diff --git a/debian/patches/series b/debian/patches/series index 991578e..ea9378a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ freebsd_registers.diff -v4_yarr_jit_push_pop_addressTempRegister.patch diff --git a/debian/patches/v4_yarr_jit_push_pop_addressTempRegister.patch b/debian/patches/v4_yarr_jit_push_pop_addressTempRegister.patch deleted file mode 100644 index c386f72..0000000 --- a/debian/patches/v4_yarr_jit_push_pop_addressTempRegister.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d7193d7f566afcd9e1d5b58adfc09810d94c013b Mon Sep 17 00:00:00 2001 -From: Erik Verbruggen <erik.verbruggen@digia.com> -Date: Thu, 5 Jun 2014 14:13:39 +0200 -Subject: [PATCH] V4 Yarr JIT: push/pop addressTempRegister. - -Change 6572d4e50d73ac60a8974d07de74c27a7f99ebef moved the -addressTempRegister from r3 to r10, so that calculated calls would not -overwrite the fourth argument of a call. However, JSC's Yarr JIT might -also use it for certain loads, so it also needs to save r10. - -Task-number: QTBUG-39289 -Change-Id: I0a4e725b6b11ab5e772330662049668bed009c05 ---- - src/3rdparty/masm/yarr/YarrJIT.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/3rdparty/masm/yarr/YarrJIT.cpp b/src/3rdparty/masm/yarr/YarrJIT.cpp -index 783a869..94a72a5 100644 ---- a/src/3rdparty/masm/yarr/YarrJIT.cpp -+++ b/src/3rdparty/masm/yarr/YarrJIT.cpp -@@ -2561,6 +2561,7 @@ class YarrGenerator : private MacroAssembler { - #if CPU(ARM_TRADITIONAL) - push(ARMRegisters::r8); // scratch register - #endif -+ push(addressTempRegister); - if (compileMode == IncludeSubpatterns) - move(ARMRegisters::r3, output); - #elif CPU(SH4) -@@ -2588,6 +2589,7 @@ class YarrGenerator : private MacroAssembler { - pop(X86Registers::ebx); - pop(X86Registers::ebp); - #elif CPU(ARM) -+ pop(addressTempRegister); - #if CPU(ARM_TRADITIONAL) - pop(ARMRegisters::r8); // scratch register - #endif --- -2.0.0 - |