diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-30 23:31:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-30 23:31:15 +0000 |
| commit | d6ac79300d2dc777b1df7345e68d5ad04e5e666c (patch) | |
| tree | ead635dee8fef370464d8ca155e833e7c2402a58 | |
| parent | 6a5dcd678645df1c1d1987fc7389347765b28f53 (diff) | |
| parent | 25c34e0feba2d0c49971016117a5af4fb8d32c1e (diff) | |
Merge "Reverse two pthread_internal_t fields"
| -rw-r--r-- | libc/bionic/pthread_internal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/bionic/pthread_internal.h b/libc/bionic/pthread_internal.h index 9d55ebaba..bd706d7cd 100644 --- a/libc/bionic/pthread_internal.h +++ b/libc/bionic/pthread_internal.h @@ -144,11 +144,12 @@ class pthread_internal_t { bionic_tls* bionic_tls; - pthread_key_data_t key_data[BIONIC_PTHREAD_KEY_COUNT]; - // The thread pointer (__get_tls()) points at this field. This field must come last so that // an executable's TLS segment can be allocated at a fixed offset after the thread pointer. void* tls[BIONIC_TLS_SLOTS]; + + // The golang runtime currently expects this field to come after the slots. + pthread_key_data_t key_data[BIONIC_PTHREAD_KEY_COUNT]; }; __LIBC_HIDDEN__ int __init_thread(pthread_internal_t* thread); |