[polyml] 02/03: Drop request-completed-volatile-barrier.diff (not a correct fix)

[James Clarke]

This is an automated email from the git hooks/post-receive script.

jrtc27-guest pushed a commit to branch master
in repository polyml.

commit 9f44d909ba2eab0e44ea722e931197020b0bbf83
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Tue Apr 12 22:54:47 2016 +0100

    Drop request-completed-volatile-barrier.diff (not a correct fix)
---
 debian/changelog                                      |  3 +++
 .../patches/request-completed-volatile-barrier.diff   | 19 -------------------
 debian/patches/series                                 |  1 -
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56d5a0f..a8830a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 polyml (5.6-5) UNRELEASED; urgency=low
 
   * Bump up Standards-Version to 3.9.8
+  * Removed patches:
+    - request-completed-volatile-barrier.diff: Not a correct fix, as discussed
+    with upstream in https://github.com/polyml/polyml/pull/49.
 
  -- James Clarke <jrtc27 at jrtc27.com>  Tue, 12 Apr 2016 22:48:08 +0100
 
diff --git a/debian/patches/request-completed-volatile-barrier.diff b/debian/patches/request-completed-volatile-barrier.diff
deleted file mode 100644
index accd0a7..0000000
--- a/debian/patches/request-completed-volatile-barrier.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Make MainThreadRequest completed field volatile
- This is accessed across threads and thus needs to be volatile in order
- to avoid compiler optimisations breaking memory access order. This fixes
- Tests/Succeed/Test120.ML sometimes deadlocking on HP PA-RISC.
-Author: James Clarke <jrtc27 at jrtc27.com>
-Forwarded: https://github.com/polyml/polyml/pull/49
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/libpolyml/processes.h
-+++ b/libpolyml/processes.h
-@@ -225,7 +225,7 @@
-     MainThreadRequest (enum _mainThreadPhase phase): mtp(phase), completed(false) {}
-     virtual ~MainThreadRequest () {} // Suppress silly GCC warning
-     const enum _mainThreadPhase mtp;
--    bool completed;
-+    volatile bool completed;
-     virtual void Perform() = 0;
- };
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9b626dc..173b9bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,4 +23,3 @@ maxhostnamelen.diff
 sparc64.diff
 sh.diff
 hppa.diff
-request-completed-volatile-barrier.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/polyml.git