aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/lib/lshrdi3.S
diff options
context:
space:
mode:
authorStephen Warren2016-06-03 13:05:11 -0600
committerTom Rini2016-06-03 15:14:11 -0400
commitb2f1858455e99a91aeafe59ac73c6c047106d5e8 (patch)
tree5744d4812e427d526bb55290c49b1d27d82c8251 /arch/arm/lib/lshrdi3.S
parentedb697cfcc2dda02c5b2a34b3157b8fa8fc01264 (diff)
arm: lib: fix push/pop-section directives
With the existing code, function symbols are defined in .text, and the body is defined in .text.xxx. This causes (at least some version of) the linker not to emit the function body into the final binary, since it's part of a different section to the symbols being referenced. This of course causes a wide variety of failures. This change moves the push/pop-section directives before the function symbols, and after any relate ENDPROC macro invocations, so that symbols and bodies are all in the "pushed" sections, and thus the function bodies are emitted into the binary. This solves (at least) the boot problems currently seen on Tegra systems that use SPL (i.e. all ARMv7 Tegras). Fixes: 13b0a91a6d48 ("arm: lib: Split asm symbols into different .text subsections") Cc: Marek Vasut <marex@denx.de> Cc: Tom Warren <twarren@nvidia.com> Cc: Simon Glass <sjg@chromium.org> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/lib/lshrdi3.S')
-rw-r--r--arch/arm/lib/lshrdi3.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/lshrdi3.S b/arch/arm/lib/lshrdi3.S
index f710ccbf4f8..ead33e53c78 100644
--- a/arch/arm/lib/lshrdi3.S
+++ b/arch/arm/lib/lshrdi3.S
@@ -15,9 +15,9 @@
#define ah r1
#endif
+.pushsection .text.__lshldi3, "ax"
ENTRY(__lshrdi3)
ENTRY(__aeabi_llsr)
-.pushsection .text.__lshldi3, "ax"
subs r3, r2, #32
rsb ip, r2, #32
@@ -29,6 +29,6 @@ ENTRY(__aeabi_llsr)
mov ah, ah, lsr r2
ret lr
-.popsection
ENDPROC(__lshrdi3)
ENDPROC(__aeabi_llsr)
+.popsection