From 8b95444d13de1a422aa88e1a9de2cb34700fd223 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Mon, 10 Aug 2015 15:22:55 -0600
Subject: [PATCH] Update to 1.8.8

- Drop atomic patch applied upstream
---
 .gitignore           |  1 +
 openmpi-atomic.patch | 60 --------------------------------------------
 openmpi.spec         |  9 ++++---
 sources              |  2 +-
 4 files changed, 7 insertions(+), 65 deletions(-)
 delete mode 100644 openmpi-atomic.patch

diff --git a/.gitignore b/.gitignore
index 225b4ce..939e56f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ openmpi-1.4.1-RH.tar.bz2
 /openmpi-1.8.5.tar.bz2
 /openmpi-1.8.6.tar.bz2
 /openmpi-1.8.7.tar.bz2
+/openmpi-1.8.8.tar.bz2
diff --git a/openmpi-atomic.patch b/openmpi-atomic.patch
deleted file mode 100644
index 509e8e5..0000000
--- a/openmpi-atomic.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- openmpi-v1.8.4-134-g9ad2aa8/opal/include/opal/sys/ia32/atomic.h.orig	2015-03-24 19:21:55.000000000 -0600
-+++ openmpi-v1.8.4-134-g9ad2aa8/opal/include/opal/sys/ia32/atomic.h	2015-03-27 08:09:41.140745019 -0600
-@@ -1,3 +1,4 @@
-+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
- /*
-  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
-  *                         University Research and Technology
-@@ -10,6 +11,8 @@
-  * Copyright (c) 2004-2005 The Regents of the University of California.
-  *                         All rights reserved.
-  * Copyright (c) 2007-2010 Oracle and/or its affiliates.  All rights reserved.
-+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
-+ *                         reserved.
-  * $COPYRIGHT$
-  * 
-  * Additional copyrights may follow
-@@ -155,6 +158,25 @@
- 
- #if OMPI_GCC_INLINE_ASSEMBLY
- 
-+#define OPAL_HAVE_ATOMIC_SWAP_32 1
-+
-+static inline int32_t opal_atomic_swap_32( volatile int32_t *addr,
-+					   int32_t newval)
-+{
-+    int32_t oldval;
-+
-+    __asm__ __volatile__("xchg %1, %0" :
-+			 "=r" (oldval), "=m" (*addr) :
-+			 "0" (newval), "m" (*addr) :
-+			 "memory");
-+    return oldval;
-+}
-+
-+#endif /* OPAL_GCC_INLINE_ASSEMBLY */
-+
-+
-+#if OPAL_GCC_INLINE_ASSEMBLY
-+
- /**
-  * atomic_add - add integer to atomic variable
-  * @i: integer value to add
-@@ -167,7 +189,7 @@
-     int ret = i;
-    __asm__ __volatile__(
-                         SMPLOCK "xaddl %1,%0"
--                        :"=m" (*v), "+r" (ret)
-+                        :"+m" (*v), "+r" (ret)
-                         :"m" (*v)
-                         :"memory", "cc"
-                         );
-@@ -187,7 +209,7 @@
-     int ret = -i;
-    __asm__ __volatile__(
-                         SMPLOCK "xaddl %1,%0"
--                        :"=m" (*v), "+r" (ret)
-+                        :"+m" (*v), "+r" (ret)
-                         :"m" (*v)
-                         :"memory", "cc"
-                         );
diff --git a/openmpi.spec b/openmpi.spec
index bb17313..6bdc8d8 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -21,7 +21,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:			openmpi%{?_cc_name_suffix}
-Version:		1.8.7
+Version:		1.8.8
 Release:		1%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
@@ -32,8 +32,6 @@ URL:			http://www.open-mpi.org/
 Source0:		http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-%{version}.tar.bz2
 Source1:		openmpi.module.in
 Source2:		macros.openmpi
-# Upstream patch to fix atomics on 32bit
-Patch0:			openmpi-atomic.patch
 
 BuildRequires:		gcc-gfortran
 #sparc64 don't have valgrind
@@ -111,7 +109,6 @@ Contains development wrapper for compiling Java with openmpi.
 
 %prep
 %setup -q -n openmpi-%{version}
-%patch0 -p1 -b .atomic
 
 %build
 ./configure --prefix=%{_libdir}/%{name} \
@@ -234,6 +231,10 @@ make check
 
 
 %changelog
+* Mon Aug 10 2015 Orion Poplawski <orion@cora.nwra.com> 1.8.8-1
+- Update to 1.8.8
+- Drop atomic patch applied upstream
+
 * Wed Jul 15 2015 Orion Poplawski <orion@cora.nwra.com> 1.8.7-1
 - Update to 1.8.7
 
diff --git a/sources b/sources
index cb05f23..7418555 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2485ed6fa0fab9bb5b4e7a9f63718630  openmpi-1.8.7.tar.bz2
+0dab8e602372da1425e9242ae37faf8c  openmpi-1.8.8.tar.bz2