diff options
| author | Gabe Black <gabeblack@google.com> | 2013-06-14 15:53:23 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-07-10 21:49:45 +0200 |
| commit | 001056f560dfec46aa98659f318819cce7098e5b (patch) | |
| tree | af939cc185e537070c151df96417a65fd89e5aed /payloads/libpayload/arch/armv7 | |
| parent | fbb11cf97937c345a42a45737fc7a95ee7ee3e7e (diff) | |
| download | coreboot-001056f560dfec46aa98659f318819cce7098e5b.tar.xz | |
ARM: Tell the linker memset and memcpy are functions.
The memset and memcpy functions are assembled as ARM code, likely because
that's the default of the assembler. Without special annotation, the assembler
and linker don't know that those symbols are functions which need special
handling so that ARM/thumb issues are handled properly. This change adds that
annotation which gets those functions working in Coreboot which is compiled as
thumb. Libpayload and depthcharge are compiled as ARM so they don't *need* the
annotation since it just works out in ARM mode, but it's the safe thing to do
in case we change that in the future.
We should explicitly select ARM vs. thumb when assembling assembly files to be
consistent across builds and toolchains.
Change-Id: I814b137064cf46ae9e2744ff6c223b695dc1ef01
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Reviewed-on: http://review.coreboot.org/3672
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'payloads/libpayload/arch/armv7')
| -rw-r--r-- | payloads/libpayload/arch/armv7/memcpy.S | 1 | ||||
| -rw-r--r-- | payloads/libpayload/arch/armv7/memset.S | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/payloads/libpayload/arch/armv7/memcpy.S b/payloads/libpayload/arch/armv7/memcpy.S index 549320c8d1..e68b28f542 100644 --- a/payloads/libpayload/arch/armv7/memcpy.S +++ b/payloads/libpayload/arch/armv7/memcpy.S @@ -57,6 +57,7 @@ /* Prototype: void *memcpy(void *dest, const void *src, size_t n); */ +.type memcpy, function .globl memcpy memcpy: diff --git a/payloads/libpayload/arch/armv7/memset.S b/payloads/libpayload/arch/armv7/memset.S index 4ff4c3ce93..aa4f57a993 100644 --- a/payloads/libpayload/arch/armv7/memset.S +++ b/payloads/libpayload/arch/armv7/memset.S @@ -27,6 +27,7 @@ * memset again. */ +.type memset, function .globl memset memset: ands r3, r0, #3 @ 1 unaligned? |