From 8b4eb7e9c1250f331dea10806846129475e730af Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:55:39 +0000 Subject: import libaio-0.3.109-13.el7 --- diff --git a/SOURCES/libaio-add-arm64-support.patch b/SOURCES/libaio-add-arm64-support.patch new file mode 100644 index 0000000..5b4184e --- /dev/null +++ b/SOURCES/libaio-add-arm64-support.patch @@ -0,0 +1,137 @@ +diff -up libaio-0.3.109/src/libaio.h.orig libaio-0.3.109/src/libaio.h +--- libaio-0.3.109/src/libaio.h.orig 2009-10-09 14:17:02.000000000 -0400 ++++ libaio-0.3.109/src/libaio.h 2014-03-13 10:22:47.062638753 -0400 +@@ -83,6 +83,16 @@ typedef enum io_iocb_cmd { + #define PADDEDptr(x, y) x; unsigned y + #define PADDEDul(x, y) unsigned long x; unsigned y + # endif ++#elif defined(__aarch64__) ++# if defined (__AARCH64EB__) /* big endian, 64 bits */ ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x,y) x ++#define PADDEDul(x, y) unsigned long x ++# elif defined(__AARCH64EL__) /* little endian, 64 bits */ ++#define PADDED(x, y) x, y ++#define PADDEDptr(x, y) x ++#define PADDEDul(x, y) unsigned long x ++# endif + #else + #error endian? + #endif +diff -up libaio-0.3.109/src/syscall-arm64.h.orig libaio-0.3.109/src/syscall-arm64.h +--- libaio-0.3.109/src/syscall-arm64.h.orig 2014-03-13 10:21:16.090895733 -0400 ++++ libaio-0.3.109/src/syscall-arm64.h 2014-03-13 10:21:16.090895733 -0400 +@@ -0,0 +1,101 @@ ++/* ++ * linux/include/asm-arm/unistd.h ++ * ++ * Copyright (C) 2001-2005 Russell King ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Please forward _all_ changes to this file to rmk@arm.linux.org.uk, ++ * no matter what the change is. Thanks! ++ */ ++ ++#define __NR_io_setup 0 ++#define __NR_io_destroy 1 ++#define __NR_io_submit 2 ++#define __NR_io_cancel 3 ++#define __NR_io_getevents 4 ++ ++#define __sys2(x) #x ++#define __sys1(x) __sys2(x) ++ ++#define __SYS_REG(name) register long __sysreg __asm__("w8") = __NR_##name; ++#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs ++#define __syscall(name) "svc\t#0" ++ ++#define io_syscall1(type,fname,sname,type1,arg1) \ ++type fname(type1 arg1) { \ ++ __SYS_REG(sname) \ ++ register long __x0 __asm__("x0") = (long)arg1; \ ++ register long __res_x0 __asm__("x0"); \ ++ __asm__ __volatile__ ( \ ++ __syscall(sname) \ ++ : "=r" (__res_x0) \ ++ : __SYS_REG_LIST( "0" (__x0) ) \ ++ : "memory" ); \ ++ return (type) __res_x0; \ ++} ++ ++#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ ++type fname(type1 arg1,type2 arg2) { \ ++ __SYS_REG(sname) \ ++ register long __x0 __asm__("x0") = (long)arg1; \ ++ register long __x1 __asm__("x1") = (long)arg2; \ ++ register long __res_x0 __asm__("x0"); \ ++ __asm__ __volatile__ ( \ ++ __syscall(sname) \ ++ : "=r" (__res_x0) \ ++ : __SYS_REG_LIST( "0" (__x0), "r" (__x1) ) \ ++ : "memory" ); \ ++ return (type) __res_x0; \ ++} ++ ++#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ ++type fname(type1 arg1,type2 arg2,type3 arg3) { \ ++ __SYS_REG(sname) \ ++ register long __x0 __asm__("x0") = (long)arg1; \ ++ register long __x1 __asm__("x1") = (long)arg2; \ ++ register long __x2 __asm__("x2") = (long)arg3; \ ++ register long __res_x0 __asm__("x0"); \ ++ __asm__ __volatile__ ( \ ++ __syscall(sname) \ ++ : "=r" (__res_x0) \ ++ : __SYS_REG_LIST( "0" (__x0), "r" (__x1), "r" (__x2) ) \ ++ : "memory" ); \ ++ return (type) __res_x0; \ ++} ++ ++#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\ ++type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \ ++ __SYS_REG(sname) \ ++ register long __x0 __asm__("x0") = (long)arg1; \ ++ register long __x1 __asm__("x1") = (long)arg2; \ ++ register long __x2 __asm__("x2") = (long)arg3; \ ++ register long __x3 __asm__("x3") = (long)arg4; \ ++ register long __res_x0 __asm__("x0"); \ ++ __asm__ __volatile__ ( \ ++ __syscall(sname) \ ++ : "=r" (__res_x0) \ ++ : __SYS_REG_LIST( "0" (__x0), "r" (__x1), "r" (__x2), "r" (__x3) ) \ ++ : "memory" ); \ ++ return (type) __res_x0; \ ++} ++ ++#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ ++type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {\ ++ __SYS_REG(sname) \ ++ register long __x0 __asm__("x0") = (long)arg1; \ ++ register long __x1 __asm__("x1") = (long)arg2; \ ++ register long __x2 __asm__("x2") = (long)arg3; \ ++ register long __x3 __asm__("x3") = (long)arg4; \ ++ register long __x4 __asm__("x4") = (long)arg5; \ ++ register long __res_x0 __asm__("x0"); \ ++ __asm__ __volatile__ ( \ ++ __syscall(sname) \ ++ : "=r" (__res_x0) \ ++ : __SYS_REG_LIST( "0" (__x0), "r" (__x1), "r" (__x2), \ ++ "r" (__x3), "r" (__x4) ) \ ++ : "memory" ); \ ++ return (type) __res_x0; \ ++} +diff -up libaio-0.3.109/src/syscall.h.orig libaio-0.3.109/src/syscall.h +--- libaio-0.3.109/src/syscall.h.orig 2009-10-09 14:17:02.000000000 -0400 ++++ libaio-0.3.109/src/syscall.h 2014-03-13 10:23:14.039452006 -0400 +@@ -24,6 +24,8 @@ + #include "syscall-alpha.h" + #elif defined(__arm__) + #include "syscall-arm.h" ++#elif defined(__aarch64__) ++#include "syscall-arm64.h" + #else + #error "add syscall-arch.h" + #endif diff --git a/SOURCES/libaio-arm64-fix-test-case-16.patch b/SOURCES/libaio-arm64-fix-test-case-16.patch new file mode 100644 index 0000000..8afdb3b --- /dev/null +++ b/SOURCES/libaio-arm64-fix-test-case-16.patch @@ -0,0 +1,28 @@ +diff -up libaio-0.3.109/harness/cases/16.t.orig libaio-0.3.109/harness/cases/16.t +--- libaio-0.3.109/harness/cases/16.t.orig 2009-10-09 14:17:02.000000000 -0400 ++++ libaio-0.3.109/harness/cases/16.t 2014-03-13 10:36:34.221544281 -0400 +@@ -18,6 +18,12 @@ + #define SYS_eventfd 318 + #elif defined(__alpha__) + #define SYS_eventfd 478 ++#elif defined(__aarch64__) ++/* arm64 does not implement eventfd, only eventfd2 */ ++#define USE_EVENTFD2 ++#ifndef SYS_eventfd2 ++#define SYS_eventfd2 19 ++#endif /* __aarch64__ */ + #else + #error define SYS_eventfd for your arch! + #endif +@@ -39,7 +45,11 @@ int test_main(void) + struct timespec notime = { .tv_sec = 0, .tv_nsec = 0 }; + + buf = malloc(SIZE); assert(buf); ++#ifndef USE_EVENTFD2 + efd = syscall(SYS_eventfd, 0); ++#else ++ efd = syscall(SYS_eventfd2, 0, 0); ++#endif + if (efd < 0) { + if (errno == ENOSYS) { + printf("No eventfd support. [SKIPPING]\n"); diff --git a/SOURCES/libaio-install-to-slash.patch b/SOURCES/libaio-install-to-slash.patch index fe75cfc..9753fa2 100644 --- a/SOURCES/libaio-install-to-slash.patch +++ b/SOURCES/libaio-install-to-slash.patch @@ -1,6 +1,6 @@ -diff -up libaio-0.3.107/src/Makefile.orig libaio-0.3.107/src/Makefile ---- libaio-0.3.107/src/Makefile.orig 2009-01-20 10:07:31.520105235 -0500 -+++ libaio-0.3.107/src/Makefile 2009-01-20 10:08:51.199104930 -0500 +diff -up libaio-0.3.109/src/Makefile.orig libaio-0.3.109/src/Makefile +--- libaio-0.3.109/src/Makefile.orig 2009-10-09 14:17:02.000000000 -0400 ++++ libaio-0.3.109/src/Makefile 2014-03-10 17:12:39.167190155 -0400 @@ -1,6 +1,7 @@ prefix=/usr -includedir=$(prefix)/include diff --git a/SOURCES/libaio-sparc.patch b/SOURCES/libaio-sparc.patch deleted file mode 100644 index 07ea1e3..0000000 --- a/SOURCES/libaio-sparc.patch +++ /dev/null @@ -1,908 +0,0 @@ -diff -uNr libaio-0.3.109-orig/compat-libaio-0.3.109/src/libaio.h libaio-0.3.109/compat-libaio-0.3.109/src/libaio.h ---- libaio-0.3.109-orig/compat-libaio-0.3.109/src/libaio.h 2009-10-09 13:17:02.000000000 -0500 -+++ libaio-0.3.109/compat-libaio-0.3.109/src/libaio.h 2011-04-03 12:52:50.000000000 -0500 -@@ -83,6 +83,14 @@ - #define PADDEDptr(x, y) x; unsigned y - #define PADDEDul(x, y) unsigned long x; unsigned y - # endif -+#elif defined(__sparc__) && defined(__arch64__) /* big endian, 64 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x,y) x -+#define PADDEDul(x, y) unsigned long x -+#elif defined(__sparc__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x - #else - #error endian? - #endif -diff -uNr libaio-0.3.109-orig/compat-libaio-0.3.109/src/libaio.h.orig libaio-0.3.109/compat-libaio-0.3.109/src/libaio.h.orig ---- libaio-0.3.109-orig/compat-libaio-0.3.109/src/libaio.h.orig 1969-12-31 18:00:00.000000000 -0600 -+++ libaio-0.3.109/compat-libaio-0.3.109/src/libaio.h.orig 2009-10-09 13:17:02.000000000 -0500 -@@ -0,0 +1,265 @@ -+/* /usr/include/libaio.h -+ * -+ * Copyright 2000,2001,2002 Red Hat, Inc. -+ * -+ * Written by Benjamin LaHaise -+ * -+ * libaio Linux async I/O interface -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ */ -+#ifndef __LIBAIO_H -+#define __LIBAIO_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#include -+#include -+ -+struct timespec; -+struct sockaddr; -+struct iovec; -+ -+typedef struct io_context *io_context_t; -+ -+typedef enum io_iocb_cmd { -+ IO_CMD_PREAD = 0, -+ IO_CMD_PWRITE = 1, -+ -+ IO_CMD_FSYNC = 2, -+ IO_CMD_FDSYNC = 3, -+ -+ IO_CMD_POLL = 5, /* Never implemented in mainline, see io_prep_poll */ -+ IO_CMD_NOOP = 6, -+ IO_CMD_PREADV = 7, -+ IO_CMD_PWRITEV = 8, -+} io_iocb_cmd_t; -+ -+#if defined(__i386__) /* little endian, 32 bits */ -+#define PADDED(x, y) x; unsigned y -+#define PADDEDptr(x, y) x; unsigned y -+#define PADDEDul(x, y) unsigned long x; unsigned y -+#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) -+#define PADDED(x, y) x, y -+#define PADDEDptr(x, y) x -+#define PADDEDul(x, y) unsigned long x -+#elif defined(__powerpc64__) /* big endian, 64 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x,y) x -+#define PADDEDul(x, y) unsigned long x -+#elif defined(__PPC__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__s390x__) /* big endian, 64 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x,y) x -+#define PADDEDul(x, y) unsigned long x -+#elif defined(__s390__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__arm__) -+# if defined (__ARMEB__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+# else /* little endian, 32 bits */ -+#define PADDED(x, y) x; unsigned y -+#define PADDEDptr(x, y) x; unsigned y -+#define PADDEDul(x, y) unsigned long x; unsigned y -+# endif -+#else -+#error endian? -+#endif -+ -+struct io_iocb_poll { -+ PADDED(int events, __pad1); -+}; /* result code is the set of result flags or -'ve errno */ -+ -+struct io_iocb_sockaddr { -+ struct sockaddr *addr; -+ int len; -+}; /* result code is the length of the sockaddr, or -'ve errno */ -+ -+struct io_iocb_common { -+ PADDEDptr(void *buf, __pad1); -+ PADDEDul(nbytes, __pad2); -+ long long offset; -+ long long __pad3; -+ unsigned flags; -+ unsigned resfd; -+}; /* result code is the amount read or -'ve errno */ -+ -+struct io_iocb_vector { -+ const struct iovec *vec; -+ int nr; -+ long long offset; -+}; /* result code is the amount read or -'ve errno */ -+ -+struct iocb { -+ PADDEDptr(void *data, __pad1); /* Return in the io completion event */ -+ PADDED(unsigned key, __pad2); /* For use in identifying io requests */ -+ -+ short aio_lio_opcode; -+ short aio_reqprio; -+ int aio_fildes; -+ -+ union { -+ struct io_iocb_common c; -+ struct io_iocb_vector v; -+ struct io_iocb_poll poll; -+ struct io_iocb_sockaddr saddr; -+ } u; -+}; -+ -+struct io_event { -+ PADDEDptr(void *data, __pad1); -+ PADDEDptr(struct iocb *obj, __pad2); -+ PADDEDul(res, __pad3); -+ PADDEDul(res2, __pad4); -+}; -+ -+#undef PADDED -+#undef PADDEDptr -+#undef PADDEDul -+ -+typedef void (*io_callback_t)(io_context_t ctx, struct iocb *iocb, long res, long res2); -+ -+/* library wrappers */ -+extern int io_queue_init(int maxevents, io_context_t *ctxp); -+/*extern int io_queue_grow(io_context_t ctx, int new_maxevents);*/ -+extern int io_queue_release(io_context_t ctx); -+/*extern int io_queue_wait(io_context_t ctx, struct timespec *timeout);*/ -+extern int io_queue_run(io_context_t ctx); -+ -+/* Actual syscalls */ -+extern int io_setup(int maxevents, io_context_t *ctxp); -+extern int io_destroy(io_context_t ctx); -+extern int io_submit(io_context_t ctx, long nr, struct iocb *ios[]); -+extern int io_cancel(io_context_t ctx, struct iocb *iocb, struct io_event *evt); -+extern int io_getevents(io_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout); -+ -+ -+static inline void io_set_callback(struct iocb *iocb, io_callback_t cb) -+{ -+ iocb->data = (void *)cb; -+} -+ -+static inline void io_prep_pread(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_PREAD; -+ iocb->aio_reqprio = 0; -+ iocb->u.c.buf = buf; -+ iocb->u.c.nbytes = count; -+ iocb->u.c.offset = offset; -+} -+ -+static inline void io_prep_pwrite(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_PWRITE; -+ iocb->aio_reqprio = 0; -+ iocb->u.c.buf = buf; -+ iocb->u.c.nbytes = count; -+ iocb->u.c.offset = offset; -+} -+ -+static inline void io_prep_preadv(struct iocb *iocb, int fd, const struct iovec *iov, int iovcnt, long long offset) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_PREADV; -+ iocb->aio_reqprio = 0; -+ iocb->u.c.buf = (void *)iov; -+ iocb->u.c.nbytes = iovcnt; -+ iocb->u.c.offset = offset; -+} -+ -+static inline void io_prep_pwritev(struct iocb *iocb, int fd, const struct iovec *iov, int iovcnt, long long offset) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_PWRITEV; -+ iocb->aio_reqprio = 0; -+ iocb->u.c.buf = (void *)iov; -+ iocb->u.c.nbytes = iovcnt; -+ iocb->u.c.offset = offset; -+} -+ -+/* Jeff Moyer says this was implemented in Red Hat AS2.1 and RHEL3. -+ * AFAICT, it was never in mainline, and should not be used. --RR */ -+static inline void io_prep_poll(struct iocb *iocb, int fd, int events) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_POLL; -+ iocb->aio_reqprio = 0; -+ iocb->u.poll.events = events; -+} -+ -+static inline int io_poll(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd, int events) -+{ -+ io_prep_poll(iocb, fd, events); -+ io_set_callback(iocb, cb); -+ return io_submit(ctx, 1, &iocb); -+} -+ -+static inline void io_prep_fsync(struct iocb *iocb, int fd) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_FSYNC; -+ iocb->aio_reqprio = 0; -+} -+ -+static inline int io_fsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) -+{ -+ io_prep_fsync(iocb, fd); -+ io_set_callback(iocb, cb); -+ return io_submit(ctx, 1, &iocb); -+} -+ -+static inline void io_prep_fdsync(struct iocb *iocb, int fd) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_FDSYNC; -+ iocb->aio_reqprio = 0; -+} -+ -+static inline int io_fdsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) -+{ -+ io_prep_fdsync(iocb, fd); -+ io_set_callback(iocb, cb); -+ return io_submit(ctx, 1, &iocb); -+} -+ -+static inline void io_set_eventfd(struct iocb *iocb, int eventfd) -+{ -+ iocb->u.c.flags |= (1 << 0) /* IOCB_FLAG_RESFD */; -+ iocb->u.c.resfd = eventfd; -+} -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* __LIBAIO_H */ -diff -uNr libaio-0.3.109-orig/compat-libaio-0.3.109/src/syscall.h libaio-0.3.109/compat-libaio-0.3.109/src/syscall.h ---- libaio-0.3.109-orig/compat-libaio-0.3.109/src/syscall.h 2009-10-09 13:17:02.000000000 -0500 -+++ libaio-0.3.109/compat-libaio-0.3.109/src/syscall.h 2011-04-03 12:53:23.000000000 -0500 -@@ -24,6 +24,8 @@ - #include "syscall-alpha.h" - #elif defined(__arm__) - #include "syscall-arm.h" -+#elif defined(__sparc__) -+#include "syscall-sparc.h" - #else - #error "add syscall-arch.h" - #endif -diff -uNr libaio-0.3.109-orig/compat-libaio-0.3.109/src/syscall.h.orig libaio-0.3.109/compat-libaio-0.3.109/src/syscall.h.orig ---- libaio-0.3.109-orig/compat-libaio-0.3.109/src/syscall.h.orig 1969-12-31 18:00:00.000000000 -0600 -+++ libaio-0.3.109/compat-libaio-0.3.109/src/syscall.h.orig 2009-10-09 13:17:02.000000000 -0500 -@@ -0,0 +1,29 @@ -+#include -+#include -+ -+#define _SYMSTR(str) #str -+#define SYMSTR(str) _SYMSTR(str) -+ -+#define SYMVER(compat_sym, orig_sym, ver_sym) \ -+ __asm__(".symver " SYMSTR(compat_sym) "," SYMSTR(orig_sym) "@LIBAIO_" SYMSTR(ver_sym)); -+ -+#define DEFSYMVER(compat_sym, orig_sym, ver_sym) \ -+ __asm__(".symver " SYMSTR(compat_sym) "," SYMSTR(orig_sym) "@@LIBAIO_" SYMSTR(ver_sym)); -+ -+#if defined(__i386__) -+#include "syscall-i386.h" -+#elif defined(__x86_64__) -+#include "syscall-x86_64.h" -+#elif defined(__ia64__) -+#include "syscall-ia64.h" -+#elif defined(__PPC__) -+#include "syscall-ppc.h" -+#elif defined(__s390__) -+#include "syscall-s390.h" -+#elif defined(__alpha__) -+#include "syscall-alpha.h" -+#elif defined(__arm__) -+#include "syscall-arm.h" -+#else -+#error "add syscall-arch.h" -+#endif -diff -uNr libaio-0.3.109-orig/compat-libaio-0.3.109/src/syscall-sparc.h libaio-0.3.109/compat-libaio-0.3.109/src/syscall-sparc.h ---- libaio-0.3.109-orig/compat-libaio-0.3.109/src/syscall-sparc.h 1969-12-31 18:00:00.000000000 -0600 -+++ libaio-0.3.109/compat-libaio-0.3.109/src/syscall-sparc.h 2011-04-03 12:51:33.000000000 -0500 -@@ -0,0 +1,118 @@ -+#include -+ -+#define __NR_io_setup 268 -+#define __NR_io_destroy 269 -+#define __NR_io_submit 270 -+#define __NR_io_cancel 271 -+#define __NR_io_getevents 272 -+ -+#define io_syscall1(type,fname,sname,type1,arg1) \ -+type fname(type1 arg1) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res >= 0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -+ -+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -+type fname(type1 arg1,type2 arg2) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res >= 0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -+ -+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -+type fname(type1 arg1,type2 arg2,type3 arg3) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -+ -+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -+type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+register long __o3 __asm__ ("o3") = (long)(arg4); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -+ -+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ -+ type5,arg5) \ -+type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+register long __o3 __asm__ ("o3") = (long)(arg4); \ -+register long __o4 __asm__ ("o4") = (long)(arg5); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -diff -uNr libaio-0.3.109-orig/src/libaio.h libaio-0.3.109/src/libaio.h ---- libaio-0.3.109-orig/src/libaio.h 2009-10-09 13:17:02.000000000 -0500 -+++ libaio-0.3.109/src/libaio.h 2011-04-03 12:53:38.000000000 -0500 -@@ -83,6 +83,14 @@ - #define PADDEDptr(x, y) x; unsigned y - #define PADDEDul(x, y) unsigned long x; unsigned y - # endif -+#elif defined(__sparc__) && defined(__arch64__) /* big endian, 64 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x,y) x -+#define PADDEDul(x, y) unsigned long x -+#elif defined(__sparc__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x - #else - #error endian? - #endif -diff -uNr libaio-0.3.109-orig/src/libaio.h.orig libaio-0.3.109/src/libaio.h.orig ---- libaio-0.3.109-orig/src/libaio.h.orig 1969-12-31 18:00:00.000000000 -0600 -+++ libaio-0.3.109/src/libaio.h.orig 2009-10-09 13:17:02.000000000 -0500 -@@ -0,0 +1,265 @@ -+/* /usr/include/libaio.h -+ * -+ * Copyright 2000,2001,2002 Red Hat, Inc. -+ * -+ * Written by Benjamin LaHaise -+ * -+ * libaio Linux async I/O interface -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ */ -+#ifndef __LIBAIO_H -+#define __LIBAIO_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#include -+#include -+ -+struct timespec; -+struct sockaddr; -+struct iovec; -+ -+typedef struct io_context *io_context_t; -+ -+typedef enum io_iocb_cmd { -+ IO_CMD_PREAD = 0, -+ IO_CMD_PWRITE = 1, -+ -+ IO_CMD_FSYNC = 2, -+ IO_CMD_FDSYNC = 3, -+ -+ IO_CMD_POLL = 5, /* Never implemented in mainline, see io_prep_poll */ -+ IO_CMD_NOOP = 6, -+ IO_CMD_PREADV = 7, -+ IO_CMD_PWRITEV = 8, -+} io_iocb_cmd_t; -+ -+#if defined(__i386__) /* little endian, 32 bits */ -+#define PADDED(x, y) x; unsigned y -+#define PADDEDptr(x, y) x; unsigned y -+#define PADDEDul(x, y) unsigned long x; unsigned y -+#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) -+#define PADDED(x, y) x, y -+#define PADDEDptr(x, y) x -+#define PADDEDul(x, y) unsigned long x -+#elif defined(__powerpc64__) /* big endian, 64 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x,y) x -+#define PADDEDul(x, y) unsigned long x -+#elif defined(__PPC__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__s390x__) /* big endian, 64 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x,y) x -+#define PADDEDul(x, y) unsigned long x -+#elif defined(__s390__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__arm__) -+# if defined (__ARMEB__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+# else /* little endian, 32 bits */ -+#define PADDED(x, y) x; unsigned y -+#define PADDEDptr(x, y) x; unsigned y -+#define PADDEDul(x, y) unsigned long x; unsigned y -+# endif -+#else -+#error endian? -+#endif -+ -+struct io_iocb_poll { -+ PADDED(int events, __pad1); -+}; /* result code is the set of result flags or -'ve errno */ -+ -+struct io_iocb_sockaddr { -+ struct sockaddr *addr; -+ int len; -+}; /* result code is the length of the sockaddr, or -'ve errno */ -+ -+struct io_iocb_common { -+ PADDEDptr(void *buf, __pad1); -+ PADDEDul(nbytes, __pad2); -+ long long offset; -+ long long __pad3; -+ unsigned flags; -+ unsigned resfd; -+}; /* result code is the amount read or -'ve errno */ -+ -+struct io_iocb_vector { -+ const struct iovec *vec; -+ int nr; -+ long long offset; -+}; /* result code is the amount read or -'ve errno */ -+ -+struct iocb { -+ PADDEDptr(void *data, __pad1); /* Return in the io completion event */ -+ PADDED(unsigned key, __pad2); /* For use in identifying io requests */ -+ -+ short aio_lio_opcode; -+ short aio_reqprio; -+ int aio_fildes; -+ -+ union { -+ struct io_iocb_common c; -+ struct io_iocb_vector v; -+ struct io_iocb_poll poll; -+ struct io_iocb_sockaddr saddr; -+ } u; -+}; -+ -+struct io_event { -+ PADDEDptr(void *data, __pad1); -+ PADDEDptr(struct iocb *obj, __pad2); -+ PADDEDul(res, __pad3); -+ PADDEDul(res2, __pad4); -+}; -+ -+#undef PADDED -+#undef PADDEDptr -+#undef PADDEDul -+ -+typedef void (*io_callback_t)(io_context_t ctx, struct iocb *iocb, long res, long res2); -+ -+/* library wrappers */ -+extern int io_queue_init(int maxevents, io_context_t *ctxp); -+/*extern int io_queue_grow(io_context_t ctx, int new_maxevents);*/ -+extern int io_queue_release(io_context_t ctx); -+/*extern int io_queue_wait(io_context_t ctx, struct timespec *timeout);*/ -+extern int io_queue_run(io_context_t ctx); -+ -+/* Actual syscalls */ -+extern int io_setup(int maxevents, io_context_t *ctxp); -+extern int io_destroy(io_context_t ctx); -+extern int io_submit(io_context_t ctx, long nr, struct iocb *ios[]); -+extern int io_cancel(io_context_t ctx, struct iocb *iocb, struct io_event *evt); -+extern int io_getevents(io_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout); -+ -+ -+static inline void io_set_callback(struct iocb *iocb, io_callback_t cb) -+{ -+ iocb->data = (void *)cb; -+} -+ -+static inline void io_prep_pread(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_PREAD; -+ iocb->aio_reqprio = 0; -+ iocb->u.c.buf = buf; -+ iocb->u.c.nbytes = count; -+ iocb->u.c.offset = offset; -+} -+ -+static inline void io_prep_pwrite(struct iocb *iocb, int fd, void *buf, size_t count, long long offset) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_PWRITE; -+ iocb->aio_reqprio = 0; -+ iocb->u.c.buf = buf; -+ iocb->u.c.nbytes = count; -+ iocb->u.c.offset = offset; -+} -+ -+static inline void io_prep_preadv(struct iocb *iocb, int fd, const struct iovec *iov, int iovcnt, long long offset) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_PREADV; -+ iocb->aio_reqprio = 0; -+ iocb->u.c.buf = (void *)iov; -+ iocb->u.c.nbytes = iovcnt; -+ iocb->u.c.offset = offset; -+} -+ -+static inline void io_prep_pwritev(struct iocb *iocb, int fd, const struct iovec *iov, int iovcnt, long long offset) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_PWRITEV; -+ iocb->aio_reqprio = 0; -+ iocb->u.c.buf = (void *)iov; -+ iocb->u.c.nbytes = iovcnt; -+ iocb->u.c.offset = offset; -+} -+ -+/* Jeff Moyer says this was implemented in Red Hat AS2.1 and RHEL3. -+ * AFAICT, it was never in mainline, and should not be used. --RR */ -+static inline void io_prep_poll(struct iocb *iocb, int fd, int events) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_POLL; -+ iocb->aio_reqprio = 0; -+ iocb->u.poll.events = events; -+} -+ -+static inline int io_poll(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd, int events) -+{ -+ io_prep_poll(iocb, fd, events); -+ io_set_callback(iocb, cb); -+ return io_submit(ctx, 1, &iocb); -+} -+ -+static inline void io_prep_fsync(struct iocb *iocb, int fd) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_FSYNC; -+ iocb->aio_reqprio = 0; -+} -+ -+static inline int io_fsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) -+{ -+ io_prep_fsync(iocb, fd); -+ io_set_callback(iocb, cb); -+ return io_submit(ctx, 1, &iocb); -+} -+ -+static inline void io_prep_fdsync(struct iocb *iocb, int fd) -+{ -+ memset(iocb, 0, sizeof(*iocb)); -+ iocb->aio_fildes = fd; -+ iocb->aio_lio_opcode = IO_CMD_FDSYNC; -+ iocb->aio_reqprio = 0; -+} -+ -+static inline int io_fdsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd) -+{ -+ io_prep_fdsync(iocb, fd); -+ io_set_callback(iocb, cb); -+ return io_submit(ctx, 1, &iocb); -+} -+ -+static inline void io_set_eventfd(struct iocb *iocb, int eventfd) -+{ -+ iocb->u.c.flags |= (1 << 0) /* IOCB_FLAG_RESFD */; -+ iocb->u.c.resfd = eventfd; -+} -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* __LIBAIO_H */ -diff -uNr libaio-0.3.109-orig/src/syscall.h libaio-0.3.109/src/syscall.h ---- libaio-0.3.109-orig/src/syscall.h 2009-10-09 13:17:02.000000000 -0500 -+++ libaio-0.3.109/src/syscall.h 2011-04-03 12:53:53.000000000 -0500 -@@ -24,6 +24,8 @@ - #include "syscall-alpha.h" - #elif defined(__arm__) - #include "syscall-arm.h" -+#elif defined(__sparc__) -+#include "syscall-sparc.h" - #else - #error "add syscall-arch.h" - #endif -diff -uNr libaio-0.3.109-orig/src/syscall.h.orig libaio-0.3.109/src/syscall.h.orig ---- libaio-0.3.109-orig/src/syscall.h.orig 1969-12-31 18:00:00.000000000 -0600 -+++ libaio-0.3.109/src/syscall.h.orig 2009-10-09 13:17:02.000000000 -0500 -@@ -0,0 +1,29 @@ -+#include -+#include -+ -+#define _SYMSTR(str) #str -+#define SYMSTR(str) _SYMSTR(str) -+ -+#define SYMVER(compat_sym, orig_sym, ver_sym) \ -+ __asm__(".symver " SYMSTR(compat_sym) "," SYMSTR(orig_sym) "@LIBAIO_" SYMSTR(ver_sym)); -+ -+#define DEFSYMVER(compat_sym, orig_sym, ver_sym) \ -+ __asm__(".symver " SYMSTR(compat_sym) "," SYMSTR(orig_sym) "@@LIBAIO_" SYMSTR(ver_sym)); -+ -+#if defined(__i386__) -+#include "syscall-i386.h" -+#elif defined(__x86_64__) -+#include "syscall-x86_64.h" -+#elif defined(__ia64__) -+#include "syscall-ia64.h" -+#elif defined(__PPC__) -+#include "syscall-ppc.h" -+#elif defined(__s390__) -+#include "syscall-s390.h" -+#elif defined(__alpha__) -+#include "syscall-alpha.h" -+#elif defined(__arm__) -+#include "syscall-arm.h" -+#else -+#error "add syscall-arch.h" -+#endif -diff -uNr libaio-0.3.109-orig/src/syscall-sparc.h libaio-0.3.109/src/syscall-sparc.h ---- libaio-0.3.109-orig/src/syscall-sparc.h 1969-12-31 18:00:00.000000000 -0600 -+++ libaio-0.3.109/src/syscall-sparc.h 2011-04-03 12:51:33.000000000 -0500 -@@ -0,0 +1,118 @@ -+#include -+ -+#define __NR_io_setup 268 -+#define __NR_io_destroy 269 -+#define __NR_io_submit 270 -+#define __NR_io_cancel 271 -+#define __NR_io_getevents 272 -+ -+#define io_syscall1(type,fname,sname,type1,arg1) \ -+type fname(type1 arg1) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res >= 0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -+ -+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -+type fname(type1 arg1,type2 arg2) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res >= 0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -+ -+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -+type fname(type1 arg1,type2 arg2,type3 arg3) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -+ -+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -+type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+register long __o3 __asm__ ("o3") = (long)(arg4); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} -+ -+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ -+ type5,arg5) \ -+type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+register long __o3 __asm__ ("o3") = (long)(arg4); \ -+register long __o4 __asm__ ("o4") = (long)(arg5); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+errno = -__res; \ -+return -1; \ -+} diff --git a/SPECS/libaio.spec b/SPECS/libaio.spec index d66b9e6..b58e7a7 100644 --- a/SPECS/libaio.spec +++ b/SPECS/libaio.spec @@ -1,13 +1,14 @@ Name: libaio Version: 0.3.109 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Linux-native asynchronous I/O access library License: LGPLv2+ Group: System Environment/Libraries Source: http://git.fedorahosted.org/cgit/libaio.git/snapshot/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root Patch1: libaio-install-to-slash.patch -Patch2: libaio-sparc.patch +Patch2: libaio-add-arm64-support.patch +Patch3: libaio-arm64-fix-test-case-16.patch %description The Linux-native asynchronous I/O facility ("async I/O", or "aio") has a @@ -31,9 +32,12 @@ for the Linux-native asynchronous I/O facility ("async I/O", or "aio"). %prep %setup -a 0 -%patch1 -p1 +%patch1 -p1 -b .install-to-slash +%patch2 -p0 -b .add-arm64-support +%patch2 -p1 -b .add-arm64-support +%patch3 -p0 -b .arm64-fix-testcase-16 +%patch3 -p1 -b .arm64-fix-testcase-16 mv %{name}-%{version} compat-%{name}-%{version} -%patch2 -p1 %build # A library with a soname of 1.0.0 was inadvertantly released. This @@ -73,6 +77,18 @@ make destdir=$RPM_BUILD_ROOT prefix=/ libdir=%{libdir} usrlibdir=%{usrlibdir} \ %exclude %{_libdir}/libaio.a %changelog +* Fri Aug 29 2014 Jeff Moyer 0.3.109-13 +- Merge aarch64 branch into the main tree +- Resolves: bz#1026429 + +* Thu Mar 13 2014 Jeff Moyer - 0.3.109-12.2 +- Get rid of sparc support (we don't build it) (Jeff Moyer) +- Implement proper support for aarch64 (Jeff Moyer) +- Resolves: bz#1026429 + +* Tue Feb 4 2014 Brendan Conoboy - 0.3.109-12.1 +- Marcin's initial aarch64 compatibility patch. + * Fri Jan 24 2014 Daniel Mach - 0.3.109-12 - Mass rebuild 2014-01-24