From 0c0361235ca7d4f5be0f88fe9b03afcf6a3cb8c6 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 13 Jan 2020 20:05:08 +0000
Subject: [PATCH] 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>
---
 htl/pt-create.c        | 20 +++++++++++++++++++-
 htl/pt-internal.h      |  3 +++
 sysdeps/htl/pthreadP.h |  3 +++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/htl/pt-create.c b/htl/pt-create.c
index 0b3237f46a..090d394f53 100644
--- a/htl/pt-create.c
+++ b/htl/pt-create.c
@@ -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;
 
diff --git a/htl/pt-internal.h b/htl/pt-internal.h
index 274223cfe1..9147b87740 100644
--- a/htl/pt-internal.h
+++ b/htl/pt-internal.h
@@ -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;
 
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index b1c7575f89..fc8c9bc591 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -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);