5 files changed, 35 insertions, 34 deletions

diff --git a/recipes-devtools/clang/compiler-rt/0001-support-a-new-embedded-linux-target.patch b/recipes-devtools/clang/compiler-rt/0001-support-a-new-embedded-linux-target.patch
index 45bd645..c844119 100644
--- a/recipes-devtools/clang/compiler-rt/0001-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 489a11bdd48c04983e5d042808b91c9f9844d403 Mon Sep 17 00:00:00 2001
+From 1a82e4a75ef6bf24597e886446ca06aa063a0c7f 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 1/4] support a new embedded linux target
+Subject: [PATCH 1/5] support a new embedded linux target
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
@@ -13,10 +13,10 @@ 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 420d1e237..0e4614100 100644
+index de87410db..0d5b56fe1 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) {
+@@ -58,8 +58,7 @@ void compilerrt_abort_impl(const char *file, int line, const char *function) {
  #else
  
  /* Get the system definition of abort() */
@@ -322,5 +322,5 @@ diff --git a/make/platform/clang_linux_embedded_test_input.c b/make/platform/cla
 new file mode 100644
 index 000000000..e69de29bb
 -- 
-2.13.0
+2.16.1
 
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
index 1a63a9b..ecb3fe7 100644
--- 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
@@ -1,7 +1,7 @@
-From 521311b98ffb4e912a6d863f134856d365eb9d36 Mon Sep 17 00:00:00 2001
+From 6bfcd697851219f35688299c32e7068fad50c6f5 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/4] Simplify cross-compilation. Don't use native-compiled
+Subject: [PATCH 2/5] 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, 9 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b522c340d..7f2e49d17 100644
+index 4b953b212..571aee7ea 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -35,7 +35,15 @@ set(COMPILER_RT_BAREMETAL_BUILD OFF CACHE BOOLEAN
+@@ -62,7 +62,15 @@ set(COMPILER_RT_BAREMETAL_BUILD OFF CACHE BOOLEAN
    "Build for a bare-metal target.")
  
  if (COMPILER_RT_STANDALONE_BUILD)
@@ -41,5 +41,5 @@ index b522c340d..7f2e49d17 100644
    # Find Python interpreter.
    set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5)
 -- 
-2.13.0
+2.16.1
 
diff --git a/recipes-devtools/clang/compiler-rt/0003-Disable-tsan-on-OE-glibc.patch b/recipes-devtools/clang/compiler-rt/0003-Disable-tsan-on-OE-glibc.patch
index dc2a999..e6c5f9e 100644
--- a/recipes-devtools/clang/compiler-rt/0003-Disable-tsan-on-OE-glibc.patch
+++ b/recipes-devtools/clang/compiler-rt/0003-Disable-tsan-on-OE-glibc.patch
@@ -1,7 +1,7 @@
-From 9390b3a6552d8f122e186797416904066df418be Mon Sep 17 00:00:00 2001
+From 2e8c6df7fe6e120063c3bdb87fb95e1326cf8434 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 3/4] Disable tsan on OE/glibc
+Subject: [PATCH 3/5] Disable tsan on OE/glibc
 
 It does not build see
 http://lists.llvm.org/pipermail/llvm-dev/2016-July/102235.html
@@ -13,30 +13,30 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
-index ae2a262a1..edc6dc63e 100644
+index 9e0c47748..227d661ae 100644
 --- a/cmake/config-ix.cmake
 +++ b/cmake/config-ix.cmake
-@@ -497,7 +497,7 @@ else()
+@@ -549,7 +549,7 @@ else()
  endif()
  
  if (COMPILER_RT_HAS_SANITIZER_COMMON AND TSAN_SUPPORTED_ARCH AND
--    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Android")
-+    OS_NAME MATCHES "Darwin|FreeBSD|Android")
+-    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Android|NetBSD")
++    OS_NAME MATCHES "Darwin|FreeBSD|Android|NetBSD")
    set(COMPILER_RT_HAS_TSAN TRUE)
  else()
    set(COMPILER_RT_HAS_TSAN FALSE)
 diff --git a/test/sanitizer_common/CMakeLists.txt b/test/sanitizer_common/CMakeLists.txt
-index 9b4070b0f..e76f2680c 100644
+index 8b210a08a..50b6f7166 100644
 --- a/test/sanitizer_common/CMakeLists.txt
 +++ b/test/sanitizer_common/CMakeLists.txt
