compiler-rt: Fix build on x86_64

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

3 files changed, 37 insertions, 9 deletions

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 9f1ef38..e6628f5 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
@@ -20,19 +20,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  lib/scudo/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/lib/scudo/CMakeLists.txt b/lib/scudo/CMakeLists.txt
-index 14c199fa8..857bdccd3 100644
---- a/lib/scudo/CMakeLists.txt
-+++ b/lib/scudo/CMakeLists.txt
-@@ -26,7 +26,7 @@ endif()
+Index: git/lib/scudo/CMakeLists.txt
+===================================================================
+--- git.orig/lib/scudo/CMakeLists.txt
++++ git/lib/scudo/CMakeLists.txt
+@@ -26,7 +26,9 @@ 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)
-+  set_source_files_properties(scudo_crc32.cpp PROPERTIES COMPILE_FLAGS -march=armv8.1-a)
++  if ("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64")
++    set_source_files_properties(scudo_crc32.cpp PROPERTIES COMPILE_FLAGS -march=armv8.1-a)
++  endif()
  endif()
  
  if(COMPILER_RT_HAS_SCUDO)
--- 
-2.13.3
-
diff --git a/recipes-devtools/clang/compiler-rt/0006-replace-struct-sigaltstack-with-stack_t.patch b/recipes-devtools/clang/compiler-rt/0006-replace-struct-sigaltstack-with-stack_t.patch
new file mode 100644
index 0000000..9135ee9
--- /dev/null
+++ b/recipes-devtools/clang/compiler-rt/0006-replace-struct-sigaltstack-with-stack_t.patch
@@ -0,0 +1,28 @@
+From 2bbd4dfe98ed1e5287b0a1ab0464e6b8bf344432 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 22 Jul 2017 10:00:12 -0700
+Subject: [PATCH] replace struct sigaltstack with stack_t
+
+glibc 2.26 has removed struct sigaltstack
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/esan/esan_sideline_linux.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/esan/esan_sideline_linux.cpp b/lib/esan/esan_sideline_linux.cpp
+index d04f5909d..bc272dfe4 100644
+--- a/lib/esan/esan_sideline_linux.cpp
++++ b/lib/esan/esan_sideline_linux.cpp
+@@ -70,7 +70,7 @@ int SidelineThread::runSideline(void *Arg) {
+ 
+   // Set up a signal handler on an alternate stack for safety.
+   InternalScopedBuffer<char> StackMap(SigAltStackSize);
+-  struct sigaltstack SigAltStack;
++  stack_t SigAltStack;
+   SigAltStack.ss_sp = StackMap.data();
+   SigAltStack.ss_size = SigAltStackSize;
+   SigAltStack.ss_flags = 0;
+-- 
+2.13.3
+
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index 3be2fe8..0cfe603 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -21,6 +21,7 @@ SRC_URI =  "\
     file://0003-Disable-tsan-on-OE-glibc.patch \
     file://0004-cmake-mips-Do-not-specify-target-with-OE.patch \
     file://0005-Pass-march-armv8.1-a-instead-of-mcrc.patch \
+    file://0006-replace-struct-sigaltstack-with-stack_t.patch \
 "
 
 SRCREV_FORMAT = "compiler-rt"