maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix various GCC mis-configurations for newer versions. 

This patch goes through and enables C++11 and C++14 features for newer GCC's.
The main changes are:

1. Turn on variable templates. (Uses __cpp_variable_templates)
2. Assert atomic<Tp> is trivially copyable (Uses _GNUC_VER >= 501).
3. Turn on trailing return support for GCC. (Uses _GNUC_VER >= 404)
4. XFAIL void_t test for GCC 5.1 and 5.2. Fixed in GCC 6.

llvm-svn: 255585
This commit is contained in:
Eric Fiselier 2015-12-15 00:32:21 +00:00
parent a386358c36
commit 831c112954
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcxx/include/__config
View File

@ -472,7 +472,9 @@ namespace std {
#endif #endif
// GCC 5 will support variable templates // GCC 5 will support variable templates
#if !defined(__cpp_variable_templates) || __cpp_variable_templates < 201304L
#define _LIBCPP_HAS_NO_VARIABLE_TEMPLATES #define _LIBCPP_HAS_NO_VARIABLE_TEMPLATES
#endif
#define _NOEXCEPT throw() #define _NOEXCEPT throw()
#define _NOEXCEPT_(x) #define _NOEXCEPT_(x)
@ -494,7 +496,6 @@ namespace std {
#else // __GXX_EXPERIMENTAL_CXX0X__ #else // __GXX_EXPERIMENTAL_CXX0X__
#define _LIBCPP_HAS_NO_TRAILING_RETURN
#define _LIBCPP_HAS_NO_ALWAYS_INLINE_VARIADICS #define _LIBCPP_HAS_NO_ALWAYS_INLINE_VARIADICS
#if _GNUC_VER < 403 #if _GNUC_VER < 403
@ -508,6 +509,7 @@ namespace std {
#if _GNUC_VER < 404 #if _GNUC_VER < 404
#define _LIBCPP_HAS_NO_DECLTYPE #define _LIBCPP_HAS_NO_DECLTYPE
#define _LIBCPP_HAS_NO_DELETED_FUNCTIONS #define _LIBCPP_HAS_NO_DELETED_FUNCTIONS
#define _LIBCPP_HAS_NO_TRAILING_RETURN
#define _LIBCPP_HAS_NO_UNICODE_CHARS #define _LIBCPP_HAS_NO_UNICODE_CHARS
#define _LIBCPP_HAS_NO_VARIADICS #define _LIBCPP_HAS_NO_VARIADICS
#define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS #define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS

6
libcxx/include/atomic
View File

@ -552,6 +552,12 @@ typedef enum memory_order
namespace __gcc_atomic { namespace __gcc_atomic {
template <typename _Tp> template <typename _Tp>
struct __gcc_atomic_t { struct __gcc_atomic_t {
#if _GNUC_VER >= 501
static_assert(is_trivially_copyable<_Tp>::value,
"std::atomic<Tp> requires that 'Tp' be a trivially copyable type");
#endif
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS #ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
__gcc_atomic_t() _NOEXCEPT = default; __gcc_atomic_t() _NOEXCEPT = default;

6
libcxx/test/std/atomics/atomics.types.generic/trivially_copyable.fail.cpp
View File

@ -57,12 +57,12 @@ struct NotTriviallyCopyable {
NotTriviallyCopyable ( int i ) : i_(i) {} NotTriviallyCopyable ( int i ) : i_(i) {}
NotTriviallyCopyable ( const NotTriviallyCopyable &rhs) : i_(rhs.i_) {} NotTriviallyCopyable ( const NotTriviallyCopyable &rhs) : i_(rhs.i_) {}
int i_; int i_;
}; };
template <class T> template <class T, class >
void test ( T t ) { void test ( T t ) {
std::atomic<T> t0(t); std::atomic<T> t0(t);
} }
int main() int main()
{ {

9
libcxx/test/std/utilities/meta/meta.unary.prop.query/void_t.pass.cpp
View File

@ -11,11 +11,11 @@
// void_t // void_t
#include <type_traits> // UNSUPPORTED: c++98, c++03, c++11, c++14
#if _LIBCPP_STD_VER <= 14 // XFAIL: gcc-5.1 gcc-5.2
int main () {}
#else #include <type_traits>
template <class T> template <class T>
void test1() void test1()
@ -66,4 +66,3 @@ int main()
static_assert( std::is_same<void, std::void_t<int, double const &, Class, volatile int[], void>>::value, ""); static_assert( std::is_same<void, std::void_t<int, double const &, Class, volatile int[], void>>::value, "");
} }
#endif