1 |
commit: f10cf38335db18e7129919c317468dffbb1317b3 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Sep 3 16:07:34 2016 +0000 |
4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 4 13:19:48 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f10cf383 |
7 |
|
8 |
dev-libs/libaio: remove unused patches |
9 |
|
10 |
dev-libs/libaio/files/libaio-0.3.106-build.patch | 17 --- |
11 |
.../libaio/files/libaio-0.3.107-ar-ranlib.patch | 17 --- |
12 |
.../libaio/files/libaio-0.3.107-generic-arch.patch | 101 -------------- |
13 |
.../files/libaio-0.3.107-install-to-slash.patch | 31 ----- |
14 |
dev-libs/libaio/files/libaio-0.3.107-sparc.patch | 151 --------------------- |
15 |
.../libaio/files/libaio-0.3.109-generic-arch.patch | 62 --------- |
16 |
.../files/libaio-0.3.109-unify-bits-endian.patch | 73 ---------- |
17 |
7 files changed, 452 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/libaio/files/libaio-0.3.106-build.patch b/dev-libs/libaio/files/libaio-0.3.106-build.patch |
20 |
deleted file mode 100644 |
21 |
index 812c2a4..00000000 |
22 |
--- a/dev-libs/libaio/files/libaio-0.3.106-build.patch |
23 |
+++ /dev/null |
24 |
@@ -1,17 +0,0 @@ |
25 |
---- src/Makefile.orig 2006-07-09 19:46:41.000000000 -0700 |
26 |
-+++ src/Makefile 2006-07-09 19:51:00.000000000 -0700 |
27 |
-@@ -2,11 +2,10 @@ |
28 |
- includedir=$(prefix)/include |
29 |
- libdir=$(prefix)/lib |
30 |
- |
31 |
--ARCH := $(shell uname -m | sed -e s/i.86/i386/) |
32 |
--CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC |
33 |
--SO_CFLAGS=-shared $(CFLAGS) |
34 |
-+CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC |
35 |
-+SO_CFLAGS=-shared $(CFLAGS) |
36 |
- L_CFLAGS=$(CFLAGS) |
37 |
--LINK_FLAGS= |
38 |
-+LINK_FLAGS=-lgcc -lrt $(LDFLAGS) |
39 |
- |
40 |
- soname=libaio.so.1 |
41 |
- minor=0 |
42 |
|
43 |
diff --git a/dev-libs/libaio/files/libaio-0.3.107-ar-ranlib.patch b/dev-libs/libaio/files/libaio-0.3.107-ar-ranlib.patch |
44 |
deleted file mode 100644 |
45 |
index d1ec140..00000000 |
46 |
--- a/dev-libs/libaio/files/libaio-0.3.107-ar-ranlib.patch |
47 |
+++ /dev/null |
48 |
@@ -1,17 +0,0 @@ |
49 |
---- a/src/Makefile |
50 |
-+++ b/src/Makefile |
51 |
-@@ -42,10 +42,12 @@ |
52 |
- $(CC) $(L_CFLAGS) -c -o $@ $< |
53 |
- |
54 |
- |
55 |
-+AR ?= ar |
56 |
-+RANLIB ?= ranlib |
57 |
- libaio.a: $(libaio_objs) |
58 |
- rm -f libaio.a |
59 |
-- ar r libaio.a $^ |
60 |
-- ranlib libaio.a |
61 |
-+ $(AR) r libaio.a $^ |
62 |
-+ $(RANLIB) libaio.a |
63 |
- |
64 |
- $(libname): $(libaio_sobjs) libaio.map |
65 |
- $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname,$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) |
66 |
|
67 |
diff --git a/dev-libs/libaio/files/libaio-0.3.107-generic-arch.patch b/dev-libs/libaio/files/libaio-0.3.107-generic-arch.patch |
68 |
deleted file mode 100644 |
69 |
index 6ecd7f1..00000000 |
70 |
--- a/dev-libs/libaio/files/libaio-0.3.107-generic-arch.patch |
71 |
+++ /dev/null |
72 |
@@ -1,101 +0,0 @@ |
73 |
-for arches that lack magic assembly (arm, blackfin, etc...), implement support |
74 |
-using standard syscall() function |
75 |
- |
76 |
---- src/libaio.h |
77 |
-+++ src/libaio.h |
78 |
-@@ -49,38 +49,34 @@ typedef enum io_iocb_cmd { |
79 |
- IO_CMD_PWRITEV = 8, |
80 |
- } io_iocb_cmd_t; |
81 |
- |
82 |
--#if defined(__i386__) /* little endian, 32 bits */ |
83 |
-+/* little endian, 32 bits */ |
84 |
-+#if defined(__i386__) || defined(__sh__) || defined(__bfin__) || \ |
85 |
-+ defined(__ARMEL__) || defined(__MIPSEL__) || defined(__cris__) |
86 |
- #define PADDED(x, y) x; unsigned y |
87 |
- #define PADDEDptr(x, y) x; unsigned y |
88 |
- #define PADDEDul(x, y) unsigned long x; unsigned y |
89 |
-+ |
90 |
-+/* little endian, 64 bits */ |
91 |
- #elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) |
92 |
- #define PADDED(x, y) x, y |
93 |
- #define PADDEDptr(x, y) x |
94 |
- #define PADDEDul(x, y) unsigned long x |
95 |
--#elif defined(__powerpc64__) /* big endian, 64 bits */ |
96 |
-+ |
97 |
-+/* big endian, 64 bits */ |
98 |
-+#elif defined(__powerpc64__) || defined(__s390x__) || \ |
99 |
-+ (defined(__sparc__) && defined(__arch64__)) |
100 |
- #define PADDED(x, y) unsigned y; x |
101 |
- #define PADDEDptr(x,y) x |
102 |
- #define PADDEDul(x, y) unsigned long x |
103 |
--#elif defined(__PPC__) /* big endian, 32 bits */ |
104 |
-+ |
105 |
-+/* big endian, 32 bits */ |
106 |
-+#elif defined(__PPC__) || defined(__s390__) || defined(__ARMEB__) || \ |
107 |
-+ defined(__MIPSEB__) || defined(__sparc__) || defined(__m68k__) || \ |
108 |
-+ defined(__hppa__) || defined(__frv__) || defined(__avr32__) |
109 |
- #define PADDED(x, y) unsigned y; x |
110 |
- #define PADDEDptr(x, y) unsigned y; x |
111 |
- #define PADDEDul(x, y) unsigned y; unsigned long x |
112 |
--#elif defined(__s390x__) /* big endian, 64 bits */ |
113 |
--#define PADDED(x, y) unsigned y; x |
114 |
--#define PADDEDptr(x,y) x |
115 |
--#define PADDEDul(x, y) unsigned long x |
116 |
--#elif defined(__s390__) /* big endian, 32 bits */ |
117 |
--#define PADDED(x, y) unsigned y; x |
118 |
--#define PADDEDptr(x, y) unsigned y; x |
119 |
--#define PADDEDul(x, y) unsigned y; unsigned long x |
120 |
--#elif defined(__sparc__) && defined(__arch64__) /* big endian, 64 bits */ |
121 |
--#define PADDED(x, y) unsigned y; x |
122 |
--#define PADDEDptr(x,y) x |
123 |
--#define PADDEDul(x, y) unsigned long x |
124 |
--#elif defined(__sparc__) /* big endian, 32 bits */ |
125 |
--#define PADDED(x, y) unsigned y; x |
126 |
--#define PADDEDptr(x, y) unsigned y; x |
127 |
--#define PADDEDul(x, y) unsigned y; unsigned long x |
128 |
-+ |
129 |
- #else |
130 |
- #error endian? |
131 |
- #endif |
132 |
---- /dev/null |
133 |
-+++ src/syscall-generic.h |
134 |
-@@ -0,0 +1,29 @@ |
135 |
-+#include <errno.h> |
136 |
-+#include <unistd.h> |
137 |
-+#include <sys/syscall.h> |
138 |
-+ |
139 |
-+#define _body_io_syscall(sname, args...) \ |
140 |
-+{ \ |
141 |
-+ int ret = syscall(__NR_##sname, ## args); \ |
142 |
-+ return ret < 0 ? -errno : ret; \ |
143 |
-+} |
144 |
-+ |
145 |
-+#define io_syscall1(type,fname,sname,type1,arg1) \ |
146 |
-+type fname(type1 arg1) \ |
147 |
-+_body_io_syscall(sname, (long)arg1) |
148 |
-+ |
149 |
-+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ |
150 |
-+type fname(type1 arg1,type2 arg2) \ |
151 |
-+_body_io_syscall(sname, (long)arg1, (long)arg2) |
152 |
-+ |
153 |
-+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ |
154 |
-+type fname(type1 arg1,type2 arg2,type3 arg3) \ |
155 |
-+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3) |
156 |
-+ |
157 |
-+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ |
158 |
-+type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ |
159 |
-+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4) |
160 |
-+ |
161 |
-+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, type5,arg5) \ |
162 |
-+type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ |
163 |
-+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4, (long)arg5) |
164 |
---- src/syscall.h |
165 |
-+++ src/syscall.h |
166 |
-@@ -25,5 +25,6 @@ |
167 |
- #elif defined(__sparc__) |
168 |
- #include "syscall-sparc.h" |
169 |
- #else |
170 |
--#error "add syscall-arch.h" |
171 |
-+#warning "using generic syscall method" |
172 |
-+#include "syscall-generic.h" |
173 |
- #endif |
174 |
|
175 |
diff --git a/dev-libs/libaio/files/libaio-0.3.107-install-to-slash.patch b/dev-libs/libaio/files/libaio-0.3.107-install-to-slash.patch |
176 |
deleted file mode 100644 |
177 |
index c472736..00000000 |
178 |
--- a/dev-libs/libaio/files/libaio-0.3.107-install-to-slash.patch |
179 |
+++ /dev/null |
180 |
@@ -1,31 +0,0 @@ |
181 |
-based on fedora ptach |
182 |
- |
183 |
---- libaio-0.3.107/src/Makefile |
184 |
-+++ libaio-0.3.107/src/Makefile |
185 |
-@@ -1,6 +1,7 @@ |
186 |
- prefix=/usr |
187 |
--includedir=$(prefix)/include |
188 |
--libdir=$(prefix)/lib |
189 |
-+includedir=/usr/include |
190 |
-+libdir=/usr/lib |
191 |
-+usrlibdir=$(libdir) |
192 |
- |
193 |
- ARCH := $(shell uname -m | sed -e s/i.86/i386/) |
194 |
- CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC |
195 |
-@@ -51,11 +52,11 @@ |
196 |
- $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) |
197 |
- |
198 |
- install: $(all_targets) |
199 |
-- install -D -m 644 libaio.h $(includedir)/libaio.h |
200 |
-- install -D -m 644 libaio.a $(libdir)/libaio.a |
201 |
-- install -D -m 755 $(libname) $(libdir)/$(libname) |
202 |
-- ln -sf $(libname) $(libdir)/$(soname) |
203 |
-- ln -sf $(libname) $(libdir)/libaio.so |
204 |
-+ install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h |
205 |
-+ install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a |
206 |
-+ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname) |
207 |
-+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/$(soname) |
208 |
-+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/libaio.so |
209 |
- |
210 |
- $(libaio_objs): libaio.h |
211 |
- |
212 |
|
213 |
diff --git a/dev-libs/libaio/files/libaio-0.3.107-sparc.patch b/dev-libs/libaio/files/libaio-0.3.107-sparc.patch |
214 |
deleted file mode 100644 |
215 |
index 92bcd53..00000000 |
216 |
--- a/dev-libs/libaio/files/libaio-0.3.107-sparc.patch |
217 |
+++ /dev/null |
218 |
@@ -1,151 +0,0 @@ |
219 |
-ripped from fedora |
220 |
- |
221 |
---- libaio-0.3.107/src/libaio.h |
222 |
-+++ libaio-0.3.107/src/libaio.h |
223 |
-@@ -73,6 +73,14 @@ |
224 |
- #define PADDED(x, y) unsigned y; x |
225 |
- #define PADDEDptr(x, y) unsigned y; x |
226 |
- #define PADDEDul(x, y) unsigned y; unsigned long x |
227 |
-+#elif defined(__sparc__) && defined(__arch64__) /* big endian, 64 bits */ |
228 |
-+#define PADDED(x, y) unsigned y; x |
229 |
-+#define PADDEDptr(x,y) x |
230 |
-+#define PADDEDul(x, y) unsigned long x |
231 |
-+#elif defined(__sparc__) /* big endian, 32 bits */ |
232 |
-+#define PADDED(x, y) unsigned y; x |
233 |
-+#define PADDEDptr(x, y) unsigned y; x |
234 |
-+#define PADDEDul(x, y) unsigned y; unsigned long x |
235 |
- #else |
236 |
- #error endian? |
237 |
- #endif |
238 |
---- libaio-0.3.107/src/syscall.h |
239 |
-+++ libaio-0.3.107/src/syscall.h |
240 |
-@@ -22,6 +22,8 @@ |
241 |
- #include "syscall-s390.h" |
242 |
- #elif defined(__alpha__) |
243 |
- #include "syscall-alpha.h" |
244 |
-+#elif defined(__sparc__) |
245 |
-+#include "syscall-sparc.h" |
246 |
- #else |
247 |
- #error "add syscall-arch.h" |
248 |
- #endif |
249 |
---- libaio-0.3.107/src/syscall-sparc.h |
250 |
-+++ libaio-0.3.107/src/syscall-sparc.h |
251 |
-@@ -0,0 +1,118 @@ |
252 |
-+#include <errno.h> |
253 |
-+ |
254 |
-+#define __NR_io_setup 268 |
255 |
-+#define __NR_io_destroy 269 |
256 |
-+#define __NR_io_submit 270 |
257 |
-+#define __NR_io_cancel 271 |
258 |
-+#define __NR_io_getevents 272 |
259 |
-+ |
260 |
-+#define io_syscall1(type,fname,sname,type1,arg1) \ |
261 |
-+type fname(type1 arg1) \ |
262 |
-+{ \ |
263 |
-+long __res; \ |
264 |
-+register long __g1 __asm__ ("g1") = __NR_##sname; \ |
265 |
-+register long __o0 __asm__ ("o0") = (long)(arg1); \ |
266 |
-+__asm__ __volatile__ ("t 0x10\n\t" \ |
267 |
-+ "bcc 1f\n\t" \ |
268 |
-+ "mov %%o0, %0\n\t" \ |
269 |
-+ "sub %%g0, %%o0, %0\n\t" \ |
270 |
-+ "1:\n\t" \ |
271 |
-+ : "=r" (__res), "=&r" (__o0) \ |
272 |
-+ : "1" (__o0), "r" (__g1) \ |
273 |
-+ : "cc"); \ |
274 |
-+if (__res < -255 || __res >= 0) \ |
275 |
-+ return (type) __res; \ |
276 |
-+errno = -__res; \ |
277 |
-+return -1; \ |
278 |
-+} |
279 |
-+ |
280 |
-+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ |
281 |
-+type fname(type1 arg1,type2 arg2) \ |
282 |
-+{ \ |
283 |
-+long __res; \ |
284 |
-+register long __g1 __asm__ ("g1") = __NR_##sname; \ |
285 |
-+register long __o0 __asm__ ("o0") = (long)(arg1); \ |
286 |
-+register long __o1 __asm__ ("o1") = (long)(arg2); \ |
287 |
-+__asm__ __volatile__ ("t 0x10\n\t" \ |
288 |
-+ "bcc 1f\n\t" \ |
289 |
-+ "mov %%o0, %0\n\t" \ |
290 |
-+ "sub %%g0, %%o0, %0\n\t" \ |
291 |
-+ "1:\n\t" \ |
292 |
-+ : "=r" (__res), "=&r" (__o0) \ |
293 |
-+ : "1" (__o0), "r" (__o1), "r" (__g1) \ |
294 |
-+ : "cc"); \ |
295 |
-+if (__res < -255 || __res >= 0) \ |
296 |
-+ return (type) __res; \ |
297 |
-+errno = -__res; \ |
298 |
-+return -1; \ |
299 |
-+} |
300 |
-+ |
301 |
-+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ |
302 |
-+type fname(type1 arg1,type2 arg2,type3 arg3) \ |
303 |
-+{ \ |
304 |
-+long __res; \ |
305 |
-+register long __g1 __asm__ ("g1") = __NR_##sname; \ |
306 |
-+register long __o0 __asm__ ("o0") = (long)(arg1); \ |
307 |
-+register long __o1 __asm__ ("o1") = (long)(arg2); \ |
308 |
-+register long __o2 __asm__ ("o2") = (long)(arg3); \ |
309 |
-+__asm__ __volatile__ ("t 0x10\n\t" \ |
310 |
-+ "bcc 1f\n\t" \ |
311 |
-+ "mov %%o0, %0\n\t" \ |
312 |
-+ "sub %%g0, %%o0, %0\n\t" \ |
313 |
-+ "1:\n\t" \ |
314 |
-+ : "=r" (__res), "=&r" (__o0) \ |
315 |
-+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \ |
316 |
-+ : "cc"); \ |
317 |
-+if (__res < -255 || __res>=0) \ |
318 |
-+ return (type) __res; \ |
319 |
-+errno = -__res; \ |
320 |
-+return -1; \ |
321 |
-+} |
322 |
-+ |
323 |
-+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ |
324 |
-+type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ |
325 |
-+{ \ |
326 |
-+long __res; \ |
327 |
-+register long __g1 __asm__ ("g1") = __NR_##sname; \ |
328 |
-+register long __o0 __asm__ ("o0") = (long)(arg1); \ |
329 |
-+register long __o1 __asm__ ("o1") = (long)(arg2); \ |
330 |
-+register long __o2 __asm__ ("o2") = (long)(arg3); \ |
331 |
-+register long __o3 __asm__ ("o3") = (long)(arg4); \ |
332 |
-+__asm__ __volatile__ ("t 0x10\n\t" \ |
333 |
-+ "bcc 1f\n\t" \ |
334 |
-+ "mov %%o0, %0\n\t" \ |
335 |
-+ "sub %%g0, %%o0, %0\n\t" \ |
336 |
-+ "1:\n\t" \ |
337 |
-+ : "=r" (__res), "=&r" (__o0) \ |
338 |
-+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \ |
339 |
-+ : "cc"); \ |
340 |
-+if (__res < -255 || __res>=0) \ |
341 |
-+ return (type) __res; \ |
342 |
-+errno = -__res; \ |
343 |
-+return -1; \ |
344 |
-+} |
345 |
-+ |
346 |
-+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ |
347 |
-+ type5,arg5) \ |
348 |
-+type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ |
349 |
-+{ \ |
350 |
-+long __res; \ |
351 |
-+register long __g1 __asm__ ("g1") = __NR_##sname; \ |
352 |
-+register long __o0 __asm__ ("o0") = (long)(arg1); \ |
353 |
-+register long __o1 __asm__ ("o1") = (long)(arg2); \ |
354 |
-+register long __o2 __asm__ ("o2") = (long)(arg3); \ |
355 |
-+register long __o3 __asm__ ("o3") = (long)(arg4); \ |
356 |
-+register long __o4 __asm__ ("o4") = (long)(arg5); \ |
357 |
-+__asm__ __volatile__ ("t 0x10\n\t" \ |
358 |
-+ "bcc 1f\n\t" \ |
359 |
-+ "mov %%o0, %0\n\t" \ |
360 |
-+ "sub %%g0, %%o0, %0\n\t" \ |
361 |
-+ "1:\n\t" \ |
362 |
-+ : "=r" (__res), "=&r" (__o0) \ |
363 |
-+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \ |
364 |
-+ : "cc"); \ |
365 |
-+if (__res < -255 || __res>=0) \ |
366 |
-+ return (type) __res; \ |
367 |
-+errno = -__res; \ |
368 |
-+return -1; \ |
369 |
-+} |
370 |
|
371 |
diff --git a/dev-libs/libaio/files/libaio-0.3.109-generic-arch.patch b/dev-libs/libaio/files/libaio-0.3.109-generic-arch.patch |
372 |
deleted file mode 100644 |
373 |
index fea3aee..00000000 |
374 |
--- a/dev-libs/libaio/files/libaio-0.3.109-generic-arch.patch |
375 |
+++ /dev/null |
376 |
@@ -1,62 +0,0 @@ |
377 |
-From 5e96c73d5dfbdea8d0be82b7f3fc8d6735e5dfa7 Mon Sep 17 00:00:00 2001 |
378 |
-From: Mike Frysinger <vapier@g.o> |
379 |
-Date: Sun, 17 Jan 2010 17:07:48 -0500 |
380 |
-Subject: [PATCH] add a generic syscall() fallback |
381 |
- |
382 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
383 |
---- |
384 |
- src/syscall-generic.h | 29 +++++++++++++++++++++++++++++ |
385 |
- src/syscall.h | 3 ++- |
386 |
- 2 files changed, 31 insertions(+), 1 deletions(-) |
387 |
- create mode 100644 src/syscall-generic.h |
388 |
- |
389 |
-diff --git a/src/syscall-generic.h b/src/syscall-generic.h |
390 |
-new file mode 100644 |
391 |
-index 0000000..24d7c7c |
392 |
---- /dev/null |
393 |
-+++ b/src/syscall-generic.h |
394 |
-@@ -0,0 +1,29 @@ |
395 |
-+#include <errno.h> |
396 |
-+#include <unistd.h> |
397 |
-+#include <sys/syscall.h> |
398 |
-+ |
399 |
-+#define _body_io_syscall(sname, args...) \ |
400 |
-+{ \ |
401 |
-+ int ret = syscall(__NR_##sname, ## args); \ |
402 |
-+ return ret < 0 ? -errno : ret; \ |
403 |
-+} |
404 |
-+ |
405 |
-+#define io_syscall1(type,fname,sname,type1,arg1) \ |
406 |
-+type fname(type1 arg1) \ |
407 |
-+_body_io_syscall(sname, (long)arg1) |
408 |
-+ |
409 |
-+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ |
410 |
-+type fname(type1 arg1,type2 arg2) \ |
411 |
-+_body_io_syscall(sname, (long)arg1, (long)arg2) |
412 |
-+ |
413 |
-+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ |
414 |
-+type fname(type1 arg1,type2 arg2,type3 arg3) \ |
415 |
-+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3) |
416 |
-+ |
417 |
-+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ |
418 |
-+type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ |
419 |
-+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4) |
420 |
-+ |
421 |
-+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, type5,arg5) \ |
422 |
-+type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ |
423 |
-+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4, (long)arg5) |
424 |
-diff --git a/src/syscall.h b/src/syscall.h |
425 |
-index 78becfe..d954af0 100644 |
426 |
---- a/src/syscall.h |
427 |
-+++ b/src/syscall.h |
428 |
-@@ -25,5 +25,6 @@ |
429 |
- #elif defined(__arm__) |
430 |
- #include "syscall-arm.h" |
431 |
- #else |
432 |
--#error "add syscall-arch.h" |
433 |
-+#warning "using generic syscall method" |
434 |
-+#include "syscall-generic.h" |
435 |
- #endif |
436 |
--- |
437 |
-1.7.3.1 |
438 |
- |
439 |
|
440 |
diff --git a/dev-libs/libaio/files/libaio-0.3.109-unify-bits-endian.patch b/dev-libs/libaio/files/libaio-0.3.109-unify-bits-endian.patch |
441 |
deleted file mode 100644 |
442 |
index 1a4e6ef..00000000 |
443 |
--- a/dev-libs/libaio/files/libaio-0.3.109-unify-bits-endian.patch |
444 |
+++ /dev/null |
445 |
@@ -1,73 +0,0 @@ |
446 |
-From be673c7afd7a86b89fbe2e09c758f2de3482d19b Mon Sep 17 00:00:00 2001 |
447 |
-From: Mike Frysinger <vapier@g.o> |
448 |
-Date: Sun, 17 Jan 2010 17:07:24 -0500 |
449 |
-Subject: [PATCH] unify LE/BE 32/64bit logic and add more arches |
450 |
- |
451 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
452 |
---- |
453 |
- src/libaio.h | 36 +++++++++++++++--------------------- |
454 |
- 1 files changed, 15 insertions(+), 21 deletions(-) |
455 |
- |
456 |
-diff --git a/src/libaio.h b/src/libaio.h |
457 |
-index ffe8259..4a6c9fb 100644 |
458 |
---- a/src/libaio.h |
459 |
-+++ b/src/libaio.h |
460 |
-@@ -49,40 +49,34 @@ typedef enum io_iocb_cmd { |
461 |
- IO_CMD_PWRITEV = 8, |
462 |
- } io_iocb_cmd_t; |
463 |
- |
464 |
--#if defined(__i386__) /* little endian, 32 bits */ |
465 |
-+/* little endian, 32 bits */ |
466 |
-+#if defined(__i386__) || defined(__sh__) || defined(__bfin__) || \ |
467 |
-+ defined(__ARMEL__) || defined(__MIPSEL__) || defined(__cris__) |
468 |
- #define PADDED(x, y) x; unsigned y |
469 |
- #define PADDEDptr(x, y) x; unsigned y |
470 |
- #define PADDEDul(x, y) unsigned long x; unsigned y |
471 |
-+ |
472 |
-+/* little endian, 64 bits */ |
473 |
- #elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) |
474 |
- #define PADDED(x, y) x, y |
475 |
- #define PADDEDptr(x, y) x |
476 |
- #define PADDEDul(x, y) unsigned long x |
477 |
--#elif defined(__powerpc64__) /* big endian, 64 bits */ |
478 |
--#define PADDED(x, y) unsigned y; x |
479 |
--#define PADDEDptr(x,y) x |
480 |
--#define PADDEDul(x, y) unsigned long x |
481 |
--#elif defined(__PPC__) /* big endian, 32 bits */ |
482 |
--#define PADDED(x, y) unsigned y; x |
483 |
--#define PADDEDptr(x, y) unsigned y; x |
484 |
--#define PADDEDul(x, y) unsigned y; unsigned long x |
485 |
--#elif defined(__s390x__) /* big endian, 64 bits */ |
486 |
-+ |
487 |
-+/* big endian, 64 bits */ |
488 |
-+#elif defined(__powerpc64__) || defined(__s390x__) || \ |
489 |
-+ (defined(__sparc__) && defined(__arch64__)) |
490 |
- #define PADDED(x, y) unsigned y; x |
491 |
- #define PADDEDptr(x,y) x |
492 |
- #define PADDEDul(x, y) unsigned long x |
493 |
--#elif defined(__s390__) /* big endian, 32 bits */ |
494 |
--#define PADDED(x, y) unsigned y; x |
495 |
--#define PADDEDptr(x, y) unsigned y; x |
496 |
--#define PADDEDul(x, y) unsigned y; unsigned long x |
497 |
--#elif defined(__arm__) |
498 |
--# if defined (__ARMEB__) /* big endian, 32 bits */ |
499 |
-+ |
500 |
-+/* big endian, 32 bits */ |
501 |
-+#elif defined(__PPC__) || defined(__s390__) || defined(__ARMEB__) || \ |
502 |
-+ defined(__MIPSEB__) || defined(__sparc__) || defined(__m68k__) || \ |
503 |
-+ defined(__hppa__) || defined(__frv__) || defined(__avr32__) |
504 |
- #define PADDED(x, y) unsigned y; x |
505 |
- #define PADDEDptr(x, y) unsigned y; x |
506 |
- #define PADDEDul(x, y) unsigned y; unsigned long x |
507 |
--# else /* little endian, 32 bits */ |
508 |
--#define PADDED(x, y) x; unsigned y |
509 |
--#define PADDEDptr(x, y) x; unsigned y |
510 |
--#define PADDEDul(x, y) unsigned long x; unsigned y |
511 |
--# endif |
512 |
-+ |
513 |
- #else |
514 |
- #error endian? |
515 |
- #endif |
516 |
--- |
517 |
-1.7.3.1 |
518 |
- |