diff --git a/papi-rmb.patch b/papi-rmb.patch new file mode 100644 index 0000000..78525aa --- /dev/null +++ b/papi-rmb.patch @@ -0,0 +1,31 @@ +From 4375fe0bd76f6a05c93c3334f8f2ab7aaa7d29f4 Mon Sep 17 00:00:00 2001 +From: William Cohen +Date: Mon, 15 Apr 2013 17:22:16 -0400 +Subject: [PATCH] Use rmb() for the missing mb() definition + +Commit 59d3d7584b2925bd05b4b5d0f4fe89666eb8494a removed the definition of +mb(). mb() was defined as rmb(). This just corrects it back. + +Signed-off-by: William Cohen +--- + src/linux-lock.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/linux-lock.h b/src/linux-lock.h +index 741e352..6fe1da5 100644 +--- a/src/linux-lock.h ++++ b/src/linux-lock.h +@@ -186,8 +186,8 @@ static inline int __arm_papi_spin_lock (volatile unsigned int *lock) + + return 0; + } +-#define _papi_hwd_lock(lck) { mb(); __arm_papi_spin_lock(&_papi_hwd_lock_data[lck]); mb(); } +-#define _papi_hwd_unlock(lck) { mb(); _papi_hwd_lock_data[lck] = 0; mb(); } ++#define _papi_hwd_lock(lck) { rmb(); __arm_papi_spin_lock(&_papi_hwd_lock_data[lck]); rmb(); } ++#define _papi_hwd_unlock(lck) { rmb(); _papi_hwd_lock_data[lck] = 0; rmb(); } + + #elif defined(__mips__) + static inline void __raw_spin_lock(volatile unsigned int *lock) +-- +1.8.1.4 + diff --git a/papi.spec b/papi.spec index 261802a..2f6f5fb 100644 --- a/papi.spec +++ b/papi.spec @@ -2,11 +2,12 @@ Summary: Performance Application Programming Interface Name: papi Version: 5.1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Development/System URL: http://icl.cs.utk.edu/papi/ Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz +Patch10: papi-rmb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ncurses-devel BuildRequires: gcc-gfortran @@ -47,6 +48,7 @@ the PAPI user-space libraries and interfaces. %prep %setup -q -n papi-5.1.0 +%patch10 -p1 -b .rmb %build %if %{without bundled_libpfm} @@ -109,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.a %changelog +* Mon Apr 15 2013 William Cohen - 5.1.0.2-2 +- Fix arm FTBS rhbz 951806. + * Tue Apr 9 2013 William Cohen - 5.1.0.2-1 - Rebase to 5.1.0.2