|
|
0f8c4ed |
From ee9fb5a49454a835f301656107a798f40d2a30d8 Mon Sep 17 00:00:00 2001
|
|
|
0f8c4ed |
From: Patrick Diehl <me@diehlpk.de>
|
|
|
0f8c4ed |
Date: Sat, 15 Dec 2018 13:31:16 -0600
|
|
|
0f8c4ed |
Subject: [PATCH] Fix compilation error n arm7 architecture. Compiles and runs
|
|
|
0f8c4ed |
on Fedora 29 on Pi 3.
|
|
|
0f8c4ed |
|
|
|
0f8c4ed |
---
|
|
|
0f8c4ed |
hpx/lcos/local/spinlock.hpp | 4 ++--
|
|
|
0f8c4ed |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
0f8c4ed |
|
|
|
0f8c4ed |
diff --git a/hpx/lcos/local/spinlock.hpp b/hpx/lcos/local/spinlock.hpp
|
|
|
0f8c4ed |
index 7c43fc5fd8b..54f66dc3229 100644
|
|
|
0f8c4ed |
--- a/hpx/lcos/local/spinlock.hpp
|
|
|
0f8c4ed |
+++ b/hpx/lcos/local/spinlock.hpp
|
|
|
0f8c4ed |
@@ -2,8 +2,8 @@
|
|
|
0f8c4ed |
// Copyright (c) 2011 Bryce Lelbach
|
|
|
0f8c4ed |
// Copyright (c) 2011-2018 Hartmut Kaiser
|
|
|
0f8c4ed |
// Copyright (c) 2014 Thomas Heller
|
|
|
0f8c4ed |
-//
|
|
|
0f8c4ed |
// Copyright (c) 2008 Peter Dimov
|
|
|
0f8c4ed |
+// Copyright (c) 2018 Patrick Diehl
|
|
|
0f8c4ed |
//
|
|
|
0f8c4ed |
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
|
0f8c4ed |
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
|
|
0f8c4ed |
@@ -28,7 +28,7 @@
|
|
|
0f8c4ed |
# include <boost/detail/interlocked.hpp>
|
|
|
0f8c4ed |
# endif
|
|
|
0f8c4ed |
#else
|
|
|
0f8c4ed |
-# if !defined(__ANDROID__) && !defined(ANDROID) && !defined(__arm__)
|
|
|
0f8c4ed |
+# if !defined(__ANDROID__) && !defined(ANDROID)
|
|
|
0f8c4ed |
# include <boost/smart_ptr/detail/spinlock.hpp>
|
|
|
0f8c4ed |
# if defined(__ia64__) && defined(__INTEL_COMPILER)
|
|
|
0f8c4ed |
# include <ia64intrin.h>
|