Update filename in replace-movw.patch and apply it.

diff --git a/debian/patches/replace-movw.patch b/debian/patches/replace-movw.patch
index d30924c283fec503a8f9d035b2df3e0a0acb358d..bdf20f15eba66251b8b45f3aeb2fd11969e775b7 100644 (file)
--- a/debian/patches/replace-movw.patch
+++ b/debian/patches/replace-movw.patch
@@ -1,8 +1,8 @@
 Description: Replace movw with mov and orr
 Author: Peter Michael Green <plugwash@raspbian.org>
 
---- android-platform-art-8.1.0+r23.orig/runtime/interpreter/mterp/out/mterp_arm.S
-+++ android-platform-art-8.1.0+r23/runtime/interpreter/mterp/out/mterp_arm.S
+--- android-platform-art-8.1.0+r23.orig/runtime/interpreter/mterp/arm/floating_point.S
++++ android-platform-art-8.1.0+r23/runtime/interpreter/mterp/arm/floating_point.S
 @@ -7755,12 +7755,14 @@ d2l_doconv:
      lsl r2, r1, #1
      lsr r2, r2, #21

diff --git a/runtime/interpreter/mterp/arm/floating_point.S b/runtime/interpreter/mterp/arm/floating_point.S
index f2b7b3b9c07f0abcd98ad551ce57aac20634dbcb..2f78fa9043c95bb2959cc6ca6a4bfa1b9ae9d772 100644 (file)
--- a/runtime/interpreter/mterp/arm/floating_point.S
+++ b/runtime/interpreter/mterp/arm/floating_point.S
@@ -353,12 +353,14 @@ d2l_doconv:
     lsl r2, r1, #(32-(11)-(20))
     lsr r2, r2, #((32-(11))
     @ end replacement of ubfx    r2, r1, #20, #11            @ grab the exponent
-    movw    r3, #0x43e
+    mov     r3, #0x03e
+    orr     r3, #0x400
     cmp     r2, r3                      @ MINLONG < x > MAXLONG?
     bhs     d2l_special_cases
     b       __aeabi_d2lz                @ tail call to convert double to long
 d2l_special_cases:
-    movw    r3, #0x7ff
+    mov     r3, #0x0ff
+    orr     r3, #0x700
     cmp     r2, r3
     beq     d2l_maybeNaN                @ NaN?
 d2l_notNaN: