From 07ce0df1231c985d73705f0ba9bae3ddf7125e46 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 18 Jul 2016 17:10:51 -0700 Subject: clang: Switch to release_39 branch Signed-off-by: Khem Raj --- .../libcxx/0001-use-constexpr-when-using-glibc.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch') diff --git a/recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch b/recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch index e9eb4d2..c125c4a 100644 --- a/recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch +++ b/recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch @@ -1,4 +1,4 @@ -From a97e50970942df6bf0f3f2fda5ba44e10ef63713 Mon Sep 17 00:00:00 2001 +From 7d5006df84aeec510a07717310e17a35043e1f9e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 19 May 2016 23:22:52 -0700 Subject: [PATCH] use constexpr when using glibc @@ -16,33 +16,33 @@ Signed-off-by: Khem Raj 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/__mutex_base b/include/__mutex_base -index 32536a6..58430c7 100644 +index 38a76ac..0fb1e2f 100644 --- a/include/__mutex_base +++ b/include/__mutex_base -@@ -39,7 +39,10 @@ class _LIBCPP_TYPE_VIS _LIBCPP_THREAD_SAFETY_ANNOTATION(capability("mutex")) mut +@@ -43,7 +43,10 @@ class _LIBCPP_TYPE_VIS _LIBCPP_THREAD_SAFETY_ANNOTATION(capability("mutex")) mut public: _LIBCPP_INLINE_VISIBILITY #ifndef _LIBCPP_HAS_NO_CONSTEXPR -- constexpr mutex() _NOEXCEPT : __m_(_LIBCPP_MUTEX_INITIALIZER) {} +- constexpr mutex() _NOEXCEPT _LIBCPP_DEFAULT +#ifdef __GLIBC__ + constexpr +#endif -+ mutex() _NOEXCEPT : __m_(_LIBCPP_MUTEX_INITIALIZER) {} ++ mutex() _NOEXCEPT _LIBCPP_DEFAULT #else mutex() _NOEXCEPT {__m_ = (__libcpp_mutex_t)_LIBCPP_MUTEX_INITIALIZER;} #endif -@@ -278,7 +281,10 @@ class _LIBCPP_TYPE_VIS condition_variable +@@ -300,7 +303,10 @@ class _LIBCPP_TYPE_VIS condition_variable public: _LIBCPP_INLINE_VISIBILITY #ifndef _LIBCPP_HAS_NO_CONSTEXPR -- constexpr condition_variable() : __cv_(_LIBCPP_CONDVAR_INITIALIZER) {} +- constexpr condition_variable() _NOEXCEPT _LIBCPP_DEFAULT +#ifdef __GLIBC__ + constexpr +#endif -+ condition_variable() : __cv_(_LIBCPP_CONDVAR_INITIALIZER) {} ++ condition_variable() _NOEXCEPT _LIBCPP_DEFAULT #else - condition_variable() {__cv_ = (__libcpp_condvar_t)_LIBCPP_CONDVAR_INITIALIZER;} + condition_variable() _NOEXCEPT {__cv_ = (__libcpp_condvar_t)_LIBCPP_CONDVAR_INITIALIZER;} #endif -- -2.8.2 +2.9.0 -- cgit v1.2.3-54-g00ecf