diff options
| author | 2015-08-04 15:16:33 +0000 | |
|---|---|---|
| committer | 2015-08-04 15:16:33 +0000 | |
| commit | 28a94765b4188faf51eb20d9a400273cf12136d0 (patch) | |
| tree | 23723443b0bf4b425631b2cb418d71cf6123f0af | |
| parent | fe092ab1e3cfc106216aa5518393a55786f9ab0b (diff) | |
| parent | e0d7cffe771bd0f4970051898b022d3f609fe28d (diff) | |
Merge "ART: Fix arm32 assembly for Clang"
| -rw-r--r-- | runtime/arch/arm/asm_support_arm.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/arch/arm/asm_support_arm.S b/runtime/arch/arm/asm_support_arm.S index 665d2a3306..44c7649dea 100644 --- a/runtime/arch/arm/asm_support_arm.S +++ b/runtime/arch/arm/asm_support_arm.S @@ -50,6 +50,11 @@ // generated at END. .macro DEF_ENTRY thumb_or_arm, name \thumb_or_arm +// Clang ignores .thumb_func and requires an explicit .thumb. Investigate whether we should still +// carry around the .thumb_func. + .ifc \thumb_or_arm, .thumb_func + .thumb + .endif .type \name, #function .hidden \name // Hide this as a global symbol, so we do not incur plt calls. .global \name |