diff options
| author | Martin Storsjo <martin@martin.st> | 2019-04-18 06:35:42 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2019-04-18 06:35:42 +0000 |
| commit | a88a020612cd781de68c5fd532318d13c45e25bc (patch) | |
| tree | 1da19066e6e3b10b227089a90c3de94f1296be22 /libunwind | |
| parent | eff3b6fe7f69abe7dc6b8a63fd5623cb89cdc501 (diff) | |
| download | llvm-a88a020612cd781de68c5fd532318d13c45e25bc.zip llvm-a88a020612cd781de68c5fd532318d13c45e25bc.tar.gz llvm-a88a020612cd781de68c5fd532318d13c45e25bc.tar.bz2 | |
Add support for ARMv7-M architecture which uses the Thumb 2 ISA (unified syntax)
Patch by Jérémie Faucher-Goulet!
Differential Revision: https://reviews.llvm.org/D60417
llvm-svn: 358642
Diffstat (limited to 'libunwind')
| -rw-r--r-- | libunwind/src/UnwindRegistersRestore.S | 3 | ||||
| -rw-r--r-- | libunwind/src/UnwindRegistersSave.S | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libunwind/src/UnwindRegistersRestore.S b/libunwind/src/UnwindRegistersRestore.S index bcb6add..573a48b 100644 --- a/libunwind/src/UnwindRegistersRestore.S +++ b/libunwind/src/UnwindRegistersRestore.S @@ -610,6 +610,9 @@ DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind15Registers_arm646jumptoEv) #elif defined(__arm__) && !defined(__APPLE__) #if !defined(__ARM_ARCH_ISA_ARM) +#if (__ARM_ARCH_ISA_THUMB == 2) + .syntax unified +#endif .thumb #endif diff --git a/libunwind/src/UnwindRegistersSave.S b/libunwind/src/UnwindRegistersSave.S index c2983e7..5edf97b 100644 --- a/libunwind/src/UnwindRegistersSave.S +++ b/libunwind/src/UnwindRegistersSave.S @@ -750,6 +750,9 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext) #elif defined(__arm__) && !defined(__APPLE__) #if !defined(__ARM_ARCH_ISA_ARM) +#if (__ARM_ARCH_ISA_THUMB == 2) + .syntax unified +#endif .thumb #endif |