commit 68f3e09c88a30e4b337b1929126a602b42406916
author Andreas Gampe <agampe@google.com> Wed Apr 16 11:23:27 2014 -0700
committer Andreas Gampe <agampe@google.com> Wed Apr 16 11:23:27 2014 -0700
tree 847746a412fdec09b9013514b095d24c3c37165b
parent b94fae66dac14be955c68028447cdad84ee22bf9

Fix typo in ISA centralization

X86 needs sign-extension.

Change-Id: I1253fbc9aa0e732e37b976a0723ec89155e7e2e7

compiler/jni/quick/jni_compiler.cc

diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc
index e03aefb..93b1b5a 100644
--- a/compiler/jni/quick/jni_compiler.cc
+++ b/compiler/jni/quick/jni_compiler.cc
@@ -314,7 +314,7 @@
           mr_conv->InterproceduralScratchRegister());
 
   // 10. Fix differences in result widths.
-  if (is_64_bit_target) {
+  if (instruction_set == kX86 || instruction_set == kX86_64) {
     if (main_jni_conv->GetReturnType() == Primitive::kPrimByte ||
         main_jni_conv->GetReturnType() == Primitive::kPrimShort) {
       __ SignExtend(main_jni_conv->ReturnRegister(),