clang/llvm: Switch to 4.0.0 development version

3.9 is now branched for morty

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

6 files changed, 53 insertions, 259 deletions

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
deleted file mode 100644
index 604d1eb..0000000
--- a/recipes-devtools/clang/compiler-rt/0001-compiler-rt-Fix-target-architecture-matching.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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/0001-support-a-new-embedded-linux-target.patch
index 67c7678..111c556 100644
--- a/recipes-devtools/clang/compiler-rt/0002-support-a-new-embedded-linux-target.patch
+++ b/recipes-devtools/clang/compiler-rt/0001-support-a-new-embedded-linux-target.patch
@@ -1,7 +1,7 @@
-From 4bdc7871ab0a6134ee01c138e863476de9c08e25 Mon Sep 17 00:00:00 2001
+From 2d08c5752ce9d3170798d12d46827e85a6e8ef42 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/4] support a new embedded linux target
+Subject: [PATCH 1/3] 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.9.0
+2.10.0
 
diff --git a/recipes-devtools/clang/compiler-rt/0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch b/recipes-devtools/clang/compiler-rt/0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch
new file mode 100644
index 0000000..dbf3ea5
--- /dev/null
+++ b/recipes-devtools/clang/compiler-rt/0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch
@@ -0,0 +1,45 @@
+From dc8fde5074321b80d23419127d28ce90ac984c96 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 2/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 | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b1591e..7c6c0f4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,7 +42,15 @@ option(COMPILER_RT_BUILD_XRAY "Build xray" ON)
+ mark_as_advanced(COMPILER_RT_BUILD_XRAY)
+ 
+ if (COMPILER_RT_STANDALONE_BUILD)
+-  load_llvm_config()
++  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})
+ 
+   # Find Python interpreter.
+   set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5)
+-- 
+2.10.0
+
diff --git a/recipes-devtools/clang/compiler-rt/0004-Disable-tsan-on-OE-glibc.patch b/recipes-devtools/clang/compiler-rt/0003-Disable-tsan-on-OE-glibc.patch
index 8da7512..67e660d 100644
--- a/recipes-devtools/clang/compiler-rt/0004-Disable-tsan-on-OE-glibc.patch
+++ b/recipes-devtools/clang/compiler-rt/0003-Disable-tsan-on-OE-glibc.patch
@@ -1,7 +1,7 @@
-From baeeb27bb523b2bff96ab2fe2c5b38ecdd0570d0 Mon Sep 17 00:00:00 2001
+From 622ef6bbd65f71ebbaf3525d50fb357e62631a08 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
+Subject: [PATCH 3/3] Disable tsan on OE/glibc
 
 It does not build see
 http://lists.llvm.org/pipermail/llvm-dev/2016-July/102235.html
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
-index ddb0304..4241771 100644
+index cb9f74b..d7e0fba 100644
 --- a/cmake/config-ix.cmake
 +++ b/cmake/config-ix.cmake
