diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 18:57:42 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 18:57:42 (GMT) |
| commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
| tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /arch/sh/lib/Makefile | |
| parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
| parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) | |
| download | linux-fsl-qoriq-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.xz | |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'arch/sh/lib/Makefile')
| -rw-r--r-- | arch/sh/lib/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile index a969b47..dab4d21 100644 --- a/arch/sh/lib/Makefile +++ b/arch/sh/lib/Makefile @@ -2,7 +2,7 @@ # Makefile for SuperH-specific library files.. # -lib-y = delay.o memset.o memmove.o memchr.o \ +lib-y = delay.o memmove.o memchr.o \ checksum.o strlen.o div64.o div64-generic.o # Extracted from libgcc @@ -23,8 +23,11 @@ obj-y += io.o memcpy-y := memcpy.o memcpy-$(CONFIG_CPU_SH4) := memcpy-sh4.o +memset-y := memset.o +memset-$(CONFIG_CPU_SH4) := memset-sh4.o + lib-$(CONFIG_MMU) += copy_page.o __clear_user.o lib-$(CONFIG_MCOUNT) += mcount.o -lib-y += $(memcpy-y) $(udivsi3-y) +lib-y += $(memcpy-y) $(memset-y) $(udivsi3-y) EXTRA_CFLAGS += -Werror |