projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
arch
/
arm
/
lib
/
memset.S
diff --git
a/arch/arm/lib/memset.S
b/arch/arm/lib/memset.S
index 7208f20dda4bc16b7a226a753ab5d4ad17e5eaec..df053a31d5b079a583f68a680fd95afe71afc3fd 100644
(file)
--- a/
arch/arm/lib/memset.S
+++ b/
arch/arm/lib/memset.S
@@
-16,7
+16,7
@@
.align 5
.syntax unified
-#if
def CONFIG_SYS_THUMB_BUILD
+#if
defined(CONFIG_SYS_THUMB_BUILD) && !defined(MEMSET_NO_THUMB_BUILD)
.thumb
.thumb_func
#endif