clang: Update to latest on 3.9 branch

Forward port the patches as needed.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

7 files changed, 52 insertions, 48 deletions

diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index fea6ba4..de58441 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -10,12 +10,12 @@ LLVM_GIT_PROTOCOL ?= "git"
 
 PV = "3.9.0"
 BRANCH = "release_39"
-SRCREV_llvm = "00d9b1b37f68373bb427369fee08814cda0692f7"
-SRCREV_clang = "760f716545a51d39ec3f54cb4c96bf55c022099f"
-SRCREV_compiler-rt = "c10168c3b09f714b9da56abcce1b48104c20e1f9"
+SRCREV_llvm = "63485bd162ef11dcfbd313e10f2e45d6f2c0d58e"
+SRCREV_clang = "1ce520b4b2d9ff3f233e30c917d9e888abb49daf"
+SRCREV_compiler-rt = "95277fbc5a050588234bc4e2a52d7902e663e3b1"
 SRCREV_cxxabi = "82bb4c89734b6157de4a2fc2b9228be6529337a8"
-SRCREV_libcxx = "c2a735f1ff7a6680b10369e2b34324d1095a9732"
-SRCREV_libunwind = "ce3e76f9fcb0c33b4683bc1a01bb66d1c87b2356"
+SRCREV_libcxx = "95fa236b0059899e96b4092e66e776608c4e3c52"
+SRCREV_libunwind = "4194a6d954d2d6bfb225d22411cc3bc9932cc76f"
 
 LLVMMD5SUM = "43fdaa303c1c5589ad60f4ffc6a0b9ce"
 CLANGMD5SUM = "a77eac638a3aae44a2d604217d6f0f01"
diff --git a/recipes-devtools/clang/compiler-rt/0001-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch b/recipes-devtools/clang/compiler-rt/0001-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch
deleted file mode 100644
index 1a7b96b..0000000
--- a/recipes-devtools/clang/compiler-rt/0001-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b0de87ae88ff187820624d461fbb8fde84a90eb1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 10 May 2016 10:37:55 -0700
-Subject: [PATCH 1/3] Remove fatal check for explicit
- COMPILER_RT_DEFAULT_TARGET_ARCH
-
-In OE, we do not deduce float-abi via target triplet
-but via a CFLAGS option, and we do not have possibility
-to build both hf and sf in same toolchain, therefore lets
-ignore the test, we are doing the right job from recipe
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- cmake/Modules/CompilerRTUtils.cmake | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake
-index b4a2b48..086d9ba 100644
---- a/cmake/Modules/CompilerRTUtils.cmake
-+++ b/cmake/Modules/CompilerRTUtils.cmake
-@@ -125,9 +125,5 @@ macro(test_target_arch arch def)
-   endif()
-   if(${CAN_TARGET_${arch}})
-     list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
--  elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "${arch}" AND
--         COMPILER_RT_HAS_EXPLICIT_DEFAULT_TARGET_TRIPLE)
--    # Bail out if we cannot target the architecture we plan to test.
--    message(FATAL_ERROR "Cannot compile for ${arch}:\n${TARGET_${arch}_OUTPUT}")
-   endif()
- endmacro()
--- 
-2.8.2
-
diff --git a/recipes-devtools/clang/compiler-rt/0001-compiler-rt-Fix-target-architecture-matching.patch b/recipes-devtools/clang/compiler-rt/0001-compiler-rt-Fix-target-architecture-matching.patch
new file mode 100644
index 0000000..604d1eb
--- /dev/null
+++ b/recipes-devtools/clang/compiler-rt/0001-compiler-rt-Fix-target-architecture-matching.patch
@@ -0,0 +1,37 @@
+From 921549310c98ac7d594d1f290f053b8e2b3a32d0 Mon Sep 17 00:00:00 2001
+From: Francis Ricci <francisjricci@gmail.com>
+Date: Wed, 20 Jul 2016 18:06:31 +0000
+Subject: [PATCH 1/4] [compiler-rt] Fix target architecture matching
+
+Summary:
+Use stricter comparisons for architecture. This prevents cmake from failing
+for sysroots which can only compile armhf and not arm, since
+arm MATCHES armhf is true, while arm STREQUAL armhf is false.
+
+Reviewers: beanz, compnerd
+
+Subscribers: aemerson, llvm-commits
+
+Differential Revision: https://reviews.llvm.org/D22473
+
+git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@276148 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ cmake/Modules/CompilerRTUtils.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake
+index 78b6dce..5987cf5 100644
+--- a/cmake/Modules/CompilerRTUtils.cmake
++++ b/cmake/Modules/CompilerRTUtils.cmake
+@@ -126,7 +126,7 @@ macro(test_target_arch arch def)
+   endif()
+   if(${CAN_TARGET_${arch}})
+     list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
+-  elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "${arch}" AND
++  elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" STREQUAL "${arch}" AND
+          COMPILER_RT_HAS_EXPLICIT_DEFAULT_TARGET_TRIPLE)
+     # Bail out if we cannot target the architecture we plan to test.
+     message(FATAL_ERROR "Cannot compile for ${arch}:\n${TARGET_${arch}_OUTPUT}")
+-- 
+2.9.0
+
diff --git a/recipes-devtools/clang/compiler-rt/0002-support-a-new-embedded-linux-target.patch b/recipes-devtools/clang/compiler-rt/0002-support-a-new-embedded-linux-target.patch
index 12fc4e4..67c7678 100644
--- a/recipes-devtools/clang/compiler-rt/0002-support-a-new-embedded-linux-target.patch
+++ b/recipes-devtools/clang/compiler-rt/0002-support-a-new-embedded-linux-target.patch
@@ -1,7 +1,7 @@
-From 7b7cdc3fcbec45f08b20600c8410c125edeb67ef Mon Sep 17 00:00:00 2001
+From 4bdc7871ab0a6134ee01c138e863476de9c08e25 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 19 Apr 2015 15:16:23 -0700
-Subject: [PATCH 2/3] support a new embedded linux target
+Subject: [PATCH 2/4] support a new embedded linux target
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
@@ -322,5 +322,5 @@ diff --git a/make/platform/clang_linux_embedded_test_input.c b/make/platform/cla
 new file mode 100644
 index 0000000..e69de29
 -- 
