aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/icecat-CVE-2015-4513-pt11.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2015-4513-pt11.patch')
-rw-r--r--gnu/packages/patches/icecat-CVE-2015-4513-pt11.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2015-4513-pt11.patch b/gnu/packages/patches/icecat-CVE-2015-4513-pt11.patch
new file mode 100644
index 0000000000..c4b326b9ed
--- /dev/null
+++ b/gnu/packages/patches/icecat-CVE-2015-4513-pt11.patch
@@ -0,0 +1,42 @@
+From 72185a2795d4627203970e3c17fd9b3a6944edc6 Mon Sep 17 00:00:00 2001
+From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
+Date: Thu, 15 Oct 2015 10:57:39 +0200
+Subject: [PATCH] Bug 1204700 - ARM: Use a different scratch register for
+ store32. r=sstangl, a=lizzard
+
+--HG--
+extra : commitid : 8itRSfm5tEh
+extra : source : ebafbc7c1a870499159cdd2ee91573f1b52c728a
+---
+ js/src/jit/arm/MacroAssembler-arm.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/js/src/jit/arm/MacroAssembler-arm.cpp b/js/src/jit/arm/MacroAssembler-arm.cpp
+index 7b8c06e..c8030bb 100644
+--- a/js/src/jit/arm/MacroAssembler-arm.cpp
++++ b/js/src/jit/arm/MacroAssembler-arm.cpp
+@@ -2487,8 +2487,8 @@ MacroAssemblerARMCompat::store32(Imm32 src, const Address& address)
+ void
+ MacroAssemblerARMCompat::store32(Imm32 imm, const BaseIndex& dest)
+ {
+- ma_mov(imm, secondScratchReg_);
+- store32(secondScratchReg_, dest);
++ ma_mov(imm, ScratchRegister);
++ store32(ScratchRegister, dest);
+ }
+
+ void
+@@ -2498,8 +2498,8 @@ MacroAssemblerARMCompat::store32(Register src, const BaseIndex& dest)
+ uint32_t scale = Imm32::ShiftOf(dest.scale).value;
+
+ if (dest.offset != 0) {
+- ma_add(base, Imm32(dest.offset), ScratchRegister);
+- base = ScratchRegister;
++ ma_add(base, Imm32(dest.offset), secondScratchReg_);
++ base = secondScratchReg_;
+ }
+ ma_str(src, DTRAddr(base, DtrRegImmShift(dest.index, LSL, scale)));
+ }
+--
+2.5.0
+