clang: Switch to master (3.9) branch

Drop upstreamed patches

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

1 files changed, 67 insertions, 0 deletions

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
new file mode 100644
index 0000000..ffbe537
--- /dev/null
+++ b/recipes-devtools/clang/compiler-rt/0003-Simplify-cross-compilation.-Don-t-use-native-compile.patch
@@ -0,0 +1,67 @@
+From f8617c08ad6e38ccb4623a777cd8c9601af6e2ec 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
+ llvm-config.
+
+    Note: AddLLVM.cmake does not expose the LLVM source directory.
+    So if you want to run the test suite, you need to either:
+
+    1) set LLVM_MAIN_SRC_DIR explicitly (to find lit.py)
+    2) change AddLLVM.cmake to point to an installed 'lit'.
+    3) add_subdirectory(compiler-rt/test) from clang instead of compiler-rt.
+
+https://us.codeaurora.org/patches/quic/llvm/50683/compiler-rt-cross-compilation.patch
+
+Signed-off-by: Greg Fitzgerald <gregf@codeaurora.org>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 32 ++++++--------------------------
+ 1 file changed, 6 insertions(+), 26 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d8794b5..d5477cf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -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")
+-    if (NOT LLVM_CONFIG_PATH)
+-      message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH")
+-    endif()
+-  endif()
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_PATH} "--obj-root" "--bindir" "--libdir" "--src-root"
+-    RESULT_VARIABLE HAD_ERROR
+-    OUTPUT_VARIABLE CONFIG_OUTPUT)
+-  if (HAD_ERROR)
+-    message(FATAL_ERROR "llvm-config failed with status ${HAD_ERROR}")
+-  endif()
+-  string(REGEX REPLACE "[ \t]*[\r\n]+[ \t]*" ";" CONFIG_OUTPUT ${CONFIG_OUTPUT})
+-  list(GET CONFIG_OUTPUT 0 LLVM_BINARY_DIR)
+-  list(GET CONFIG_OUTPUT 1 LLVM_TOOLS_BINARY_DIR)
+-  list(GET CONFIG_OUTPUT 2 LLVM_LIBRARY_DIR)
+-  list(GET CONFIG_OUTPUT 3 LLVM_MAIN_SRC_DIR)
+-
+-  # 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}/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")
++  find_package(LLVM REQUIRED)
++  list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
++
++  # Variables that AddLLVM.cmake depends on (included by AddCompilerRT)
++  set(LLVM_TOOLS_BINARY_DIR "${LLVM_INSTALL_PREFIX}/bin")
++  set(LLVM_LIBRARY_DIR "${LLVM_INSTALL_PREFIX}/lib")
+ 
+   set(LLVM_LIBRARY_OUTPUT_INTDIR
+     ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
+-- 
+2.8.2
+