aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/include/asm/string.h4
-rw-r--r--arch/powerpc/lib/ppc_ksyms.c4
-rw-r--r--arch/powerpc/lib/string.S41
3 files changed, 0 insertions, 49 deletions
diff --git a/arch/powerpc/include/asm/string.h b/arch/powerpc/include/asm/string.h
index e40010abcaf1..da3cdffca440 100644
--- a/arch/powerpc/include/asm/string.h
+++ b/arch/powerpc/include/asm/string.h
@@ -3,12 +3,8 @@
3 3
4#ifdef __KERNEL__ 4#ifdef __KERNEL__
5 5
6#define __HAVE_ARCH_STRCPY
7#define __HAVE_ARCH_STRNCPY 6#define __HAVE_ARCH_STRNCPY
8#define __HAVE_ARCH_STRLEN
9#define __HAVE_ARCH_STRCMP
10#define __HAVE_ARCH_STRNCMP 7#define __HAVE_ARCH_STRNCMP
11#define __HAVE_ARCH_STRCAT
12#define __HAVE_ARCH_MEMSET 8#define __HAVE_ARCH_MEMSET
13#define __HAVE_ARCH_MEMCPY 9#define __HAVE_ARCH_MEMCPY
14#define __HAVE_ARCH_MEMMOVE 10#define __HAVE_ARCH_MEMMOVE
diff --git a/arch/powerpc/lib/ppc_ksyms.c b/arch/powerpc/lib/ppc_ksyms.c
index c422812f7405..ae69d846a841 100644
--- a/arch/powerpc/lib/ppc_ksyms.c
+++ b/arch/powerpc/lib/ppc_ksyms.c
@@ -9,11 +9,7 @@ EXPORT_SYMBOL(memmove);
9EXPORT_SYMBOL(memcmp); 9EXPORT_SYMBOL(memcmp);
10EXPORT_SYMBOL(memchr); 10EXPORT_SYMBOL(memchr);
11 11
12EXPORT_SYMBOL(strcpy);
13EXPORT_SYMBOL(strncpy); 12EXPORT_SYMBOL(strncpy);
14EXPORT_SYMBOL(strcat);
15EXPORT_SYMBOL(strlen);
16EXPORT_SYMBOL(strcmp);
17EXPORT_SYMBOL(strncmp); 13EXPORT_SYMBOL(strncmp);
18 14
19#ifndef CONFIG_GENERIC_CSUM 15#ifndef CONFIG_GENERIC_CSUM
diff --git a/arch/powerpc/lib/string.S b/arch/powerpc/lib/string.S
index c80fb49ce607..a9470567df47 100644
--- a/arch/powerpc/lib/string.S
+++ b/arch/powerpc/lib/string.S
@@ -16,15 +16,6 @@
16 PPC_LONG_ALIGN 16 PPC_LONG_ALIGN
17 .text 17 .text
18 18
19_GLOBAL(strcpy)
20 addi r5,r3,-1
21 addi r4,r4,-1
221: lbzu r0,1(r4)
23 cmpwi 0,r0,0
24 stbu r0,1(r5)
25 bne 1b
26 blr
27
28/* This clears out any unused part of the destination buffer, 19/* This clears out any unused part of the destination buffer,
29 just as the libc version does. -- paulus */ 20 just as the libc version does. -- paulus */
30_GLOBAL(strncpy) 21_GLOBAL(strncpy)
@@ -45,30 +36,6 @@ _GLOBAL(strncpy)
45 bdnz 2b 36 bdnz 2b
46 blr 37 blr
47 38
48_GLOBAL(strcat)
49 addi r5,r3,-1
50 addi r4,r4,-1
511: lbzu r0,1(r5)
52 cmpwi 0,r0,0
53 bne 1b
54 addi r5,r5,-1
551: lbzu r0,1(r4)
56 cmpwi 0,r0,0
57 stbu r0,1(r5)
58 bne 1b
59 blr
60
61_GLOBAL(strcmp)
62 addi r5,r3,-1
63 addi r4,r4,-1
641: lbzu r3,1(r5)
65 cmpwi 1,r3,0
66 lbzu r0,1(r4)
67 subf. r3,r0,r3
68 beqlr 1
69 beq 1b
70 blr
71
72_GLOBAL(strncmp) 39_GLOBAL(strncmp)
73 PPC_LCMPI 0,r5,0 40 PPC_LCMPI 0,r5,0
74 beq- 2f 41 beq- 2f
@@ -85,14 +52,6 @@ _GLOBAL(strncmp)
852: li r3,0 522: li r3,0
86 blr 53 blr
87 54
88_GLOBAL(strlen)
89 addi r4,r3,-1
901: lbzu r0,1(r4)
91 cmpwi 0,r0,0
92 bne 1b
93 subf r3,r3,r4
94 blr
95
96#ifdef CONFIG_PPC32 55#ifdef CONFIG_PPC32
97_GLOBAL(memcmp) 56_GLOBAL(memcmp)
98 PPC_LCMPI 0,r5,0 57 PPC_LCMPI 0,r5,0