diff options
| author | 2015-12-07 23:20:18 +0000 | |
|---|---|---|
| committer | 2015-12-07 23:20:18 +0000 | |
| commit | 9f62af0e1cd770ec3e98f0d1a83a1193e2493cac (patch) | |
| tree | 4d47b48f4dcc5a40f41650a6e2417ea2a6252108 | |
| parent | 3cf8583a2fe1a2793b4c67098df62f4362b47f0c (diff) | |
| parent | 6aa137071c53b5f4a04284be9d8cc51362ad3716 (diff) | |
Merge "ART: Fix PACKED size of tls_ptr_size."
| -rw-r--r-- | runtime/thread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/thread.h b/runtime/thread.h index 3abb3cf360..c556c3614d 100644 --- a/runtime/thread.h +++ b/runtime/thread.h @@ -1228,7 +1228,7 @@ class Thread { RuntimeStats stats; } tls64_; - struct PACKED(4) tls_ptr_sized_values { + struct PACKED(sizeof(void*)) tls_ptr_sized_values { tls_ptr_sized_values() : card_table(nullptr), exception(nullptr), stack_end(nullptr), managed_stack(), suspend_trigger(nullptr), jni_env(nullptr), tmp_jni_env(nullptr), self(nullptr), opeer(nullptr), jpeer(nullptr), stack_begin(nullptr), stack_size(0), |