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-11-19 10:36:33 -0800
committerKhem Raj <raj.khem@gmail.com>2016-11-19 10:45:27 -0800
commit68e56391040b440b762059dc8d946b2ab705b8c0 (patch)
treebb5f3caa6ad1ee0d135e53f0d87c6e7f89872caf /recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch
parenta7017d50242c12291273fe99c66adbc7cb0d2000 (diff)
downloadmeta-clang-68e56391040b440b762059dc8d946b2ab705b8c0.tar.gz
clang: Update to latest
Forward port libcxx patches 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.patch14
1 files changed, 7 insertions, 7 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 9d2b327..be9cf0b 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 a5b8426cf21c3c303349a5be4d735123f514c435 Mon Sep 17 00:00:00 2001 1From 7d56f7fc304a4acf69c44b4c6f4ffb5e2af1fc0c 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,18 +16,18 @@ 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 38a76ac..0fb1e2f 100644 19index 59458ec..0a12e62 100644
20--- a/include/__mutex_base 20--- a/include/__mutex_base
21+++ b/include/__mutex_base 21+++ b/include/__mutex_base
22@@ -43,7 +43,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 _LIBCPP_DEFAULT 26- constexpr mutex() _NOEXCEPT = default;
27+#ifdef __GLIBC__ 27+#ifdef __GLIBC__
28+ constexpr 28+ constexpr
29+#endif 29+#endif
30+ mutex() _NOEXCEPT _LIBCPP_DEFAULT 30+ mutex() _NOEXCEPT = 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
@@ -35,14 +35,14 @@ index 38a76ac..0fb1e2f 100644
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() _NOEXCEPT _LIBCPP_DEFAULT 38- constexpr condition_variable() _NOEXCEPT = default;
39+#ifdef __GLIBC__ 39+#ifdef __GLIBC__
40+ constexpr 40+ constexpr
41+#endif 41+#endif
42+ condition_variable() _NOEXCEPT _LIBCPP_DEFAULT 42+ condition_variable() _NOEXCEPT = default;
43 #else 43 #else
44 condition_variable() _NOEXCEPT {__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.10.0 472.10.2
48 48