diff options
| -rw-r--r-- | compiler/utils/assembler_thumb_test_expected.cc.inc | 2 | ||||
| -rw-r--r-- | runtime/entrypoints_order_test.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler/utils/assembler_thumb_test_expected.cc.inc b/compiler/utils/assembler_thumb_test_expected.cc.inc index 071cd575e1..f8c4008b45 100644 --- a/compiler/utils/assembler_thumb_test_expected.cc.inc +++ b/compiler/utils/assembler_thumb_test_expected.cc.inc @@ -5610,7 +5610,7 @@ const char* const VixlJniHelpersResults[] = { " 214: ecbd 8a10 vpop {s16-s31}\n", " 218: e8bd 8de0 ldmia.w sp!, {r5, r6, r7, r8, sl, fp, pc}\n", " 21c: 4660 mov r0, ip\n", - " 21e: f8d9 c2b4 ldr.w ip, [r9, #692] ; 0x2b4\n", + " 21e: f8d9 c2b8 ldr.w ip, [r9, #696] ; 0x2b8\n", " 222: 47e0 blx ip\n", nullptr }; diff --git a/runtime/entrypoints_order_test.cc b/runtime/entrypoints_order_test.cc index 55a4625c39..a3c3981b42 100644 --- a/runtime/entrypoints_order_test.cc +++ b/runtime/entrypoints_order_test.cc @@ -121,7 +121,8 @@ class EntrypointsOrderTest : public CommonRuntimeTest { sizeof(Thread::tls_ptr_sized_values::active_suspend_barriers)); EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, thread_local_start, thread_local_pos, sizeof(void*)); EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, thread_local_pos, thread_local_end, sizeof(void*)); - EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, thread_local_end, thread_local_objects, sizeof(void*)); + EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, thread_local_end, thread_local_limit, sizeof(void*)); + EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, thread_local_limit, thread_local_objects, sizeof(void*)); EXPECT_OFFSET_DIFFP(Thread, tlsPtr_, thread_local_objects, jni_entrypoints, sizeof(size_t)); // Skip across the entrypoints structures. |