1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
#! /bin/sh -e
# DP: Fix libstdc++ atomic ops for mips/mipsel
dir=
if [ $# -eq 3 -a "$2" = '-d' ]; then
pdir="-d $3"
dir="$3/"
elif [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch)
patch $pdir -f --no-backup-if-mismatch -p0 < $0
;;
-unpatch)
patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
esac
exit 0
--- libstdc++-v3/config/cpu/mips/atomicity.h.old 2003-06-02 20:04:54.000000000 +0200
+++ libstdc++-v3/config/cpu/mips/atomicity.h 2004-10-23 17:41:38.000000000 +0200
@@ -40,17 +40,19 @@ __exchange_and_add (volatile _Atomic_wor
__asm__ __volatile__
("/* Inline exchange & add */\n\t"
- "1:\n\t"
".set push\n\t"
".set mips2\n\t"
- "ll %0,%3\n\t"
- "addu %1,%4,%0\n\t"
- "sc %1,%2\n\t"
+ ".set noreorder\n\t"
+ ".set nomacro\n"
+ "1:\tll %0,(%2)\n\t"
+ "addu %1,%3,%0\n\t"
+ "sc %1,(%2)\n\t"
+ ".set reorder\n\t"
+ "beqzl %1,1b\n\t"
".set pop\n\t"
- "beqz %1,1b\n\t"
- "/* End exchange & add */"
- : "=&r"(__result), "=&r"(__tmp), "=m"(*__mem)
- : "m" (*__mem), "r"(__val)
+ "/* End exchange & add */\n"
+ : "=&r"(__result), "=&r"(__tmp), "+r"(__mem)
+ : "r"(__val)
: "memory");
return __result;
@@ -64,17 +66,19 @@ __atomic_add (volatile _Atomic_word *__m
__asm__ __volatile__
("/* Inline atomic add */\n\t"
- "1:\n\t"
".set push\n\t"
".set mips2\n\t"
- "ll %0,%2\n\t"
- "addu %0,%3,%0\n\t"
- "sc %0,%1\n\t"
+ ".set noreorder\n\t"
+ ".set nomacro\n"
+ "1:\tll %0,(%1)\n\t"
+ "addu %0,%2,%0\n\t"
+ "sc %0,(%1)\n\t"
+ ".set reorder\n\t"
+ "beqzl %0,1b\n\t"
".set pop\n\t"
- "beqz %0,1b\n\t"
- "/* End atomic add */"
- : "=&r"(__result), "=m"(*__mem)
- : "m" (*__mem), "r"(__val)
+ "/* End atomic add */\n"
+ : "=&r"(__result), "+r"(__mem)
+ : "r"(__val)
: "memory");
}
--
To UNSUBSCRIBE, email to debian-gcc-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
|
