diff options
| author | 2014-05-02 17:22:59 +0000 | |
|---|---|---|
| committer | 2014-05-02 17:23:00 +0000 | |
| commit | 851a9a9c0c9b94e24eb0b3d322e810bb388a81a0 (patch) | |
| tree | b324f2a3ce4b216e98084d0a586fdbea806cd1ce /runtime/arch/stub_test.cc | |
| parent | 6a6a5304e75a1af484975cedc832d0a80c3e5e61 (diff) | |
| parent | 80c7934b90c9f568c667ca52afbb807932ebf2f3 (diff) | |
Merge "Implement object lock and unlock entrypoints for x86-64"
Diffstat (limited to 'runtime/arch/stub_test.cc')
| -rw-r--r-- | runtime/arch/stub_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/arch/stub_test.cc b/runtime/arch/stub_test.cc index 437beb5b0f..8fbca9408a 100644 --- a/runtime/arch/stub_test.cc +++ b/runtime/arch/stub_test.cc @@ -183,12 +183,12 @@ TEST_F(StubTest, Memcpy) { } -#if defined(__i386__) || defined(__arm__) +#if defined(__i386__) || defined(__arm__) || defined(__x86_64__) extern "C" void art_quick_lock_object(void); #endif TEST_F(StubTest, LockObject) { -#if defined(__i386__) || defined(__arm__) +#if defined(__i386__) || defined(__arm__) || defined(__x86_64__) Thread* self = Thread::Current(); // Create an object ScopedObjectAccess soa(self); |