Follow @Openwall on Twitter for new release announcements and other news
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Wed, 22 Jun 2016 15:34:05 -0400
From: Rich Felker <dalias@...c.org>
To: musl@...ts.openwall.com
Subject: Re: Issues when building libcxx libcxxabi with MUSL

On Wed, Jun 22, 2016 at 12:24:17PM -0700, Zhao, Weiming wrote:
> Hi,
> 
> I tried to build libcxx/libcxxabi using MUSL. Compiler is clang.
> 
> The build issues I got:
> 
> 1) In libcxx, it complains that some pthread structure is not
> completely initialized.
> 
> 2) Some types like max_align_t are already defined in clang's include.
> 
> 3) libcxx can't find it's own math.h
> 
> A patch is attached. Please review if the changes are correct.

These are all problems in libcxx, not musl, but since other people are
(I think) using it successfully they probably already have patches
which are just not upstream. Let's see if someone who has it working
can tell you how they did it.

> diff --git a/include/math.h b/include/math.h
> index 6ac91da..7c7e4aa 100644
> --- a/include/math.h
> +++ b/include/math.h
> @@ -427,4 +427,8 @@ long double pow10l(long double);
>  }
>  #endif
>  
> +#ifdef __cplusplus
> +#include_next <math.h>
> +#endif
> +

This is compiler-specific and certainly does not belong there.

>  #endif
> diff --git a/include/pthread.h b/include/pthread.h
> index af70b73..2995846 100644
> --- a/include/pthread.h
> +++ b/include/pthread.h
> @@ -55,7 +55,7 @@ extern "C" {
>  #define PTHREAD_PROCESS_SHARED 1
>  
>  
> -#define PTHREAD_MUTEX_INITIALIZER {{{0}}}
> +#define PTHREAD_MUTEX_INITIALIZER {{{0, 0, 0, 0, 0, 0 }}}

Presumably this is just a warning and not an error, and the compiler
should be suppressing the warning in macro expansion from a system
header.

Anyway I'd probably rather change these to something like:

#ifdef __cplusplus
#define PTHREAD_MUTEX_INITIALIZER {}
...
#else
#define PTHREAD_MUTEX_INITIALIZER {0}
...
#endif

if we make any changes.

>  #define PTHREAD_RWLOCK_INITIALIZER {{{0}}}
>  #define PTHREAD_COND_INITIALIZER {{{0}}}
>  #define PTHREAD_ONCE_INIT 0
> diff --git a/tools/mkalltypes.sed b/tools/mkalltypes.sed
> index fa15efc..f03f6a4 100644
> --- a/tools/mkalltypes.sed
> +++ b/tools/mkalltypes.sed
> @@ -1,6 +1,7 @@
> -/^TYPEDEF/s/TYPEDEF \(.*\) \([^ ]*\);$/#if defined(__NEED_\2) \&\& !defined(__DEFINED_\2)\
> +/^TYPEDEF/s/TYPEDEF \(.*\) \([^ ]*\);$/#if defined(__NEED_\2) \&\& !defined(__DEFINED_\2) \&\& !defined(__CLANG_\U\2\E_DEFINED)\
>  typedef \1 \2;\
>  #define __DEFINED_\2\
> +#define __CLANG_\U\2\E_DEFINED\
>  #endif\

This is a hack to workaround a problem somewhere else. You should not
be including any compiler-provided headers that define types covered
by the libc headers.

Rich

Powered by blists - more mailing lists

Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.