From d90957fbe6f41c66d5494ae5db1f60d2434d4c84 Mon Sep 17 00:00:00 2001 From: Douglas Leung Date: Thu, 30 Apr 2015 19:22:49 -0700 Subject: ART: Fix mips64 jni bugs. For mips64, 32-bits loads can be zero extended or sign extended to 64-bits. The extension type must match the data type to be loaded. Also re-enable mips64 generic jni testing. Change-Id: I9cabaf80b4fde63d9868fccd74593b36d1c324e8 --- runtime/common_runtime_test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/common_runtime_test.h') diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index 991737893a..34fdd8d76a 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -182,7 +182,7 @@ class CheckJniAbortCatcher { } #define TEST_DISABLED_FOR_MIPS() \ - if (kRuntimeISA == kMips || kRuntimeISA == kMips64) { \ + if (kRuntimeISA == kMips) { \ printf("WARNING: TEST DISABLED FOR MIPS\n"); \ return; \ } -- cgit v1.2.3