diff -ruN rpmbuild-orig/SPECS/openmpi.spec rpmbuild/SPECS/openmpi.spec
--- rpmbuild-orig/SPECS/openmpi.spec	2016-01-28 16:34:22.000000000 +0100
+++ rpmbuild/SPECS/openmpi.spec	2016-06-19 01:58:21.258330430 +0200
@@ -22,7 +22,7 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		1.10.2
-Release:		2%{?dist}
+Release:		2%{?dist}.0
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD, MIT and Romio
@@ -149,6 +149,12 @@
 %global modeflag -m64
 %endif
 
+# armv5tel is 32-bit so disable 64-bit code
+sed -i -e 's/OPAL_HAVE_ATOMIC_CMPSET_64 1/OPAL_HAVE_ATOMIC_CMPSET_64 0/' opal/include/opal/sys/sync_builtin/atomic.h
+sed -i -e 's/OPAL_HAVE_ATOMIC_MATH_64 1/OPAL_HAVE_ATOMIC_MATH_64 0/'     opal/include/opal/sys/sync_builtin/atomic.h
+sed -i -e 's/OPAL_HAVE_ATOMIC_ADD_64 1/OPAL_HAVE_ATOMIC_ADD_64 0/'       opal/include/opal/sys/sync_builtin/atomic.h
+sed -i -e 's/OPAL_HAVE_ATOMIC_SUB_64 1/OPAL_HAVE_ATOMIC_SUB_64 0/'       opal/include/opal/sys/sync_builtin/atomic.h
+
 %build
 # Note that the versions of libevent and hwloc shipped in RHEL-6 are too
 # old for openmpi-1.10.2 to use, therefore we have to use the internal version.
@@ -165,6 +171,9 @@
 	--with-valgrind \
 	--enable-memchecker \
 %endif
+%ifarch aarch64 %arm
+        --enable-builtin-atomics \
+%endif
 	--with-libltdl=/usr \
 	--with-wrapper-cflags="%{?modeflag}" \
 	--with-wrapper-cxxflags="%{?modeflag}" \
@@ -284,6 +293,9 @@
 %{macrosdir}/macros.%{namearch}
 
 %changelog
+* Sat Jun 18 2016 Bjarne Saltbaek <bjarne@redsleeve.org> 1.10.2-2.0
+- Disabled 64 bit assembler code for 32 bit ARM
+
 * Thu Jan 28 2016 Michal Schmidt <mschmidt@redhat.com> 1.10.2-2
 - Name the binary package "openmpi-1.10". The provide name "openmpi"
   remains to openmpi-1.8 for maximum compatibility with RHEL 6.7.
