]> git.ipfire.org Git - ipfire-2.x.git/blame - src/patches/glibc/glibc-rh694386.patch
lcdproc: Update to 0.5.7
[ipfire-2.x.git] / src / patches / glibc / glibc-rh694386.patch
CommitLineData
12788f63
MT
12011-03-28 Andreas Schwab <schwab@linux-m68k.org>
2
3 * sysdeps/powerpc/powerpc32/power4/strncmp.S: Don't read past
4 differing bytes.
5 * sysdeps/powerpc/powerpc64/power4/strncmp.S: Likewise.
6
7diff --git a/sysdeps/powerpc/powerpc32/power4/strncmp.S b/sysdeps/powerpc/powerpc32/power4/strncmp.S
8index fc0835e..f5d47af 100644
9--- a/sysdeps/powerpc/powerpc32/power4/strncmp.S
10+++ b/sysdeps/powerpc/powerpc32/power4/strncmp.S
11@@ -139,30 +139,31 @@ L(u1):
12 bdz L(u4)
13 cmpw rWORD1, rWORD2
14 beq- cr1, L(u4)
15+ bne- L(u4)
16 lbzu rWORD3, 1(rSTR1)
17 lbzu rWORD4, 1(rSTR2)
18- bne- L(u4)
19 cmpwi cr1, rWORD3, 0
20 bdz L(u3)
21 cmpw rWORD3, rWORD4
22 beq- cr1, L(u3)
23+ bne- L(u3)
24 lbzu rWORD1, 1(rSTR1)
25 lbzu rWORD2, 1(rSTR2)
26- bne- L(u3)
27 cmpwi cr1, rWORD1, 0
28 bdz L(u4)
29 cmpw rWORD1, rWORD2
30 beq- cr1, L(u4)
31+ bne- L(u4)
32 lbzu rWORD3, 1(rSTR1)
33 lbzu rWORD4, 1(rSTR2)
34- bne- L(u4)
35 cmpwi cr1, rWORD3, 0
36 bdz L(u3)
37 cmpw rWORD3, rWORD4
38 beq- cr1, L(u3)
39+ bne- L(u3)
40 lbzu rWORD1, 1(rSTR1)
41 lbzu rWORD2, 1(rSTR2)
42- beq+ L(u1)
43+ b L(u1)
44
45 L(u3): sub rRTN, rWORD3, rWORD4
46 blr
47diff --git a/sysdeps/powerpc/powerpc64/power4/strncmp.S b/sysdeps/powerpc/powerpc64/power4/strncmp.S
48index 7a1665d..94ae85b 100644
49--- a/sysdeps/powerpc/powerpc64/power4/strncmp.S
50+++ b/sysdeps/powerpc/powerpc64/power4/strncmp.S
51@@ -143,30 +143,31 @@ L(u1):
52 bdz L(u4)
53 cmpd rWORD1, rWORD2
54 beq- cr1, L(u4)
55+ bne- L(u4)
56 lbzu rWORD3, 1(rSTR1)
57 lbzu rWORD4, 1(rSTR2)
58- bne- L(u4)
59 cmpdi cr1, rWORD3, 0
60 bdz L(u3)
61 cmpd rWORD3, rWORD4
62 beq- cr1, L(u3)
63+ bne- L(u3)
64 lbzu rWORD1, 1(rSTR1)
65 lbzu rWORD2, 1(rSTR2)
66- bne- L(u3)
67 cmpdi cr1, rWORD1, 0
68 bdz L(u4)
69 cmpd rWORD1, rWORD2
70 beq- cr1, L(u4)
71+ bne- L(u4)
72 lbzu rWORD3, 1(rSTR1)
73 lbzu rWORD4, 1(rSTR2)
74- bne- L(u4)
75 cmpdi cr1, rWORD3, 0
76 bdz L(u3)
77 cmpd rWORD3, rWORD4
78 beq- cr1, L(u3)
79+ bne- L(u3)
80 lbzu rWORD1, 1(rSTR1)
81 lbzu rWORD2, 1(rSTR2)
82- beq+ L(u1)
83+ b L(u1)
84
85 L(u3): sub rRTN, rWORD3, rWORD4
86 blr