merged
authorwenzelm
Tue, 11 May 2021 14:04:36 +0200
changeset 73926 4121fc47432b
parent 73920 6e26d06b24b1 (current diff)
parent 73925 02351b514b34 (diff)
child 73927 edb01b64dc16
child 73928 7404f2e1d092
merged
--- a/Admin/polyml/README	Mon May 10 19:46:01 2021 +0000
+++ b/Admin/polyml/README	Tue May 11 14:04:36 2021 +0200
@@ -37,16 +37,22 @@
 
 * Download:
 
-  $ curl https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz | xz -dc | tar xf -
-  $ cd gmp-6.1.2
+  $ curl https://gmplib.org/download/gmp/gmp-6.2.1.tar.bz2 | tar xjf -
+  $ cd gmp-6.2.1
 
 * build:
 
   $ make distclean
+
+  #Intel
   $ ./configure --enable-cxx --build=core2-apple-darwin"$(uname -r)"
+
+  #ARM
+  $ ./configure --enable-cxx --build=aarch64-apple-darwin"$(uname -r)"
+
   $ make && make check
   $ sudo make install
 
 
         Makarius
-        07-May-2021
+        11-May-2021
--- a/src/Doc/JEdit/JEdit.thy	Mon May 10 19:46:01 2021 +0000
+++ b/src/Doc/JEdit/JEdit.thy	Tue May 11 14:04:36 2021 +0200
@@ -206,7 +206,7 @@
   is no longer affected by change of default properties.
 
   Users may modify their keymap later, but this can lead to conflicts with
-  \<^verbatim>\<open>shortcut\<close> properties in \<^file>\<open>$JEDIT_HOME/src/jEdit.props\<close>.
+  \<^verbatim>\<open>shortcut\<close> properties in \<^file>\<open>$JEDIT_HOME/dist/properties/jEdit.props\<close>.
 
   The action @{action_def "isabelle.keymap-merge"} helps to resolve pending
   Isabelle keymap changes wrt. the current jEdit keymap; non-conflicting
--- a/src/Pure/Admin/build_jedit.scala	Mon May 10 19:46:01 2021 +0000
+++ b/src/Pure/Admin/build_jedit.scala	Tue May 11 14:04:36 2021 +0200
@@ -72,7 +72,7 @@
 
 <!-- """ + XML.text(description) + """ mode -->
 <MODE>
-  <PROPS>""" + properties.mkString("\n", "\n", "\n") + """
+  <PROPS>""" + properties.mkString("\n", "\n", "") + """
   </PROPS>
 </MODE>
 """)
--- a/src/Pure/Admin/build_polyml.scala	Mon May 10 19:46:01 2021 +0000
+++ b/src/Pure/Admin/build_polyml.scala	Tue May 11 14:04:36 2021 +0200
@@ -26,10 +26,7 @@
         libs = Set("libgmp")),
     "darwin" ->
       Platform_Info(
-        options =
-          List("--build=x86_64-darwin", "CFLAGS=-arch x86_64 -O3 -I../libffi/include",
-            "CXXFLAGS=-arch x86_64 -O3 -I../libffi/include", "CCASFLAGS=-arch x86_64",
-            "LDFLAGS=-segprot POLY rwx rwx"),
+        options = List("CFLAGS=-O3", "CXXFLAGS=-O3", "LDFLAGS=-segprot POLY rwx rwx"),
         setup = "PATH=/usr/bin:/bin:/usr/sbin:/sbin",
         libs = Set("libpolyml", "libgmp")),
     "windows" ->
@@ -51,12 +48,9 @@
       error("Bad Poly/ML root directory: " + root)
 
     val platform = Isabelle_Platform.self
-    val platform_arch =
-      if (arch_64) platform.arch_64
-      else if (platform.is_intel) "x86_64_32"
-      else platform.arch_32
 
-    val polyml_platform = platform_arch + "-" + platform.os_name
+    val polyml_platform =
+      (if (arch_64) platform.arch_64 else platform.arch_64_32) + "-" + platform.os_name
     val sha1_platform = platform.arch_64 + "-" + platform.os_name
 
     val info =
@@ -207,7 +201,7 @@
     Isabelle_Tool("build_polyml", "build Poly/ML from sources", Scala_Project.here, args =>
     {
       var mingw = MinGW.none
-      var arch_64 = Isabelle_Platform.self.is_arm
+      var arch_64 = false
       var sha1_root: Option[Path] = None
 
       val getopts = Getopts("""
--- a/src/Pure/System/isabelle_platform.scala	Mon May 10 19:46:01 2021 +0000
+++ b/src/Pure/System/isabelle_platform.scala	Tue May 11 14:04:36 2021 +0200
@@ -15,7 +15,8 @@
       "ISABELLE_PLATFORM32",
       "ISABELLE_PLATFORM64",
       "ISABELLE_WINDOWS_PLATFORM32",
-      "ISABELLE_WINDOWS_PLATFORM64")
+      "ISABELLE_WINDOWS_PLATFORM64",
+      "ISABELLE_APPLE_PLATFORM64")
 
   def apply(ssh: Option[SSH.Session] = None): Isabelle_Platform =
   {
@@ -46,25 +47,21 @@
       getOrElse(error("Bad platform settings variable: " + quote(name)))
 
   val ISABELLE_PLATFORM_FAMILY: String = get("ISABELLE_PLATFORM_FAMILY")
-  val ISABELLE_PLATFORM32: String = get("ISABELLE_PLATFORM32")
   val ISABELLE_PLATFORM64: String = get("ISABELLE_PLATFORM64")
-  val ISABELLE_WINDOWS_PLATFORM32: String = get("ISABELLE_WINDOWS_PLATFORM32")
   val ISABELLE_WINDOWS_PLATFORM64: String = get("ISABELLE_WINDOWS_PLATFORM64")
-
-  def is_intel: Boolean =
-    ISABELLE_PLATFORM32.startsWith("x86-") ||
-    ISABELLE_PLATFORM64.startsWith("x86_64-")
+  val ISABELLE_APPLE_PLATFORM64: String = get("ISABELLE_APPLE_PLATFORM64")
 
   def is_arm: Boolean =
-    ISABELLE_PLATFORM32.startsWith("arm32-") ||
-    ISABELLE_PLATFORM64.startsWith("arm64-")
+    ISABELLE_PLATFORM64.startsWith("arm64-") ||
+    ISABELLE_APPLE_PLATFORM64.startsWith("arm64-")
 
   def is_linux: Boolean = ISABELLE_PLATFORM_FAMILY == "linux"
   def is_macos: Boolean = ISABELLE_PLATFORM_FAMILY == "macos"
   def is_windows: Boolean = ISABELLE_PLATFORM_FAMILY == "windows"
 
-  def arch_32: String = if (is_arm) "arm32" else "x86"
   def arch_64: String = if (is_arm) "arm64" else "x86_64"
+  def arch_64_32: String = if (is_arm) "arm64_32" else "x86_64_32"
+
   def os_name: String = if (is_macos) "darwin" else ISABELLE_PLATFORM_FAMILY
 
   override def toString: String = ISABELLE_PLATFORM_FAMILY