From bef9311982e38876497c731a1d6726efcdd4aca9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 24 Mar 2016 06:43:03 +0000 Subject: libcxxabi: Fix build on arm Signed-off-by: Khem Raj --- .../0001-Do-not-use-LIBCXXABI_ARM_EHABI.patch | 30 ++++++++++++++++++++++ recipes-devtools/clang/libcxxabi_git.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 recipes-devtools/clang/libcxxabi/0001-Do-not-use-LIBCXXABI_ARM_EHABI.patch diff --git a/recipes-devtools/clang/libcxxabi/0001-Do-not-use-LIBCXXABI_ARM_EHABI.patch b/recipes-devtools/clang/libcxxabi/0001-Do-not-use-LIBCXXABI_ARM_EHABI.patch new file mode 100644 index 0000000..0684d2c --- /dev/null +++ b/recipes-devtools/clang/libcxxabi/0001-Do-not-use-LIBCXXABI_ARM_EHABI.patch @@ -0,0 +1,30 @@ +From 141910ae8cee87307a89a9e43894000dcf47366e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 24 Mar 2016 06:31:35 +0000 +Subject: [PATCH] Do not use LIBCXXABI_ARM_EHABI + +Fixes errors like +libcxxabi/src/cxa_exception.cpp:258:21: error: unknown type name '_Unwind_Control_Block' + static_cast<_Unwind_Control_Block*>(unwind_exception)->barrier_cache.bitpattern[0]); + +Signed-off-by: Khem Raj +--- + include/__cxxabi_config.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/__cxxabi_config.h b/include/__cxxabi_config.h +index 68e325f..41fc953 100644 +--- a/include/__cxxabi_config.h ++++ b/include/__cxxabi_config.h +@@ -12,7 +12,7 @@ + + #if defined(__arm__) && !defined(__USING_SJLJ_EXCEPTIONS__) && \ + !defined(__ARM_DWARF_EH__) +-#define LIBCXXABI_ARM_EHABI 1 ++#define LIBCXXABI_ARM_EHABI 0 + #else + #define LIBCXXABI_ARM_EHABI 0 + #endif +-- +1.9.1 + diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb index 5f8243e..092e3e5 100644 --- a/recipes-devtools/clang/libcxxabi_git.bb +++ b/recipes-devtools/clang/libcxxabi_git.bb @@ -21,6 +21,7 @@ SRC_URI = "\ ${LLVM_GIT}/llvm.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=llvm \ ${LLVM_GIT}/libcxx.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libcxx;destsuffix=git/projects/libcxx \ ${LLVM_GIT}/libcxxabi.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libcxxabi;destsuffix=git/projects/libcxxabi \ + file://0001-Do-not-use-LIBCXXABI_ARM_EHABI.patch \ " SRCREV_FORMAT = "llvm_libcxx_libcxxabi" -- cgit v1.2.3-54-g00ecf