-2.8.2
+2.9.0
 
diff --git a/recipes-devtools/clang/compiler-rt/0003-Simplify-cross-compilation.-Don-t-use-native-compile.patch b/recipes-devtools/clang/compiler-rt/0003-Simplify-cross-compilation.-Don-t-use-native-compile.patch
index ffbe537..9354f66 100644
--- a/recipes-devtools/clang/compiler-rt/0003-Simplify-cross-compilation.-Don-t-use-native-compile.patch
+++ b/recipes-devtools/clang/compiler-rt/0003-Simplify-cross-compilation.-Don-t-use-native-compile.patch
@@ -1,7 +1,7 @@
-From f8617c08ad6e38ccb4623a777cd8c9601af6e2ec Mon Sep 17 00:00:00 2001
+From 6676553c56ac1879d8d597351b457ba2e087168c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 19 May 2016 23:11:45 -0700
-Subject: [PATCH 3/3] Simplify cross-compilation. Don't use native-compiled
+Subject: [PATCH 3/4] Simplify cross-compilation. Don't use native-compiled
  llvm-config.
 
     Note: AddLLVM.cmake does not expose the LLVM source directory.
@@ -20,10 +20,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 6 insertions(+), 26 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d8794b5..d5477cf 100644
+index a067581..ce904c0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -60,32 +60,12 @@ option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON)
+@@ -39,32 +39,12 @@ option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON)
  mark_as_advanced(COMPILER_RT_BUILD_SANITIZERS)
  
  if (COMPILER_RT_STANDALONE_BUILD)
@@ -63,5 +63,5 @@ index d8794b5..d5477cf 100644
    set(LLVM_LIBRARY_OUTPUT_INTDIR
      ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
 -- 
-2.8.2
+2.9.0
 
diff --git a/recipes-devtools/clang/compiler-rt/0004-Disable-tsan-on-OE-glibc.patch b/recipes-devtools/clang/compiler-rt/0004-Disable-tsan-on-OE-glibc.patch
index 01c6caf..8da7512 100644
--- a/recipes-devtools/clang/compiler-rt/0004-Disable-tsan-on-OE-glibc.patch
+++ b/recipes-devtools/clang/compiler-rt/0004-Disable-tsan-on-OE-glibc.patch
@@ -1,4 +1,4 @@
-From a74650380d930a049aeee3c90c70141ad4178d0b Mon Sep 17 00:00:00 2001
+From baeeb27bb523b2bff96ab2fe2c5b38ecdd0570d0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 18 Jul 2016 08:05:02 +0000
 Subject: [PATCH 4/4] Disable tsan on OE/glibc
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index 6901473..d175c23 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -17,7 +17,7 @@ PV .= "+git${SRCPV}"
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=bf24bca27049b52e9738451aa55771d4; \
 "
 SRC_URI =  "${LLVM_GIT}/compiler-rt.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=compiler-rt \
-            file://0001-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch \
+            file://0001-compiler-rt-Fix-target-architecture-matching.patch \
             file://0002-support-a-new-embedded-linux-target.patch \
             file://0003-Simplify-cross-compilation.-Don-t-use-native-compile.patch \
             file://0004-Disable-tsan-on-OE-glibc.patch \