diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-10 13:38:08 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-10 13:38:08 -0500 |
| commit | cad04990715f7eaecd45196e84cf10e9e3248dae (patch) | |
| tree | 269c3c01ad2134c69d7a7d42585baac9f091a837 /arch/arm/lib/memcpy.S | |
| parent | 7ff15aca1a5bbfcf2dfbc18ec7b031c482851f69 (diff) | |
| parent | 5e68ff3949a3eebf62ba639171814f39c8e46a84 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/lib/memcpy.S')
| -rw-r--r-- | arch/arm/lib/memcpy.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index eeaf003529..7d9fc0f9be 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -13,7 +13,7 @@ #include <linux/linkage.h> #include <asm/assembler.h> -#ifdef CONFIG_SYS_THUMB_BUILD +#if defined(CONFIG_SYS_THUMB_BUILD) && !defined(MEMCPY_NO_THUMB_BUILD) #define W(instr) instr.w #else #define W(instr) instr @@ -62,7 +62,7 @@ /* Prototype: void *memcpy(void *dest, const void *src, size_t n); */ .syntax unified -#ifdef CONFIG_SYS_THUMB_BUILD +#if defined(CONFIG_SYS_THUMB_BUILD) && !defined(MEMCPY_NO_THUMB_BUILD) .thumb .thumb_func #endif |