From 78e3ec6a4d1b4a361d9a1742604e82b100752d74 Mon Sep 17 00:00:00 2001
From: Jacob Bramley <Jacob.Bramley@arm.com>
Date: Tue, 23 Jun 2009 11:13:54 +0100
Subject: [PATCH] Don't use ARM's MOVW and MOVT instructions to write to the
 PC. (487595, r=vladimir)

---
 js/src/nanojit/NativeARM.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/nanojit/NativeARM.cpp b/js/src/nanojit/NativeARM.cpp
index 8cd24c28b356..418d26f6d872 100644
--- a/js/src/nanojit/NativeARM.cpp
+++ b/js/src/nanojit/NativeARM.cpp
@@ -1092,7 +1092,7 @@ Assembler::LD32_nochk(Register r, int32_t imm)
         return;
     }
 
-    if (AvmCore::config.thumb2) {
+    if (AvmCore::config.thumb2 && (r != PC)) {
         // On ARMv6T2 and above, we can just emit a movw/movt pair.
         // Note: The movt is only necessary if the high 16 bits are non-zero.
         if (((imm >> 16) & 0xFFFF) != 0)