diff options
| author | dim <dim@FreeBSD.org> | 2016-02-06 13:39:20 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-02-06 13:39:20 +0000 |
| commit | 9c27ec33f2c82fe6c60c9c375a88f96a1e10a6a2 (patch) | |
| tree | 4efb8604227ede935238eb1c67b626da1265d459 /contrib/compiler-rt/lib/builtins/assembly.h | |
| parent | aef1771e36f9842a113b9905d0d5926fe9d694aa (diff) | |
| parent | 75958af7df18c2ae942829da1a8cf3b5bbcaeff6 (diff) | |
| download | FreeBSD-src-9c27ec33f2c82fe6c60c9c375a88f96a1e10a6a2.zip FreeBSD-src-9c27ec33f2c82fe6c60c9c375a88f96a1e10a6a2.tar.gz | |
Merge compiler-rt release_38 branch r258968.
Note that there is still a problem on amd64, causing SIGBUS in the early
startup of Address Sanitizer. This is being investigated.
Diffstat (limited to 'contrib/compiler-rt/lib/builtins/assembly.h')
| -rw-r--r-- | contrib/compiler-rt/lib/builtins/assembly.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/contrib/compiler-rt/lib/builtins/assembly.h b/contrib/compiler-rt/lib/builtins/assembly.h index 8bb0ddc..c289705 100644 --- a/contrib/compiler-rt/lib/builtins/assembly.h +++ b/contrib/compiler-rt/lib/builtins/assembly.h @@ -73,6 +73,15 @@ #define JMPc(r, c) mov##c pc, r #endif +// pop {pc} can't switch Thumb mode on ARMv4T +#if __ARM_ARCH >= 5 +#define POP_PC() pop {pc} +#else +#define POP_PC() \ + pop {ip}; \ + JMP(ip) +#endif + #if __ARM_ARCH_ISA_THUMB == 2 #define IT(cond) it cond #define ITT(cond) itt cond |
