proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 08:08:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Adjust LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI Issue: https://github.com/llvm/llvm-project/issues/59240"

Browse Source 
This reverts commit 20ff92c982.
This commit is contained in:
Gianfranco Costamagna 2023-06-27 08:55:19 +02:00
parent a4319f3cdf
commit ef8fd0c0fb
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -282,10 +282,8 @@ llvm-toolchain-15 (1:15.0.7-5~exp1) experimental; urgency=medium
* Remove old code to manage Debian stretch * Remove old code to manage Debian stretch
* Force the replacement of new Ubuntu packages introduced in * Force the replacement of new Ubuntu packages introduced in
https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-15/+bug/2008755 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 <sylvestre@debian.org> Sun, 04 Jun 2023 11:35:54 +0200 --
llvm-toolchain-15 (1:15.0.7-4) unstable; urgency=medium llvm-toolchain-15 (1:15.0.7-4) unstable; urgency=medium

10
debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch vendored
View File

@ -16,7 +16,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx
#ifdef __USING_SJLJ_EXCEPTIONS__ #ifdef __USING_SJLJ_EXCEPTIONS__
_Unwind_SjLj_RaiseException(&exception_header->unwindHeader); _Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
-#else -#else
+#elif !_LIBCXXABI_ARM_EHABI +#elif !LIBCXXABI_ARM_EHABI
_Unwind_RaiseException(&exception_header->unwindHeader); _Unwind_RaiseException(&exception_header->unwindHeader);
+#else +#else
+ _Unwind_RaiseException(exception_header->unwindHeader); + _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 // to touch a foreign exception in any way, that is undefined
// behavior. They likely can't since the only way to catch // behavior. They likely can't since the only way to catch
// a foreign exception is with catch (...)! // a foreign exception is with catch (...)!
+#if !_LIBCXXABI_ARM_EHABI +#if !LIBCXXABI_ARM_EHABI
_Unwind_DeleteException(&globals->caughtExceptions->unwindHeader); _Unwind_DeleteException(&globals->caughtExceptions->unwindHeader);
+#else +#else
+ _Unwind_DeleteException(globals->caughtExceptions->unwindHeader); + _Unwind_DeleteException(globals->caughtExceptions->unwindHeader);
@ -47,7 +47,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx
#ifdef __USING_SJLJ_EXCEPTIONS__ #ifdef __USING_SJLJ_EXCEPTIONS__
_Unwind_SjLj_RaiseException(&exception_header->unwindHeader); _Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
-#else -#else
+#elif !_LIBCXXABI_ARM_EHABI +#elif !LIBCXXABI_ARM_EHABI
_Unwind_RaiseException(&exception_header->unwindHeader); _Unwind_RaiseException(&exception_header->unwindHeader);
+#else +#else
+ _Unwind_RaiseException(exception_header->unwindHeader); + _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; dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup;
#ifdef __USING_SJLJ_EXCEPTIONS__ #ifdef __USING_SJLJ_EXCEPTIONS__
_Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader); _Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader);
+#elif !_LIBCXXABI_ARM_EHABI +#elif !LIBCXXABI_ARM_EHABI
+ _Unwind_RaiseException(&dep_exception_header->unwindHeader); + _Unwind_RaiseException(&dep_exception_header->unwindHeader);
#else #else
- _Unwind_RaiseException(&dep_exception_header->unwindHeader); - _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 void __setExceptionClass ( _Unwind_Exception*, uint64_t);
_LIBCXXABI_HIDDEN bool __isOurExceptionClass(const _Unwind_Exception*); _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) +// GCC has _Unwind_Control_Block in unwind.h (unwind_arm_common.h)
+#if defined(__clang__) +#if defined(__clang__)
+struct _Unwind_Control_Block +struct _Unwind_Control_Block