-@@ -452,7 +452,7 @@ else()
+@@ -472,7 +472,7 @@ else()
  endif()
  
  if (COMPILER_RT_HAS_SANITIZER_COMMON AND TSAN_SUPPORTED_ARCH AND
@@ -25,5 +25,5 @@ index ddb0304..4241771 100644
  else()
    set(COMPILER_RT_HAS_TSAN FALSE)
 -- 
-2.9.0
+2.10.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
deleted file mode 100644
index 9354f66..0000000
--- a/recipes-devtools/clang/compiler-rt/0003-Simplify-cross-compilation.-Don-t-use-native-compile.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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/4] 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 a067581..ce904c0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,32 +39,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.9.0
-
diff --git a/recipes-devtools/clang/compiler-rt/0005-builtins-Specifiy-builtins-using-VFP-separately.patch b/recipes-devtools/clang/compiler-rt/0005-builtins-Specifiy-builtins-using-VFP-separately.patch
deleted file mode 100644
index 5e7a43b..0000000
--- a/recipes-devtools/clang/compiler-rt/0005-builtins-Specifiy-builtins-using-VFP-separately.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 59cffbd825a2f9c9c9b21d1314f7a2824e01a158 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 13 Aug 2016 00:33:15 +0000
-Subject: [PATCH] builtins: Specifiy builtins using VFP separately
-
-This helps in compiling compiler-rt for armv5
-using soft-float
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/builtins/CMakeLists.txt | 84 +++++++++++++++++++++++----------------------
- 1 file changed, 43 insertions(+), 41 deletions(-)
-
-diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
-index d5a1efe..d84bf96 100644
---- a/lib/builtins/CMakeLists.txt
-+++ b/lib/builtins/CMakeLists.txt
-@@ -257,8 +257,6 @@ else () # MSVC
- endif () # if (NOT MSVC)
- 
- set(arm_SOURCES
--  arm/adddf3vfp.S
--  arm/addsf3vfp.S
-   arm/aeabi_cdcmp.S
-   arm/aeabi_cdcmpeq_check_nan.c
-   arm/aeabi_cfcmp.S
-@@ -281,10 +279,44 @@ set(arm_SOURCES
-   arm/clzdi2.S
-   arm/clzsi2.S
-   arm/comparesf2.S
--  arm/divdf3vfp.S
-   arm/divmodsi4.S
--  arm/divsf3vfp.S
-   arm/divsi3.S
-+  arm/modsi3.S
-+  arm/switch16.S
-+  arm/switch32.S
-+  arm/switch8.S
-+  arm/switchu8.S
-+  arm/sync_fetch_and_add_4.S
-+  arm/sync_fetch_and_add_8.S
-+  arm/sync_fetch_and_and_4.S
-+  arm/sync_fetch_and_and_8.S
-+  arm/sync_fetch_and_max_4.S
-+  arm/sync_fetch_and_max_8.S
-+  arm/sync_fetch_and_min_4.S
-+  arm/sync_fetch_and_min_8.S
-+  arm/sync_fetch_and_nand_4.S
-+  arm/sync_fetch_and_nand_8.S
-+  arm/sync_fetch_and_or_4.S
-+  arm/sync_fetch_and_or_8.S
-+  arm/sync_fetch_and_sub_4.S
-+  arm/sync_fetch_and_sub_8.S
-+  arm/sync_fetch_and_umax_4.S
-+  arm/sync_fetch_and_umax_8.S
-+  arm/sync_fetch_and_umin_4.S
-+  arm/sync_fetch_and_umin_8.S
-+  arm/sync_fetch_and_xor_4.S
-+  arm/sync_fetch_and_xor_8.S
-+  arm/sync_synchronize.S
-+  arm/udivmodsi4.S
-+  arm/udivsi3.S
-+  arm/umodsi3.S
-+  ${GENERIC_SOURCES})
-+
-+set(armvfp_SOURCES
-+  arm/adddf3vfp.S
-+  arm/addsf3vfp.S
-+  arm/divdf3vfp.S
-+  arm/divsf3vfp.S
-   arm/eqdf2vfp.S
-   arm/eqsf2vfp.S
-   arm/extendsfdf2vfp.S
-@@ -304,7 +336,6 @@ set(arm_SOURCES
-   arm/lesf2vfp.S
-   arm/ltdf2vfp.S
-   arm/ltsf2vfp.S
--  arm/modsi3.S
-   arm/muldf3vfp.S
-   arm/mulsf3vfp.S
-   arm/nedf2vfp.S
-@@ -315,38 +346,9 @@ set(arm_SOURCES
-   arm/save_vfp_d8_d15_regs.S
-   arm/subdf3vfp.S
-   arm/subsf3vfp.S
--  arm/switch16.S
--  arm/switch32.S
--  arm/switch8.S
--  arm/switchu8.S
--  arm/sync_fetch_and_add_4.S
--  arm/sync_fetch_and_add_8.S
--  arm/sync_fetch_and_and_4.S
--  arm/sync_fetch_and_and_8.S
--  arm/sync_fetch_and_max_4.S
--  arm/sync_fetch_and_max_8.S
--  arm/sync_fetch_and_min_4.S
--  arm/sync_fetch_and_min_8.S
--  arm/sync_fetch_and_nand_4.S
--  arm/sync_fetch_and_nand_8.S
--  arm/sync_fetch_and_or_4.S
--  arm/sync_fetch_and_or_8.S
--  arm/sync_fetch_and_sub_4.S
--  arm/sync_fetch_and_sub_8.S
--  arm/sync_fetch_and_umax_4.S
--  arm/sync_fetch_and_umax_8.S
--  arm/sync_fetch_and_umin_4.S
--  arm/sync_fetch_and_umin_8.S
--  arm/sync_fetch_and_xor_4.S
--  arm/sync_fetch_and_xor_8.S
--  arm/sync_synchronize.S
-   arm/truncdfsf2vfp.S
--  arm/udivmodsi4.S
--  arm/udivsi3.S
--  arm/umodsi3.S
-   arm/unorddf2vfp.S
--  arm/unordsf2vfp.S
--  ${GENERIC_SOURCES})
-+  arm/unordsf2vfp.S)
- 
- set(aarch64_SOURCES
-   comparetf2.c
-@@ -367,16 +369,16 @@ set(aarch64_SOURCES
-   trunctfsf2.c
-   ${GENERIC_SOURCES})
- 
--set(armhf_SOURCES ${arm_SOURCES})
--set(armv7_SOURCES ${arm_SOURCES})
--set(armv7s_SOURCES ${arm_SOURCES})
--set(armv7k_SOURCES ${arm_SOURCES})
-+set(armhf_SOURCES ${arm_SOURCES} ${armvfp_SOURCES})
-+set(armv7_SOURCES ${arm_SOURCES} ${armvfp_SOURCES})
-+set(armv7s_SOURCES ${arm_SOURCES} ${armvfp_SOURCES})
-+set(armv7k_SOURCES ${arm_SOURCES} ${armvfp_SOURCES})
- set(arm64_SOURCES ${aarch64_SOURCES})
- 
- # macho_embedded archs
- set(armv6m_SOURCES ${GENERIC_SOURCES})
--set(armv7m_SOURCES ${arm_SOURCES})
--set(armv7em_SOURCES ${arm_SOURCES})
-+set(armv7m_SOURCES ${arm_SOURCES} ${armvfp_SOURCES})
-+set(armv7em_SOURCES ${arm_SOURCES} ${armvfp_SOURCES})
- 
- set(mips_SOURCES ${GENERIC_SOURCES})
- set(mipsel_SOURCES ${mips_SOURCES})
--- 
-1.9.1
-