From ef8fd0c0fb77cc4821f3bc356d1a3cb7033e88d5 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 27 Jun 2023 08:55:19 +0200 Subject: [PATCH] Revert "Adjust LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI Issue: https://github.com/llvm/llvm-project/issues/59240" This reverts commit 20ff92c9829b28c34e434da22738a8420164c132. --- debian/changelog | 4 +--- debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 54817f05..fe75408d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -282,10 +282,8 @@ llvm-toolchain-15 (1:15.0.7-5~exp1) experimental; urgency=medium * Remove old code to manage Debian stretch * Force the replacement of new Ubuntu packages introduced in https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-15/+bug/2008755 - * Adjust LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI - Issue: https://github.com/llvm/llvm-project/issues/59240 - -- Sylvestre Ledru Sun, 04 Jun 2023 11:35:54 +0200 + -- llvm-toolchain-15 (1:15.0.7-4) unstable; urgency=medium diff --git a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch index 23351802..fa5d859c 100644 --- a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch +++ b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch @@ -16,7 +16,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); -#else -+#elif !_LIBCXXABI_ARM_EHABI ++#elif !LIBCXXABI_ARM_EHABI _Unwind_RaiseException(&exception_header->unwindHeader); +#else + _Unwind_RaiseException(exception_header->unwindHeader); @@ -34,7 +34,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx // to touch a foreign exception in any way, that is undefined // behavior. They likely can't since the only way to catch // a foreign exception is with catch (...)! -+#if !_LIBCXXABI_ARM_EHABI ++#if !LIBCXXABI_ARM_EHABI _Unwind_DeleteException(&globals->caughtExceptions->unwindHeader); +#else + _Unwind_DeleteException(globals->caughtExceptions->unwindHeader); @@ -47,7 +47,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); -#else -+#elif !_LIBCXXABI_ARM_EHABI ++#elif !LIBCXXABI_ARM_EHABI _Unwind_RaiseException(&exception_header->unwindHeader); +#else + _Unwind_RaiseException(exception_header->unwindHeader); @@ -58,7 +58,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup; #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader); -+#elif !_LIBCXXABI_ARM_EHABI ++#elif !LIBCXXABI_ARM_EHABI + _Unwind_RaiseException(&dep_exception_header->unwindHeader); #else - _Unwind_RaiseException(&dep_exception_header->unwindHeader); @@ -74,7 +74,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx _LIBCXXABI_HIDDEN void __setExceptionClass ( _Unwind_Exception*, uint64_t); _LIBCXXABI_HIDDEN bool __isOurExceptionClass(const _Unwind_Exception*); -+#if _LIBCXXABI_ARM_EHABI ++#if LIBCXXABI_ARM_EHABI +// GCC has _Unwind_Control_Block in unwind.h (unwind_arm_common.h) +#if defined(__clang__) +struct _Unwind_Control_Block