htl: Add support for C11 threads behavior

Essentially properly calling the thread function which returns an int
instead of a void*.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
Samuel Thibault 2020-01-13 20:05:08 +00:00
parent 95669bbf2c
commit 0c0361235c
3 changed files with 25 additions and 1 deletions

View file

@ -59,7 +59,17 @@ entry_point (struct __pthread *self, void *(*start_routine) (void *), void *arg)
__pthread_startup ();
__pthread_exit (start_routine (arg));
if (self->c11)
{
/* The function pointer of the c11 thread start is cast to an incorrect
type on __pthread_create call, however it is casted back to correct
one so the call behavior is well-defined (it is assumed that pointers
to void are able to represent all values of int). */
int (*start)(void*) = (int (*) (void*)) start_routine;
__pthread_exit ((void*) (uintptr_t) start (arg));
}
else
__pthread_exit (start_routine (arg));
}
/* Create a thread with attributes given by ATTR, executing
@ -99,6 +109,14 @@ __pthread_create_internal (struct __pthread **thread,
if (err)
goto failed;
if (attr == ATTR_C11_THREAD)
{
attr = NULL;
pthread->c11 = true;
}
else
pthread->c11 = false;
/* Use the default attributes if ATTR is NULL. */
setup = attr ? attr : &__pthread_default_attr;

View file

@ -100,6 +100,9 @@ struct __pthread
/* Resolver state. */
struct __res_state res_state;
/* Indicates whether is a C11 thread created by thrd_creat. */
bool c11;
/* Thread context. */
struct pthread_mcontext mcontext;

View file

@ -21,6 +21,9 @@
#include <pthread.h>
/* Attribute to indicate thread creation was issued from C11 thrd_create. */
#define ATTR_C11_THREAD ((void*)(uintptr_t)-1)
/* These represent the interface used by glibc itself. */
extern pthread_t __pthread_self (void);