summaryrefslogtreecommitdiffstats
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
parent611e4470a389bf0e3ec1e9f96f065c35b49e9f3e (diff)
downloadmeta-clang-07ce0df1231c985d73705f0ba9bae3ddf7125e46.tar.gz
clang: Switch to release_39 branch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes-devtools/clang/clang.inc14
-rw-r--r--recipes-devtools/clang/libcxx/0001-use-constexpr-when-using-glibc.patch20
2 files changed, 17 insertions, 17 deletions
diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index e02b90c..fea6ba4 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -9,13 +9,13 @@ LLVM_GIT_PROTOCOL ?= "git"
9# 9#
10 10
11PV = "3.9.0" 11PV = "3.9.0"
12BRANCH = "master" 12BRANCH = "release_39"
13SRCREV_llvm = "c9ba7aa68b755a0b749345d740e6f3eae24e5a6c" 13SRCREV_llvm = "00d9b1b37f68373bb427369fee08814cda0692f7"
14SRCREV_clang = "56d5bb93dee4e1dcc29ee41fe2caf9ffed9094d2" 14SRCREV_clang = "760f716545a51d39ec3f54cb4c96bf55c022099f"
15SRCREV_compiler-rt = "72a44e79ce4b46c9b6a5eb588d0378e3dc0e631b" 15SRCREV_compiler-rt = "c10168c3b09f714b9da56abcce1b48104c20e1f9"
16SRCREV_cxxabi = "e8b3ec33ccb6f76caea7388317d5620b9c36de51" 16SRCREV_cxxabi = "82bb4c89734b6157de4a2fc2b9228be6529337a8"
17SRCREV_libcxx = "066feb82496556cbac51cb1d1d4f18329e37fec5" 17SRCREV_libcxx = "c2a735f1ff7a6680b10369e2b34324d1095a9732"
18SRCREV_libunwind = "878c40b2f240ee9f57be7dce86caf7650f79dc7f" 18SRCREV_libunwind = "ce3e76f9fcb0c33b4683bc1a01bb66d1c87b2356"
19 19
20LLVMMD5SUM = "43fdaa303c1c5589ad60f4ffc6a0b9ce" 20LLVMMD5SUM = "43fdaa303c1c5589ad60f4ffc6a0b9ce"
21CLANGMD5SUM = "a77eac638a3aae44a2d604217d6f0f01" 21CLANGMD5SUM = "a77eac638a3aae44a2d604217d6f0f01"
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