Merge branch 'master' into concurrency_classpath_extension

This commit is contained in:
Mike Jensen 2014-01-03 11:19:27 -07:00
commit 6ebc89d03a

View File

@ -729,6 +729,14 @@ Avian_avian_Atomic_getOffset
(t, jfieldVmField(t, reinterpret_cast<object>(arguments[0])));
}
extern "C" AVIAN_EXPORT int64_t JNICALL
Avian_sun_misc_Unsafe_objectFieldOffset
(Thread* t, object, uintptr_t* arguments)
{
return fieldOffset
(t, jfieldVmField(t, reinterpret_cast<object>(arguments[1])));
}
extern "C" AVIAN_EXPORT int64_t JNICALL
Avian_avian_Atomic_compareAndSwapObject
(Thread* t, object, uintptr_t* arguments)