diff options
| author | Serban Constantinescu <serban.constantinescu@arm.com> | 2014-04-09 18:39:10 +0100 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-04-10 17:12:09 -0700 |
| commit | 75b9113b2b0a5807043af2a669a93d1579af8e2c (patch) | |
| tree | b421bbfbac8dd3337c9e918a570e292d8c77953b /compiler/common_compiler_test.h | |
| parent | e81a7c314afc8f92afcdbc3cbc2331afca7dcb3d (diff) | |
| download | android_art-75b9113b2b0a5807043af2a669a93d1579af8e2c.tar.gz android_art-75b9113b2b0a5807043af2a669a93d1579af8e2c.tar.bz2 android_art-75b9113b2b0a5807043af2a669a93d1579af8e2c.zip | |
AArch64: Jni compiler fixes
This patch fixes some of the issues with the ARM64 assembler and JNI
compiler.
The JNI compiler is not enabled by default, yet. To enable, change
line 1884 in compiler/driver/compiler_driver.cc, removing kArm64 from
the GenericJNI list.
The compiler passes all tests in jni_compiler_test.
Also change the common_compiler_test instruction-set-features logic.
We allow tests when the build-time features are a subset of the
runtime features.
Dex2oat cross-compiling is now working. A 32b version of dex2oat should
be able to compile correctly.
Change-Id: I51d1c24f2c75d4397a11c54724a8b277ff3b3df8
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Diffstat (limited to 'compiler/common_compiler_test.h')
| -rw-r--r-- | compiler/common_compiler_test.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h index 9a21da070a..fdf09a50a6 100644 --- a/compiler/common_compiler_test.h +++ b/compiler/common_compiler_test.h @@ -299,7 +299,7 @@ class CommonCompilerTest : public CommonRuntimeTest { // for ARM, do a runtime check to make sure that the features we are passed from // the build match the features we actually determine at runtime. - ASSERT_EQ(instruction_set_features, runtime_features); + ASSERT_LE(instruction_set_features, runtime_features); #elif defined(__aarch64__) instruction_set = kArm64; // TODO: arm64 compilation support. |