summaryrefslogtreecommitdiffstats
path: root/recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-07-18 17:10:51 -0700
committerKhem Raj <raj.khem@gmail.com>2016-07-18 17:10:51 -0700
commit07ce0df1231c985d73705f0ba9bae3ddf7125e46 (patch)
tree779b9300050eeaf000fcc34194a0c5a036ffa3ef /recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch
parent611e4470a389bf0e3ec1e9f96f065c35b49e9f3e (diff)
downloadmeta-clang-07ce0df1231c985d73705f0ba9bae3ddf7125e46.tar.gz
clang: Switch to release_39 branch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch')
-rw-r--r--recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch20
1 files changed, 10 insertions, 10 deletions
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 @@
1From a97e50970942df6bf0f3f2fda5ba44e10ef63713 Mon Sep 17 00:00:00 2001 1From 7d5006df84aeec510a07717310e17a35043e1f9e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 19 May 2016 23:22:52 -0700 3Date: Thu, 19 May 2016 23:22:52 -0700
4Subject: [PATCH] use constexpr when using glibc 4Subject: [PATCH] use constexpr when using glibc
@@ -16,33 +16,33 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 1 file changed, 8 insertions(+), 2 deletions(-) 16 1 file changed, 8 insertions(+), 2 deletions(-)
17 17
18diff --git a/include/__mutex_base b/include/__mutex_base 18diff --git a/include/__mutex_base b/include/__mutex_base
19index 32536a6..58430c7 100644 19index 38a76ac..0fb1e2f 100644
20--- a/include/__mutex_base 20--- a/include/__mutex_base
21+++ b/include/__mutex_base 21+++ b/include/__mutex_base
22@@ -39,7 +39,10 @@ class _LIBCPP_TYPE_VIS _LIBCPP_THREAD_SAFETY_ANNOTATION(capability("mutex")) mut 22@@ -43,7 +43,10 @@ class _LIBCPP_TYPE_VIS _LIBCPP_THREAD_SAFETY_ANNOTATION(capability("mutex")) mut
23 public: 23 public:
24 _LIBCPP_INLINE_VISIBILITY 24 _LIBCPP_INLINE_VISIBILITY
25 #ifndef _LIBCPP_HAS_NO_CONSTEXPR 25 #ifndef _LIBCPP_HAS_NO_CONSTEXPR
26- constexpr mutex() _NOEXCEPT : __m_(_LIBCPP_MUTEX_INITIALIZER) {} 26- constexpr mutex() _NOEXCEPT _LIBCPP_DEFAULT
27+#ifdef __GLIBC__ 27+#ifdef __GLIBC__
28+ constexpr 28+ constexpr
29+#endif 29+#endif
30+ mutex() _NOEXCEPT : __m_(_LIBCPP_MUTEX_INITIALIZER) {} 30+ mutex() _NOEXCEPT _LIBCPP_DEFAULT
31 #else 31 #else
32 mutex() _NOEXCEPT {__m_ = (__libcpp_mutex_t)_LIBCPP_MUTEX_INITIALIZER;} 32 mutex() _NOEXCEPT {__m_ = (__libcpp_mutex_t)_LIBCPP_MUTEX_INITIALIZER;}
33 #endif 33 #endif
34@@ -278,7 +281,10 @@ class _LIBCPP_TYPE_VIS condition_variable 34@@ -300,7 +303,10 @@ class _LIBCPP_TYPE_VIS condition_variable
35 public: 35 public:
36 _LIBCPP_INLINE_VISIBILITY 36 _LIBCPP_INLINE_VISIBILITY
37 #ifndef _LIBCPP_HAS_NO_CONSTEXPR 37 #ifndef _LIBCPP_HAS_NO_CONSTEXPR
38- constexpr condition_variable() : __cv_(_LIBCPP_CONDVAR_INITIALIZER) {} 38- constexpr condition_variable() _NOEXCEPT _LIBCPP_DEFAULT
39+#ifdef __GLIBC__ 39+#ifdef __GLIBC__
40+ constexpr 40+ constexpr
41+#endif 41+#endif
42+ condition_variable() : __cv_(_LIBCPP_CONDVAR_INITIALIZER) {} 42+ condition_variable() _NOEXCEPT _LIBCPP_DEFAULT
43 #else 43 #else
44 condition_variable() {__cv_ = (__libcpp_condvar_t)_LIBCPP_CONDVAR_INITIALIZER;} 44 condition_variable() _NOEXCEPT {__cv_ = (__libcpp_condvar_t)_LIBCPP_CONDVAR_INITIALIZER;}
45 #endif 45 #endif
46-- 46--
472.8.2 472.9.0
48 48