merged
authorwenzelm
Sun, 22 Jul 2018 14:15:04 +0200
changeset 68676 74cb08ff2e66
parent 68674 f4ac69fe4509 (current diff)
parent 68675 4535a45182d5 (diff)
child 68677 99b1cf1e2d48
child 68678 daf21cb6ebc1
merged
--- a/Admin/components/components.sha1	Sun Jul 22 13:29:41 2018 +0200
+++ b/Admin/components/components.sha1	Sun Jul 22 14:15:04 2018 +0200
@@ -170,6 +170,7 @@
 0b896ccc35bd3f2541cd55e6f0ed14637ed9fc68  polyml-5.7.1-4.tar.gz
 262450ac9966abebae2e1d4f9ae703cfe0f5d8d9  polyml-5.7.1-5.tar.gz
 1aeb57877d694db7fe4d4395287cddf3bc77710b  polyml-5.7.1-6.tar.gz
+e3e7e20b1e0e5d5d68df4cd4caa1e1a7410d46b6  polyml-5.7.1-7.tar.gz
 171b5783b88522a35e4822b19ef8ba838c04f494  polyml-5.7.1.tar.gz
 80b923fca3533bf291ff9da991f2262a98b68cc4  polyml-5.7-20170217.tar.gz
 5fbcab1da2b5eb97f24da2590ece189d55b3a105  polyml-5.7.tar.gz
--- a/Admin/components/main	Sun Jul 22 13:29:41 2018 +0200
+++ b/Admin/components/main	Sun Jul 22 14:15:04 2018 +0200
@@ -11,7 +11,7 @@
 jortho-1.0-2
 kodkodi-1.5.2
 nunchaku-0.5
-polyml-5.7.1-6
+polyml-5.7.1-7
 postgresql-42.2.2
 scala-2.12.6
 smbc-0.4.1
--- a/Admin/polyml/README	Sun Jul 22 13:29:41 2018 +0200
+++ b/Admin/polyml/README	Sun Jul 22 14:15:04 2018 +0200
@@ -2,8 +2,8 @@
 ====================
 
 This compilation of Poly/ML 5.7.1 (http://www.polyml.org) is based on the
-source distribution from https://github.com/polyml/polyml/releases/tag/v5.7.1
-with commit 86c52cbd8f6d from the "fixes-5.7.1" branch.
+source distribution from https://github.com/polyml/polyml/commits/fixes-5.7.1
+commit 31643fd67f47.
 
 The Isabelle repository provides the administrative tool "build_polyml",
 which can be used in the polyml component directory as follows.
@@ -54,4 +54,4 @@
 
 
         Makarius
-        20-Jun-2018
+        22-Jul-2018
--- a/src/Pure/Concurrent/synchronized.ML	Sun Jul 22 13:29:41 2018 +0200
+++ b/src/Pure/Concurrent/synchronized.ML	Sun Jul 22 14:15:04 2018 +0200
@@ -54,7 +54,7 @@
           Immutable _ => immutable_fail name
         | Mutable _ =>
             Thread_Attributes.uninterruptible (fn _ => fn () =>
-             (state := Immutable x; (* FIXME RunCall.clearMutableBit state; *)
+             (state := Immutable x; RunCall.clearMutableBit state;
                ConditionVar.broadcast cond)) ())));