This is an archive of the discontinued LLVM Phabricator instance.

Differential D28478

Check for musl-libc's max_align_t in addition to other variants.
ClosedPublic

Authored by dlj on Jan 9 2017, 1:19 PM.

Details

Reviewers
mclow.lists
EricWF
Commits
rG4b2273622298: Check for musl-libc's max_align_t in addition to other variants.
rCXX294683: Check for musl-libc's max_align_t in addition to other variants.
rL294683: Check for musl-libc's max_align_t in addition to other variants.
Summary

Libcxx will define its own max_align_t when it is not available. However, the
availability checks today only check for Clang's definition and GCC's
definition. In particular, it does not check for musl's definition, which is the
same as GCC's but guarded with a different macro.

Diff Detail

Repository
rL LLVM

Event Timeline

dlj updated this revision to Diff 83681.Jan 9 2017, 1:19 PM
dlj retitled this revision from to Check for musl-libc's max_align_t in addition to other variants..
dlj updated this object.
dlj added a reviewer: mclow.lists.
dlj added a subscriber: cfe-commits.
dlj added a comment.Jan 20 2017, 12:19 PM

Ping?

chandlerc added a reviewer: EricWF.Feb 9 2017, 5:25 PM
chandlerc added a subscriber: chandlerc.

This seems good to me. Check with Eric to see if we try to test this any any specific way?

EricWF accepted this revision.Feb 9 2017, 5:29 PM

LGTM.

This revision is now accepted and ready to land.Feb 9 2017, 5:29 PM
EricWF added a comment.Feb 9 2017, 5:32 PM

IDK how to meaningly test this though.

dlj added a comment.Feb 9 2017, 5:36 PM
In D28478#672959, @EricWF wrote:

IDK how to meaningly test this though.

Heh. Well... I can tell you that with this change (and a couple of others), I'm able to bootstrap Clang (2-stage) using libc++ on Alpine Linux. It totally works, I promise! ;-)

Closed by commit rL294683: Check for musl-libc's max_align_t in addition to other variants. (authored by dlj). · Explain WhyFeb 9 2017, 5:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxx/
trunk/
include/
3 lines
3 lines

Diff 87925

libcxx/trunk/include/cstddef

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
#include_next <stddef.h> #include_next <stddef.h>
#include <__nullptr> #include <__nullptr>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
using ::ptrdiff_t; using ::ptrdiff_t;
using ::size_t; using ::size_t;
#if defined(__CLANG_MAX_ALIGN_T_DEFINED) || defined(_GCC_MAX_ALIGN_T) #if defined(__CLANG_MAX_ALIGN_T_DEFINED) || defined(_GCC_MAX_ALIGN_T) || \
defined(__DEFINED_max_align_t)
// Re-use the compiler's <stddef.h> max_align_t where possible. // Re-use the compiler's <stddef.h> max_align_t where possible.
using ::max_align_t; using ::max_align_t;
#else #else
typedef long double max_align_t; typedef long double max_align_t;
#endif #endif
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_CSTDDEF #endif // _LIBCPP_CSTDDEF

libcxx/trunk/include/stddef.h

Show First 20 Lines • Show All 47 Lines • ▼ Show 20 Lines
#ifdef __cplusplus #ifdef __cplusplus
extern "C++" { extern "C++" {
#include <__nullptr> #include <__nullptr>
using std::nullptr_t; using std::nullptr_t;
} }
// Re-use the compiler's <stddef.h> max_align_t where possible. // Re-use the compiler's <stddef.h> max_align_t where possible.
#if !defined(__CLANG_MAX_ALIGN_T_DEFINED) && !defined(_GCC_MAX_ALIGN_T) #if !defined(__CLANG_MAX_ALIGN_T_DEFINED) && !defined(_GCC_MAX_ALIGN_T) && \
!defined(__DEFINED_max_align_t)
typedef long double max_align_t; typedef long double max_align_t;
#endif #endif
#endif #endif
#endif // _LIBCPP_STDDEF_H #endif // _LIBCPP_STDDEF_H