projects / openwrt / openwrt.git / blob
? search:


46d1f5cd1875f8b807dd7b5b53b1476e7495d9a0
[openwrt/openwrt.git] / toolchain / uClibc / patches-0.9.33.2 / 610-mips64_syscall_fix.patch
1 commit e5cde2eb0ed7df9416fdd6070af07c8448c72a30
2 Author: Steve Ellcey <sellcey@mips.com>
3 Date: Wed Feb 12 11:01:35 2014 -0800
4
5 mips: Remove duplicate macro definitions
6
7 The INLINE_SYSCALL, INTERNAL_SYSCALL*, and internal_syscall* macros
8 are defined for MIPS in both libc/sysdeps/linux/mips/sysdep.h and
9 libc/sysdeps/linux/mips/bits/syscalls.h. The macros are the same
10 in both cases except that syscalls.h defines internal_syscalls[567]
11 the same for N32 and N64 ABIs and has a different definition for O32.
12 I believe that is correct. The sysdep.h header uses the O32 versions
13 for N32 and has different definitions for N64. I think that is wrong
14 and that N32 and N64 should share the same definition (modulo the
15 type 'long' vs. 'long long' for the arguments. This setup (from
16 sysdep.h) now agrees with what glibc has.
17
18 I am not positive about which header (sysdep.h vs syscalls.h) is
19 really the right one to have these definitions in but using sysdep.h
20 seems to work for all my builds.
21
22 Signed-off-by: Steve Ellcey <sellcey@mips.com>
23 Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
24
25 --- a/libc/sysdeps/linux/mips/sysdep.h
26 +++ b/libc/sysdeps/linux/mips/sysdep.h
27 @@ -133,258 +133,6 @@ L(syse1):
28
29 #else /* ! __ASSEMBLER__ */
30
31 -/* Define a macro which expands into the inline wrapper code for a system
32 - call. */
33 -#undef INLINE_SYSCALL
34 -#define INLINE_SYSCALL(name, nr, args...) \
35 - ({ INTERNAL_SYSCALL_DECL(err); \
36 - long result_var = INTERNAL_SYSCALL (name, err, nr, args); \
37 - if ( INTERNAL_SYSCALL_ERROR_P (result_var, err) ) \
38 - { \
39 - __set_errno (INTERNAL_SYSCALL_ERRNO (result_var, err)); \
40 - result_var = -1L; \
41 - } \
42 - result_var; })
43 -
44 -#undef INTERNAL_SYSCALL_DECL
45 -#define INTERNAL_SYSCALL_DECL(err) long err
46 -
47 -#undef INTERNAL_SYSCALL_ERROR_P
48 -#define INTERNAL_SYSCALL_ERROR_P(val, err) ((long) (err))
49 -
50 -#undef INTERNAL_SYSCALL_ERRNO
51 -#define INTERNAL_SYSCALL_ERRNO(val, err) (val)
52 -
53 -#undef INTERNAL_SYSCALL
54 -#define INTERNAL_SYSCALL(name, err, nr, args...) \
55 - internal_syscall##nr (, "li\t$2, %2\t\t\t# " #name "\n\t", \
56 - "i" (SYS_ify (name)), err, args)
57 -
58 -#undef INTERNAL_SYSCALL_NCS
59 -#define INTERNAL_SYSCALL_NCS(number, err, nr, args...) \
60 - internal_syscall##nr (= number, , "r" (__v0), err, args)
61 -#undef internal_syscall0
62 -#define internal_syscall0(ncs_init, cs_init, input, err, dummy...) \
63 -({ \
64 - long _sys_result; \
65 - \
66 - { \
67 - register long __v0 __asm__("$2") ncs_init; \
68 - register long __a3 __asm__("$7"); \
69 - __asm__ __volatile__ ( \
70 - ".set\tnoreorder\n\t" \
71 - cs_init \
72 - "syscall\n\t" \
73 - ".set reorder" \
74 - : "=r" (__v0), "=r" (__a3) \
75 - : input \
76 - : __SYSCALL_CLOBBERS); \
77 - err = __a3; \
78 - _sys_result = __v0; \
79 - } \
80 - _sys_result; \
81 -})
82 -
83 -#undef internal_syscall1
84 -#define internal_syscall1(ncs_init, cs_init, input, err, arg1) \
85 -({ \
86 - long _sys_result; \
87 - \
88 - { \
89 - register long __v0 __asm__("$2") ncs_init; \
90 - register long __a0 __asm__("$4") = (long) arg1; \
91 - register long __a3 __asm__("$7"); \
92 - __asm__ __volatile__ ( \
93 - ".set\tnoreorder\n\t" \
94 - cs_init \
95 - "syscall\n\t" \
96 - ".set reorder" \
97 - : "=r" (__v0), "=r" (__a3) \
98 - : input, "r" (__a0) \
99 - : __SYSCALL_CLOBBERS); \
100 - err = __a3; \
101 - _sys_result = __v0; \
102 - } \
103 - _sys_result; \
104 -})
105 -
106 -#undef internal_syscall2
107 -#define internal_syscall2(ncs_init, cs_init, input, err, arg1, arg2) \
108 -({ \
109 - long _sys_result; \
110 - \
111 - { \
112 - register long __v0 __asm__("$2") ncs_init; \
113 - register long __a0 __asm__("$4") = (long) arg1; \
114 - register long __a1 __asm__("$5") = (long) arg2; \
115 - register long __a3 __asm__("$7"); \
116 - __asm__ __volatile__ ( \
117 - ".set\tnoreorder\n\t" \
118 - cs_init \
119 - "syscall\n\t" \
120 - ".set\treorder" \
121 - : "=r" (__v0), "=r" (__a3) \
122 - : input, "r" (__a0), "r" (__a1) \
123 - : __SYSCALL_CLOBBERS); \
124 - err = __a3; \
125 - _sys_result = __v0; \
126 - } \
127 - _sys_result; \
128 -})
129 -
130 -#undef internal_syscall3
131 -#define internal_syscall3(ncs_init, cs_init, input, err, arg1, arg2, arg3)\
132 -({ \
133 - long _sys_result; \
134 - \
135 - { \
136 - register long __v0 __asm__("$2") ncs_init; \
137 - register long __a0 __asm__("$4") = (long) arg1; \
138 - register long __a1 __asm__("$5") = (long) arg2; \
139 - register long __a2 __asm__("$6") = (long) arg3; \
140 - register long __a3 __asm__("$7"); \
141 - __asm__ __volatile__ ( \
142 - ".set\tnoreorder\n\t" \
143 - cs_init \
144 - "syscall\n\t" \
145 - ".set\treorder" \
146 - : "=r" (__v0), "=r" (__a3) \
147 - : input, "r" (__a0), "r" (__a1), "r" (__a2) \
148 - : __SYSCALL_CLOBBERS); \
149 - err = __a3; \
150 - _sys_result = __v0; \
151 - } \
152 - _sys_result; \
153 -})
154 -
155 -#undef internal_syscall4
156 -#define internal_syscall4(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4)\
157 -({ \
158 - long _sys_result; \
159 - \
160 - { \
161 - register long __v0 __asm__("$2") ncs_init; \
162 - register long __a0 __asm__("$4") = (long) arg1; \
163 - register long __a1 __asm__("$5") = (long) arg2; \
164 - register long __a2 __asm__("$6") = (long) arg3; \
165 - register long __a3 __asm__("$7") = (long) arg4; \
166 - __asm__ __volatile__ ( \
167 - ".set\tnoreorder\n\t" \
168 - cs_init \
169 - "syscall\n\t" \
170 - ".set\treorder" \
171 - : "=r" (__v0), "+r" (__a3) \
172 - : input, "r" (__a0), "r" (__a1), "r" (__a2) \
173 - : __SYSCALL_CLOBBERS); \
174 - err = __a3; \
175 - _sys_result = __v0; \
176 - } \
177 - _sys_result; \
178 -})
179 -
180 -/* We need to use a frame pointer for the functions in which we
181 - adjust $sp around the syscall, or debug information and unwind
182 - information will be $sp relative and thus wrong during the syscall. As
183 - of GCC 3.4.3, this is sufficient. */
184 -#define FORCE_FRAME_POINTER alloca (4)
185 -
186 -#undef internal_syscall5
187 -#define internal_syscall5(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5)\
188 -({ \
189 - long _sys_result; \
190 - \
191 - FORCE_FRAME_POINTER; \
192 - { \
193 - register long __v0 __asm__("$2") ncs_init; \
194 - register long __a0 __asm__("$4") = (long) arg1; \
195 - register long __a1 __asm__("$5") = (long) arg2; \
196 - register long __a2 __asm__("$6") = (long) arg3; \
197 - register long __a3 __asm__("$7") = (long) arg4; \
198 - __asm__ __volatile__ ( \
199 - ".set\tnoreorder\n\t" \
200 - "subu\t$29, 32\n\t" \
201 - "sw\t%6, 16($29)\n\t" \
202 - cs_init \
203 - "syscall\n\t" \
204 - "addiu\t$29, 32\n\t" \
205 - ".set\treorder" \
206 - : "=r" (__v0), "+r" (__a3) \
207 - : input, "r" (__a0), "r" (__a1), "r" (__a2), \
208 - "r" ((long)arg5) \
209 - : __SYSCALL_CLOBBERS); \
210 - err = __a3; \
211 - _sys_result = __v0; \
212 - } \
213 - _sys_result; \
214 -})
215 -
216 -#undef internal_syscall6
217 -#define internal_syscall6(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5, arg6)\
218 -({ \
219 - long _sys_result; \
220 - \
221 - FORCE_FRAME_POINTER; \
222 - { \
223 - register long __v0 __asm__("$2") ncs_init; \
224 - register long __a0 __asm__("$4") = (long) arg1; \
225 - register long __a1 __asm__("$5") = (long) arg2; \
226 - register long __a2 __asm__("$6") = (long) arg3; \
227 - register long __a3 __asm__("$7") = (long) arg4; \
228 - __asm__ __volatile__ ( \
229 - ".set\tnoreorder\n\t" \
230 - "subu\t$29, 32\n\t" \
231 - "sw\t%6, 16($29)\n\t" \
232 - "sw\t%7, 20($29)\n\t" \
233 - cs_init \
234 - "syscall\n\t" \
235 - "addiu\t$29, 32\n\t" \
236 - ".set\treorder" \
237 - : "=r" (__v0), "+r" (__a3) \
238 - : input, "r" (__a0), "r" (__a1), "r" (__a2), \
239 - "r" ((long)arg5), "r" ((long)arg6) \
240 - : __SYSCALL_CLOBBERS); \
241 - err = __a3; \
242 - _sys_result = __v0; \
243 - } \
244 - _sys_result; \
245 -})
246 -
247 -#undef internal_syscall7
248 -#define internal_syscall7(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5, arg6, arg7)\
249 -({ \
250 - long _sys_result; \
251 - \
252 - FORCE_FRAME_POINTER; \
253 - { \
254 - register long __v0 __asm__("$2") ncs_init; \
255 - register long __a0 __asm__("$4") = (long) arg1; \
256 - register long __a1 __asm__("$5") = (long) arg2; \
257 - register long __a2 __asm__("$6") = (long) arg3; \
258 - register long __a3 __asm__("$7") = (long) arg4; \
259 - __asm__ __volatile__ ( \
260 - ".set\tnoreorder\n\t" \
261 - "subu\t$29, 32\n\t" \
262 - "sw\t%6, 16($29)\n\t" \
263 - "sw\t%7, 20($29)\n\t" \
264 - "sw\t%8, 24($29)\n\t" \
265 - cs_init \
266 - "syscall\n\t" \
267 - "addiu\t$29, 32\n\t" \
268 - ".set\treorder" \
269 - : "=r" (__v0), "+r" (__a3) \
270 - : input, "r" (__a0), "r" (__a1), "r" (__a2), \
271 - "r" ((long)arg5), "r" ((long)arg6), "r" ((long)arg7) \
272 - : __SYSCALL_CLOBBERS); \
273 - err = __a3; \
274 - _sys_result = __v0; \
275 - } \
276 - _sys_result; \
277 -})
278 -
279 -#undef __SYSCALL_CLOBBERS
280 -#define __SYSCALL_CLOBBERS "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", \
281 - "$14", "$15", "$24", "$25", "memory"
282 -
283 /* Pointer mangling is not yet supported for MIPS. */
284 #define PTR_MANGLE(var) (void) (var)
285 #define PTR_DEMANGLE(var) (void) (var)
OpenWrt Source Repository