From 5a316712bd0e24e2e810e90b4d9916a35318e52b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 12 May 2018 23:14:17 -0700 Subject: compiler-rt: Drop a workaround to build for aarch64 This workaround seems to no longer be needed for clang6.0 onwards as a bonus, the regressions for compiling for other arches is also gone since we drop this patch. Fixes issue #57 Fixes issue #52 Use internal assembler This fixes the issue reported here https://reviews.llvm.org/D35696 Signed-off-by: Khem Raj --- ...0005-Pass-march-armv8.1-a-instead-of-mcrc.patch | 38 ---------------------- recipes-devtools/clang/compiler-rt_git.bb | 2 +- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 recipes-devtools/clang/compiler-rt/0005-Pass-march-armv8.1-a-instead-of-mcrc.patch 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 deleted file mode 100644 index b2e8e25..0000000 --- a/recipes-devtools/clang/compiler-rt/0005-Pass-march-armv8.1-a-instead-of-mcrc.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ef9b0bacf7a2fd097c241da674ed726c3dfb11d2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 20 Jul 2017 12:14:03 -0700 -Subject: [PATCH 5/5] Pass -march=armv8.1-a instead of -mcrc - -When we pass -mcrc it does not cause driver to -pass right options to assembler, especially when -using GNU assembler, is used this causes assembler -failures to recognise crc instructions since the -default -march option passed it armv8-a - -/tmp/scudo_crc32-9e9612.s:14: Error: selected processor does not support `crc32cx w0,w0,x1' - -Adding -march=armv8.1-a forces the driver to pass --march=armv8.1-a to assembler as well, which fixes -this issue - -Signed-off-by: Khem Raj ---- - 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 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) -+ set_source_files_properties(scudo_crc32.cpp PROPERTIES COMPILE_FLAGS -march=armv8.1-a) - endif() - - if(COMPILER_RT_HAS_SCUDO) --- -2.16.1 - diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index e7e5a55..7a63d99 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -20,7 +20,6 @@ SRC_URI = "\ file://0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch \ 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 \ " SRCREV_FORMAT = "compiler-rt" @@ -28,6 +27,7 @@ SRCREV_FORMAT = "compiler-rt" BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt" BASEDEPENDS_remove_toolchain-clang_class-target = "libcxx" TARGET_CXXFLAGS_remove_toolchain-clang = " -stdlib=libc++ " +TUNE_CCARGS_remove = "-no-integrated-as" DEPENDS += "ninja-native" -- cgit v1.2.3-54-g00ecf