Cannot compile uClibc-ng with the Clang compiler...

[JonathanBelanger]

I've converted from make to CMake (it has better toolchain support - imho). I was trying to compile using clang, but there is at least one nested function in the Native pthread code, in particular allocatestack.c. It would be great to fix these as well, so that we can compile using other compilers.

[fallen]

Hello,
Can you propose a patch?
Can you also explain better the issue? (copy paste of compiling line with compiler arguments and error message)

[JonathanBelanger]

Here is the example from allocatestack.c (lines 777-886, the inline function is at line 800), in the following function (I removed some code so that this reply would not be too long):

/* In case of a fork() call the memory allocation in the child will be
   the same but only one thread is running.  All stacks except that of
   the one running thread are not used anymore.  We have to recycle
   them.  */
void
__reclaim_stacks (void)
{
  struct pthread *self = (struct pthread *) THREAD_SELF;
    .
    .
    .
  if (in_flight_stack != 0)
    {
      bool add_p = in_flight_stack & 1;
      list_t *elem = (list_t *)(uintptr_t)(in_flight_stack & ~UINTMAX_C (1));

      if (add_p)
	{
	  /* We always add at the beginning of the list.  So in this
	     case we only need to check the beginning of these lists.  */
	  int check_list (list_t *l)
	  {
	    if (l->next->prev != l)
	      {
		assert (l->next->prev == elem);

		elem->next = l->next;
		elem->prev = l;
		l->next = elem;

		return 1;
	      }

	    return 0;
	  }

	  if (check_list (&stack_used) == 0)
	    (void) check_list (&stack_cache);
	}
      else
	{
	  /* We can simply always replay the delete operation.  */
	  elem->next->prev = elem->prev;
	  elem->prev->next = elem->next;
	}
    }
    .
    .
    .
}

The function int check_list(...) should be define outside of __reclaim_stacks. I would suggest changing it as follows:

  /* We always add at the beginning of the list.  So in this
     case we only need to check the beginning of these lists.  */
static inline int __attribute__((always_inline))
check_list (list_t *l, list_t **elemPtr)
  {
   list_t elem = *elemPtr;

    if (l->next->prev != l)
      {
	assert (l->next->prev == elem);

	elem->next = l->next;
	elem->prev = l;
	l->next = elem;

	return 1;
      }

    return 0;
  }

/* In case of a fork() call the memory allocation in the child will be
   the same but only one thread is running.  All stacks except that of
   the one running thread are not used anymore.  We have to recycle
   them.  */
void
__reclaim_stacks (void)
{
  struct pthread *self = (struct pthread *) THREAD_SELF;
    .
    .
    .
  if (in_flight_stack != 0)
    {
      bool add_p = in_flight_stack & 1;
      list_t *elem = (list_t *)(uintptr_t)(in_flight_stack & ~UINTMAX_C (1));

      if (add_p)
	{
	  if (check_list (&stack_used, &elem) == 0)
	    (void) check_list (&stack_cache, &elem);
	}
      else
	{
	  /* We can simply always replay the delete operation.  */
	  elem->next->prev = elem->prev;
	  elem->prev->next = elem->next;
	}
    }
    .
    .
    .
}

[fallen]

I guess this kind of change would be accepted easily.
Can you send a patch to the list?

[JonathanBelanger]

Also, there is another thing that would need to be changed. For the generation of header files from .sym files, clang complains about names with @ in them. The script gen-as-const.awk, generates a stream with symbols with @@@name@@@, @@@value@@@, and @@@end@@@. Eventually @@@name@@@ becomes #define, a dollar-sign $ in the value gets removed and @@@end@@@ is removed.

gen-as-const.awk should be changed to generate it stream from:

__asm__("@@@name@@@<constant-name>@@@value@@@%0@@@end@@@" " "i" ((long) sizeof(<structure-name>)));

to:

__asm__("#define <constant-name> %0" " "i" ((long) sizeof(<structure-name>)));

The compiler will be used to generate lines that look like the following:

        #define <constant-name> $<constant-value>

The $ needs to be removed. There will also be other lines in the output from the compile (particularly with clang), but the need to go as well. This change will work for both gcc and clang.

Finally, the -no-nonnull-compare qualifier is no longer value. It should be changed to -no-nonnull. This problem never really shows up, except when another warning or error is reported.

I hope this helps and is what you asked.

[JonathanBelanger]

Here is the pat\ch:

diff --git a/libpthread/nptl/allocatestack.c b/libpthread/nptl/allocatestack.c
index 137979542..e7e0b4d8f 100644
--- a/libpthread/nptl/allocatestack.c
+++ b/libpthread/nptl/allocatestack.c
@@ -773,6 +773,25 @@ __make_stacks_executable (void **stack_endp)
   return err;
 }
 
+/* We always add at the beginning of the list.  So in this
+   case we only need to check the beginning of these lists.  */
+static inline int __attribute__((always_inline))
+check_list (list_t *l, list_t **elemPtr)
+{
+  list_t *elem = *elemPtr;
+  if (l->next->prev != l)
+    {
+      assert (l->next->prev == elem);
+
+      elem->next = l->next;
+      elem->prev = l;
+      l->next = elem;
+
+      return 1;
+    }
+
+  return 0;
+}
 
 /* In case of a fork() call the memory allocation in the child will be
    the same but only one thread is running.  All stacks except that of
@@ -794,26 +813,8 @@ __reclaim_stacks (void)
 
       if (add_p)
 	{
-	  /* We always add at the beginning of the list.  So in this
-	     case we only need to check the beginning of these lists.  */
-	  int check_list (list_t *l)
-	  {
-	    if (l->next->prev != l)
-	      {
-		assert (l->next->prev == elem);
-
-		elem->next = l->next;
-		elem->prev = l;
-		l->next = elem;
-
-		return 1;
-	      }
-
-	    return 0;
-	  }
-
-	  if (check_list (&stack_used) == 0)
-	    (void) check_list (&stack_cache);
+	  if (check_list (&stack_used, &elem) == 0)
+	    (void) check_list (&stack_cache, &elem);
 	}
       else
 	{

[JonathanBelanger]

I found a couple of other issues, with clang. For one, it does not like hints on jne ASM statements. For example:

jne,pt 10f

Clang complains about the ,pt. Since this is just a hint, it can be removed. The only place that has these is in the libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S, at lines 85 and 122.

[fallen]

Could you send the patch to the mailing list? devel@uclibc-ng.org
You can generate the patch using git format-patch and then send it using git send-email

According to the ",pt" hint, it seems this is not interpreted at all (nop) on post Pentium-4 CPU. So it seems useless and also increases binary size.
I guess removal of such hints could be a good idea.

[JonathanBelanger]

Will you be rolling it into this repository?

[fallen]

I don't have the commit bit on this repo.
Usual way to get something integrated here is to post a patch using git send-email to the mailing list.
The more the patch is explained in the commit message (why this is needed, what it fixes etc), the more chance it has to get integrated (quickly).

[JonathanBelanger]

sent

[fallen]

It seems your email never got through to the list, according to the archives: https://mailman.uclibc-ng.org/pipermail/devel/
Maybe you need to first sign up and then re-send it?