# HG changeset patch
# User wenzelm
# Date 1318686910 -7200
# Node ID c23029f6357f2a41f9bdcaaf7bc7e8165138a160
# Parent  5465824c1c8d9a209d970110747cb51f393f384b
updated to polyml-5.4.1;

diff -r 5465824c1c8d -r c23029f6357f Admin/CHECKLIST
--- a/Admin/CHECKLIST	Sat Oct 15 00:18:00 2011 +0200
+++ b/Admin/CHECKLIST	Sat Oct 15 15:55:10 2011 +0200
@@ -1,7 +1,7 @@
 Checklist for official releases
 ===============================
 
-- test polyml-5.4.0, polyml-5.3.0, polyml-5.2.1, smlnj;
+- test polyml-5.4.1, polyml-5.4.0, polyml-5.3.0, polyml-5.2.1, smlnj;
 
 - test Proof General 4.1, 3.7.1.1;
 
diff -r 5465824c1c8d -r c23029f6357f Admin/polyml/README
--- a/Admin/polyml/README	Sat Oct 15 00:18:00 2011 +0200
+++ b/Admin/polyml/README	Sat Oct 15 15:55:10 2011 +0200
@@ -1,35 +1,8 @@
 Poly/ML for Isabelle
 ====================
 
-This compilation of Poly/ML 5.4 is based on the official sources from
-http://www.polyml.org with the following patch from the SVN (which is
-also part of the fixes-5.4 source tree):
-
-------------------------------------------------------------------------
-r1214 | dcjm | 2010-09-14 20:03:52 +0200 (Tue, 14 Sep 2010) | 1 line
-
-Fix to arbitrary precision emulation for X86.  A GC during emulating
-an operation could cause the stack to move resulting in the result of
-the operation not being stored into the result register.
-------------------------------------------------------------------------
-diff libpolyml/x86_dep.cpp libpolyml/x86_dep.cpp.orig
-1308,1311c1308
-<                     if (! inConsts) {
-<                         destReg = get_reg(taskData, rrr); // May have moved because of a GC.
-<                         *destReg = PolyWord::FromUnsigned(destReg->AsUnsigned()+1);
-<                     }
----
->                     if (! inConsts) *destReg = PolyWord::FromUnsigned(destReg->AsUnsigned()+1);
-1344,1347c1341
-<                     if (! inConsts) {
-<                         destReg = get_reg(taskData, rrr); // May have moved because of a GC.
-<                         *destReg = PolyWord::FromUnsigned(destReg->AsUnsigned()-1);
-<                     }
----
->                     if (! inConsts) *destReg = PolyWord::FromUnsigned(destReg->AsUnsigned()-1);
-
-------------------------------------------------------------------------
-
+This compilation of Poly/ML 5.4.1 is based on the official sources
+from http://www.polyml.org
 
 The included build script is used like this:
 
@@ -42,10 +15,9 @@
 The multi-platform directory layout for executables and shared
 libraries accommodates the standard ML_HOME settings for Isabelle.
 
-
 Also note that the separate "sha1" library module is required for
 efficient digesting of strings according to SHA-1.
 
 
 	Makarius
-	20-Dec-2010
+	15-Oct-2011
diff -r 5465824c1c8d -r c23029f6357f etc/settings
--- a/etc/settings	Sat Oct 15 00:18:00 2011 +0200
+++ b/etc/settings	Sat Oct 15 15:55:10 2011 +0200
@@ -29,14 +29,14 @@
 ML_SOURCES="$ML_HOME/../src"
 
 # Poly/ML 32 bit (manual settings)
-#ML_SYSTEM=polyml-5.4.0
+#ML_SYSTEM=polyml-5.4.1
 #ML_PLATFORM="$ISABELLE_PLATFORM"
 #ML_HOME="$ISABELLE_HOME/contrib/$ML_SYSTEM/$ML_PLATFORM"
 #ML_OPTIONS="-H 500"
 #ML_SOURCES="$ML_HOME/../src"
 
 # Poly/ML 64 bit (manual settings)
-#ML_SYSTEM=polyml-5.4.0
+#ML_SYSTEM=polyml-5.4.1
 #ML_PLATFORM="${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM}"
 #ML_HOME="$ISABELLE_HOME/contrib/$ML_SYSTEM/$ML_PLATFORM"
 #ML_OPTIONS="-H 1000"
diff -r 5465824c1c8d -r c23029f6357f src/Pure/ML/ml_compiler_polyml-5.3.ML
--- a/src/Pure/ML/ml_compiler_polyml-5.3.ML	Sat Oct 15 00:18:00 2011 +0200
+++ b/src/Pure/ML/ml_compiler_polyml-5.3.ML	Sat Oct 15 15:55:10 2011 +0200
@@ -1,7 +1,7 @@
 (*  Title:      Pure/ML/ml_compiler_polyml-5.3.ML
     Author:     Makarius
 
-Advanced runtime compilation for Poly/ML 5.3.0.
+Advanced runtime compilation for Poly/ML 5.3.0 or later.
 *)
 
 structure ML_Compiler: ML_COMPILER =