diff --git a/.cvsignore b/.cvsignore index 0fbea19..72813c9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libaio-0.3.107.tar.gz +libaio-0.3.109.tar.gz diff --git a/libaio-sparc.patch b/libaio-sparc.patch deleted file mode 100644 index ee674a3..0000000 --- a/libaio-sparc.patch +++ /dev/null @@ -1,304 +0,0 @@ -diff -Nur libaio-0.3.107-orig/compat-libaio-0.3.107/src/libaio.h libaio-0.3.107/compat-libaio-0.3.107/src/libaio.h ---- libaio-0.3.107-orig/compat-libaio-0.3.107/src/libaio.h 2008-01-09 14:49:12.000000000 -0600 -+++ libaio-0.3.107/compat-libaio-0.3.107/src/libaio.h 2008-10-01 21:20:28.000000000 -0500 -@@ -73,6 +73,14 @@ - #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(__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 -Nur libaio-0.3.107-orig/compat-libaio-0.3.107/src/syscall.h libaio-0.3.107/compat-libaio-0.3.107/src/syscall.h ---- libaio-0.3.107-orig/compat-libaio-0.3.107/src/syscall.h 2005-04-01 14:31:32.000000000 -0600 -+++ libaio-0.3.107/compat-libaio-0.3.107/src/syscall.h 2008-10-01 21:20:28.000000000 -0500 -@@ -22,6 +22,8 @@ - #include "syscall-s390.h" - #elif defined(__alpha__) - #include "syscall-alpha.h" -+#elif defined(__sparc__) -+#include "syscall-sparc.h" - #else - #error "add syscall-arch.h" - #endif -diff -Nur libaio-0.3.107-orig/compat-libaio-0.3.107/src/syscall-sparc.h libaio-0.3.107/compat-libaio-0.3.107/src/syscall-sparc.h ---- libaio-0.3.107-orig/compat-libaio-0.3.107/src/syscall-sparc.h 1969-12-31 18:00:00.000000000 -0600 -+++ libaio-0.3.107/compat-libaio-0.3.107/src/syscall-sparc.h 2008-10-01 21:20:28.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 -Nur libaio-0.3.107-orig/src/libaio.h libaio-0.3.107/src/libaio.h ---- libaio-0.3.107-orig/src/libaio.h 2008-01-09 14:49:12.000000000 -0600 -+++ libaio-0.3.107/src/libaio.h 2008-10-01 21:13:51.000000000 -0500 -@@ -73,6 +73,14 @@ - #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(__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 -Nur libaio-0.3.107-orig/src/syscall.h libaio-0.3.107/src/syscall.h ---- libaio-0.3.107-orig/src/syscall.h 2005-04-01 14:31:32.000000000 -0600 -+++ libaio-0.3.107/src/syscall.h 2008-10-01 21:03:16.000000000 -0500 -@@ -22,6 +22,8 @@ - #include "syscall-s390.h" - #elif defined(__alpha__) - #include "syscall-alpha.h" -+#elif defined(__sparc__) -+#include "syscall-sparc.h" - #else - #error "add syscall-arch.h" - #endif -diff -Nur libaio-0.3.107-orig/src/syscall-sparc.h libaio-0.3.107/src/syscall-sparc.h ---- libaio-0.3.107-orig/src/syscall-sparc.h 1969-12-31 18:00:00.000000000 -0600 -+++ libaio-0.3.107/src/syscall-sparc.h 2008-10-01 21:01:49.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/libaio.spec b/libaio.spec index 3f4002a..b013e67 100644 --- a/libaio.spec +++ b/libaio.spec @@ -1,13 +1,12 @@ Name: libaio -Version: 0.3.107 -Release: 9%{?dist} +Version: 0.3.109 +Release: 1%{?dist} Summary: Linux-native asynchronous I/O access library License: LGPLv2+ Group: System Environment/Libraries -Source: %{name}-%{version}.tar.gz +Source: ftp://ftp.kernel.org/pub/linux/libs/aio/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root Patch1: libaio-install-to-slash.patch -Patch2: libaio-sparc.patch %description The Linux-native asynchronous I/O facility ("async I/O", or "aio") has a @@ -33,7 +32,6 @@ for the Linux-native asynchronous I/O facility ("async I/O", or "aio"). %setup -a 0 %patch1 -p1 mv %{name}-%{version} compat-%{name}-%{version} -%patch2 -p1 %build # A library with a soname of 1.0.0 was inadvertantly released. This @@ -73,6 +71,10 @@ make destdir=$RPM_BUILD_ROOT prefix=/ libdir=%{libdir} usrlibdir=%{usrlibdir} \ %attr(0644,root,root) %{_libdir}/libaio.a %changelog +* Fri Oct 9 2009 Jeff Moyer - 0.3.109-1 +- Pull in upstream .109 to get ARM architecture support. +- Remove the broken sparc patch; it should go upstream first. + * Fri Jul 24 2009 Fedora Release Engineering - 0.3.107-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 7d0140c..cc19ea4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db32c19c61ca937bcb1ba48da9180682 libaio-0.3.107.tar.gz +435a5b16ca6198eaf01155263d855756 libaio-0.3.109.tar.gz