diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-08 00:06:52 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-08 00:06:52 +0100 |
| commit | 189754f96136b0122d286d90de97026e9505fd74 (patch) | |
| tree | 9abfe101717edd79a14a687cc63d747f0b837e8f | |
| parent | cd4e0b15ae15226e9995df7eec2d8a340c55a482 (diff) | |
| parent | db4857c035a52a01f337a8ef6fe70ac08ad66ad5 (diff) | |
Merge branch 't/tls' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
include/errno.h
| -rw-r--r-- | include/errno.h | 2 | ||||
| -rw-r--r-- | mach/setup-thread.c | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/init-first.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/profil.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/setitimer.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/include/errno.h b/include/errno.h index 5b75ffc051..aae94de296 100644 --- a/include/errno.h +++ b/include/errno.h @@ -21,7 +21,7 @@ extern int rtld_errno attribute_hidden; # include <tls.h> -# if !(defined(__GNU__) && defined IS_IN_rtld) +# if !(defined __GNU__ && defined IS_IN_rtld) # undef errno # ifndef NOT_IN_libc # define errno __libc_errno diff --git a/mach/setup-thread.c b/mach/setup-thread.c index 198fd0fd3f..f4e3a28a41 100644 --- a/mach/setup-thread.c +++ b/mach/setup-thread.c @@ -93,11 +93,11 @@ __mach_setup_tls (thread_t thread) return error; assert (tssize == MACHINE_THREAD_STATE_COUNT); - tcb = _dl_allocate_tls(NULL); + tcb = _dl_allocate_tls (NULL); if (!tcb) return KERN_RESOURCE_SHORTAGE; - _hurd_tls_new(thread, &ts, tcb); + _hurd_tls_new (thread, &ts, tcb); error = __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR, (natural_t *) &ts, tssize); diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c index 731509d8fd..1a587dcc8d 100644 --- a/sysdeps/mach/hurd/i386/init-first.c +++ b/sysdeps/mach/hurd/i386/init-first.c @@ -194,7 +194,7 @@ init (int *data) /* We need to setup TLS before starting sigthread */ extern void __pthread_initialize_minimal(void); - __pthread_initialize_minimal(); + __pthread_initialize_minimal (); #endif diff --git a/sysdeps/mach/hurd/profil.c b/sysdeps/mach/hurd/profil.c index 0422867b98..dbedeb22a2 100644 --- a/sysdeps/mach/hurd/profil.c +++ b/sysdeps/mach/hurd/profil.c @@ -69,7 +69,7 @@ update_waiter (u_short *sample_buffer, size_t size, size_t offset, u_int scale) err = __mach_setup_thread (__mach_task_self (), profile_thread, &profile_waiter, NULL, NULL); if (! err) - err = __mach_setup_tls(profile_thread); + err = __mach_setup_tls (profile_thread); } else err = 0; diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c index f8235d977f..5294b46787 100644 --- a/sysdeps/mach/hurd/setitimer.c +++ b/sysdeps/mach/hurd/setitimer.c @@ -230,7 +230,7 @@ setitimer_locked (const struct itimerval *new, struct itimerval *old, &timer_thread, &_hurd_itimer_thread_stack_base, &_hurd_itimer_thread_stack_size)) - || (err = __mach_setup_tls(_hurd_itimer_thread))) + || (err = __mach_setup_tls (_hurd_itimer_thread))) { __thread_terminate (_hurd_itimer_thread); _hurd_itimer_thread = MACH_PORT_NULL; |