# HG changeset patch
# User wenzelm
# Date 1506365001 -7200
# Node ID a8703e8ee1d317611d3247e811c4559a04b0f2e8
# Parent  6953b1a29e191128332e1156b9693d529975d995
basic support for x86_64-cygwin;

diff -r 6953b1a29e19 -r a8703e8ee1d3 Admin/PLATFORMS
--- a/Admin/PLATFORMS	Mon Sep 25 15:49:27 2017 +0100
+++ b/Admin/PLATFORMS	Mon Sep 25 20:43:21 2017 +0200
@@ -41,6 +41,7 @@
   x86-windows       Windows 7
   x86_64-windows    Windows 7
   x86-cygwin        Cygwin 2.8 http://isabelle.in.tum.de/cygwin_2017 (x86/release)
+  x86_64-cygwin     Cygwin 2.8 http://isabelle.in.tum.de/cygwin_2017 (x86_64/release)
 
 All of the above platforms are 100% supported by Isabelle -- end-users
 should not have to care about the differences (at least in theory).
@@ -67,7 +68,7 @@
 help configuring platform-dependent tools:
 
   ISABELLE_PLATFORM64  (potentially empty)
-  ISABELLE_PLATFORM32
+  ISABELLE_PLATFORM32  (potentially empty)
   ISABELLE_PLATFORM
 
 The ISABELLE_PLATFORM setting variable refers to the 32 bit version of
diff -r 6953b1a29e19 -r a8703e8ee1d3 Admin/bash_process/build
--- a/Admin/bash_process/build	Mon Sep 25 15:49:27 2017 +0100
+++ b/Admin/bash_process/build	Mon Sep 25 20:43:21 2017 +0200
@@ -42,7 +42,7 @@
   x86-linux | x86-darwin)
     cc -Wall -m32 bash_process.c -o "$TARGET/bash_process"
     ;;
-  x86-cygwin)
+  x86_64-cygwin | x86-cygwin)
     cc -Wall bash_process.c -o "$TARGET/bash_process.exe"
     ;;
   *)
diff -r 6953b1a29e19 -r a8703e8ee1d3 Admin/components/components.sha1
--- a/Admin/components/components.sha1	Mon Sep 25 15:49:27 2017 +0100
+++ b/Admin/components/components.sha1	Mon Sep 25 20:43:21 2017 +0200
@@ -1,6 +1,7 @@
 fbe83b522cb37748ac1b3c943ad71704fdde2f82  bash_process-1.1.1.tar.gz
 bb9ef498cd594b4289221b96146d529c899da209  bash_process-1.1.tar.gz
 81250148f8b89ac3587908fb20645081d7f53207  bash_process-1.2.1.tar.gz
+97b2491382130a841b3bbaebdcf8720c4d4fb227  bash_process-1.2.2.tar.gz
 9e21f447bfa0431ae5097301d553dd6df3c58218  bash_process-1.2.tar.gz
 e7ffe4238b61a3c1ee87aca4421e7a612e09b836  ci-extras-1.tar.gz
 70105fd6fbfd1a868383fc510772b95234325d31  csdp-6.x.tar.gz
@@ -144,6 +145,7 @@
 b668e1f43a41608a8eb365c5e19db6c54c72748a  polyml-5.5.3-20150911.tar.gz
 1f5cd9b1390dab13861f90dfc06d4180cc107587  polyml-5.5.3-20150916.tar.gz
 f78896e588e8ebb4da57bf0c95210b0f0fa9e551  polyml-5.6-1.tar.gz
+21fa0592b7dfd23269063f42604438165630c0f0  polyml-5.6-2.tar.gz
 03ba81e595fa6d6df069532d67ad3195c37d9046  polyml-5.6-20151123.tar.gz
 822f489c18e38ce5ef979ec21dccce4473e09be6  polyml-5.6-20151206.tar.gz
 bd6a448f0e0d5787747f4f30ca661f9c1868e4a7  polyml-5.6-20151223.tar.gz
diff -r 6953b1a29e19 -r a8703e8ee1d3 Admin/components/main
--- a/Admin/components/main	Mon Sep 25 15:49:27 2017 +0100
+++ b/Admin/components/main	Mon Sep 25 20:43:21 2017 +0200
@@ -1,5 +1,5 @@
 #main components for everyday use, without big impact on overall build time
-bash_process-1.2.1
+bash_process-1.2.2
 csdp-6.x
 cvc4-1.5-3
 e-2.0-1
@@ -10,7 +10,7 @@
 jortho-1.0-2
 kodkodi-1.5.2
 nunchaku-0.5
-polyml-5.6-1
+polyml-5.6-2
 postgresql-42.1.4
 scala-2.12.3
 smbc-0.4.1
diff -r 6953b1a29e19 -r a8703e8ee1d3 Admin/polyml/settings
--- a/Admin/polyml/settings	Mon Sep 25 15:49:27 2017 +0100
+++ b/Admin/polyml/settings	Mon Sep 25 20:43:21 2017 +0200
@@ -13,10 +13,10 @@
 fi
 
 case "${ISABELLE_PLATFORM}:${ML_SYSTEM_64}" in
-  x86-cygwin:true)
+  *-cygwin:true)
     PLATFORMS="x86_64-windows x86-windows"
     ;;
-  x86-cygwin:*)
+  *-cygwin:*)
     PLATFORMS="x86-windows x86_64-windows"
     ;;
   *:true)
diff -r 6953b1a29e19 -r a8703e8ee1d3 lib/scripts/isabelle-platform
--- a/lib/scripts/isabelle-platform	Mon Sep 25 15:49:27 2017 +0100
+++ b/lib/scripts/isabelle-platform	Mon Sep 25 20:43:21 2017 +0200
@@ -40,15 +40,18 @@
     ;;
   CYGWIN_NT*)
     ISABELLE_PLATFORM_FAMILY="windows"
+    if [ "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64" ]; then
+      ISABELLE_WINDOWS_PLATFORM32="x86-windows"
+      ISABELLE_WINDOWS_PLATFORM64="x86_64-windows"
+    else
+      ISABELLE_WINDOWS_PLATFORM32="x86-windows"
+    fi
     case $(uname -m) in
-      i?86 | x86_64)
+      x86_64)
+        ISABELLE_PLATFORM64=x86_64-cygwin
+        ;;
+      i?86)
         ISABELLE_PLATFORM32=x86-cygwin
-        if [ "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64" ]; then
-          ISABELLE_WINDOWS_PLATFORM32="x86-windows"
-          ISABELLE_WINDOWS_PLATFORM64="x86_64-windows"
-        else
-          ISABELLE_WINDOWS_PLATFORM32="x86-windows"
-        fi
         ;;
     esac
     ;;
@@ -62,5 +65,5 @@
     ;;
 esac
 
-ISABELLE_PLATFORM="$ISABELLE_PLATFORM32"
-ISABELLE_WINDOWS_PLATFORM="$ISABELLE_WINDOWS_PLATFORM32"
+ISABELLE_PLATFORM="${ISABELLE_PLATFORM32:-$ISABELLE_PLATFORM64}"
+ISABELLE_WINDOWS_PLATFORM="${ISABELLE_WINDOWS_PLATFORM32:-$ISABELLE_WINDOWS_PLATFORM64}"