-@@ -8,7 +8,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin|Linux|FreeBSD" AND NOT ANDROID)
+@@ -8,7 +8,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD")
    list(APPEND SUPPORTED_TOOLS asan)
  endif()
  if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT ANDROID)
 -  list(APPEND SUPPORTED_TOOLS tsan)
    list(APPEND SUPPORTED_TOOLS msan)
    list(APPEND SUPPORTED_TOOLS lsan)
- endif()
+   list(APPEND SUPPORTED_TOOLS ubsan)
 -- 
-2.13.0
+2.16.1
 
diff --git a/recipes-devtools/clang/compiler-rt/0004-cmake-mips-Do-not-specify-target-with-OE.patch b/recipes-devtools/clang/compiler-rt/0004-cmake-mips-Do-not-specify-target-with-OE.patch
index 0b2e14d..31daad0 100644
--- a/recipes-devtools/clang/compiler-rt/0004-cmake-mips-Do-not-specify-target-with-OE.patch
+++ b/recipes-devtools/clang/compiler-rt/0004-cmake-mips-Do-not-specify-target-with-OE.patch
@@ -1,7 +1,7 @@
-From 0be126894e872108eaa7eae3629a5564598ee25e Mon Sep 17 00:00:00 2001
+From 39e3271f270f75a4d65128f79be1dd3e455f5c85 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 11 Feb 2017 17:54:33 +0000
-Subject: [PATCH 4/4] cmake/mips: Do not specify --target with OE
+Subject: [PATCH 4/5] cmake/mips: Do not specify --target with OE
 
 OE already specifies cross compiler correctly, adding this additional
 --target confuses the clang driver and it resorts to invoke host assembler
@@ -20,10 +20,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake
-index 6f9f15139..7002a60ac 100644
+index b208f0852..2555b5e5b 100644
 --- a/cmake/base-config-ix.cmake
 +++ b/cmake/base-config-ix.cmake
-@@ -161,11 +161,11 @@ macro(test_targets)
+@@ -169,11 +169,11 @@ macro(test_targets)
        # clang's default CPU's. In the 64-bit case, we must also specify the ABI
        # since the default ABI differs between gcc and clang.
        # FIXME: Ideally, we would build the N32 library too.
@@ -40,5 +40,5 @@ index 6f9f15139..7002a60ac 100644
        if(WIN32)
          test_target_arch(arm "" "" "")
 -- 
-2.13.0
+2.16.1
 
diff --git a/recipes-devtools/clang/compiler-rt/0005-Pass-march-armv8.1-a-instead-of-mcrc.patch b/recipes-devtools/clang/compiler-rt/0005-Pass-march-armv8.1-a-instead-of-mcrc.patch
index e6628f5..b2e8e25 100644
--- a/recipes-devtools/clang/compiler-rt/0005-Pass-march-armv8.1-a-instead-of-mcrc.patch
+++ b/recipes-devtools/clang/compiler-rt/0005-Pass-march-armv8.1-a-instead-of-mcrc.patch
@@ -1,4 +1,4 @@
-From ce33b77707e708348311aea2a9b2401ed4685aa2 Mon Sep 17 00:00:00 2001
+From ef9b0bacf7a2fd097c241da674ed726c3dfb11d2 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 20 Jul 2017 12:14:03 -0700
 Subject: [PATCH 5/5] Pass -march=armv8.1-a instead of -mcrc
@@ -20,18 +20,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  lib/scudo/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: git/lib/scudo/CMakeLists.txt
-===================================================================
---- git.orig/lib/scudo/CMakeLists.txt
-+++ git/lib/scudo/CMakeLists.txt
-@@ -26,7 +26,9 @@ endif()
+diff --git a/lib/scudo/CMakeLists.txt b/lib/scudo/CMakeLists.txt
+index 4d26a3477..965174727 100644
+--- a/lib/scudo/CMakeLists.txt
++++ b/lib/scudo/CMakeLists.txt
+@@ -28,7 +28,7 @@ endif()
  # Enable the AArch64 CRC32 feature for scudo_crc32.cpp, if available.
  # Note that it is enabled by default starting with armv8.1-a.
  if (COMPILER_RT_HAS_MCRC_FLAG)
 -  set_source_files_properties(scudo_crc32.cpp PROPERTIES COMPILE_FLAGS -mcrc)
-+  if ("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64")
-+    set_source_files_properties(scudo_crc32.cpp PROPERTIES COMPILE_FLAGS -march=armv8.1-a)
-+  endif()
++  set_source_files_properties(scudo_crc32.cpp PROPERTIES COMPILE_FLAGS -march=armv8.1-a)
  endif()
  
  if(COMPILER_RT_HAS_SCUDO)
+-- 
+2.16.1
+