clang: Switch to master (3.9) branch

Drop upstreamed patches

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

4 files changed, 21 insertions, 55 deletions

diff --git a/recipes-devtools/clang/compiler-rt/0001-3.9-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch b/recipes-devtools/clang/compiler-rt/0001-3.9-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch
deleted file mode 100644
index 1d02c4c..0000000
--- a/recipes-devtools/clang/compiler-rt/0001-3.9-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From eeb6437d951a5316a5d743578ccb284db9d57caa 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] 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-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
index d741b55..1a7b96b 100644
--- 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
@@ -1,7 +1,7 @@
-From 14f4f8e55b363037ae881084e4594934a869cf5d Mon Sep 17 00:00:00 2001
+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] Remove fatal check for explicit
+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
@@ -11,14 +11,14 @@ ignore the test, we are doing the right job from recipe
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- cmake/config-ix.cmake | 4 ----
+ cmake/Modules/CompilerRTUtils.cmake | 4 ----
  1 file changed, 4 deletions(-)
 
-diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
-index 264085e..299682d 100644
---- a/cmake/config-ix.cmake
-+++ b/cmake/config-ix.cmake
-@@ -128,10 +128,6 @@ macro(test_target_arch arch def)
+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})
@@ -28,7 +28,6 @@ index 264085e..299682d 100644
 -    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-support-a-new-embedded-linux-target.patch b/recipes-devtools/clang/compiler-rt/0002-support-a-new-embedded-linux-target.patch
index 2fbaf1c..12fc4e4 100644
--- a/recipes-devtools/clang/compiler-rt/0001-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 6e66e74ebe27ae6b5f072f857bab92a10c600d64 Mon Sep 17 00:00:00 2001
+From 7b7cdc3fcbec45f08b20600c8410c125edeb67ef 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] support a new embedded linux target
+Subject: [PATCH 2/3] support a new embedded linux target
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  create mode 100644 make/platform/clang_linux_embedded_test_input.c
 
 diff --git a/lib/builtins/int_util.c b/lib/builtins/int_util.c
-index 323e461..d8f775d 100644
+index 420d1e2..0e46141 100644
 --- a/lib/builtins/int_util.c
 +++ b/lib/builtins/int_util.c
 @@ -48,8 +48,7 @@ void compilerrt_abort_impl(const char *file, int line, const char *function) {
@@ -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.1.4
+2.8.2
 
diff --git a/recipes-devtools/clang/compiler-rt/0001-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 67b0e73..ffbe537 100644
--- a/recipes-devtools/clang/compiler-rt/0001-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 6ca47f1d7d4f9fd34baeba86af67108ac0eaeffe Mon Sep 17 00:00:00 2001
+From f8617c08ad6e38ccb4623a777cd8c9601af6e2ec Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 3 Apr 2016 07:40:06 +0000
-Subject: [PATCH] Simplify cross-compilation. Don't use native-compiled
+Date: Thu, 19 May 2016 23:11:45 -0700
+Subject: [PATCH 3/3] Simplify cross-compilation. Don't use native-compiled
  llvm-config.
 
     Note: AddLLVM.cmake does not expose the LLVM source directory.
@@ -20,13 +20,13 @@ 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 c60c246..6f989bf 100644
+index d8794b5..d5477cf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -85,32 +85,12 @@ else()
-   set(COMPILER_RT_TEST_COMPILER ${CMAKE_C_COMPILER} CACHE PATH "Compiler to use for testing")
-   set(COMPILER_RT_TEST_CXX_COMPILER ${CMAKE_CXX_COMPILER} CACHE PATH "C++ Compiler to use for testing")
+@@ -60,32 +60,12 @@ option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON)
+ mark_as_advanced(COMPILER_RT_BUILD_SANITIZERS)
  
+ if (COMPILER_RT_STANDALONE_BUILD)
 -  if (NOT LLVM_CONFIG_PATH)
 -    find_program(LLVM_CONFIG_PATH "llvm-config"
 -                 DOC "Path to llvm-config binary")
@@ -49,7 +49,7 @@ index c60c246..6f989bf 100644
 -
 -  # Make use of LLVM CMake modules.
 -  file(TO_CMAKE_PATH ${LLVM_BINARY_DIR} LLVM_BINARY_DIR_CMAKE_STYLE)
--  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR_CMAKE_STYLE}/share/llvm/cmake")
+-  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR_CMAKE_STYLE}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
 -  list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
 -  # Get some LLVM variables from LLVMConfig.
 -  include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake")
@@ -63,5 +63,5 @@ index c60c246..6f989bf 100644
    set(LLVM_LIBRARY_OUTPUT_INTDIR
      ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
 -- 
-1.9.1
+2.8.2