diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-01-26 12:44:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-26 12:44:45 +0000 |
| commit | ebb3cbc5869f78170f08ffdb1e782b3b3371e638 (patch) | |
| tree | 050de6bdf59c5986e249ffa3c32e6a5f1922265a /runtime/mirror | |
| parent | 2dadc9df0ffb822870a150f81257792b83241c77 (diff) | |
| parent | 3d2c8e74c27efee58e24ec31441124f3f21384b9 (diff) | |
| download | art-ebb3cbc5869f78170f08ffdb1e782b3b3371e638.tar.gz art-ebb3cbc5869f78170f08ffdb1e782b3b3371e638.tar.bz2 art-ebb3cbc5869f78170f08ffdb1e782b3b3371e638.zip | |
Merge "ART: Implement X86 hard float (Quick/JNI/Baseline)"
Diffstat (limited to 'runtime/mirror')
| -rw-r--r-- | runtime/mirror/art_method.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/art_method.cc b/runtime/mirror/art_method.cc index 288f6a60bb..b2016dcc82 100644 --- a/runtime/mirror/art_method.cc +++ b/runtime/mirror/art_method.cc @@ -41,7 +41,7 @@ namespace mirror { extern "C" void art_quick_invoke_stub(ArtMethod*, uint32_t*, uint32_t, Thread*, JValue*, const char*); -#if defined(__LP64__) || defined(__arm__) +#if defined(__LP64__) || defined(__arm__) || defined(__i386__) extern "C" void art_quick_invoke_static_stub(ArtMethod*, uint32_t*, uint32_t, Thread*, JValue*, const char*); #endif @@ -415,7 +415,7 @@ void ArtMethod::Invoke(Thread* self, uint32_t* args, uint32_t args_size, JValue* << "Don't call compiled code when -Xint " << PrettyMethod(this); } -#if defined(__LP64__) || defined(__arm__) +#if defined(__LP64__) || defined(__arm__) || defined(__i386__) if (!IsStatic()) { (*art_quick_invoke_stub)(this, args, args_size, self, result, shorty); } else { |