Imported Upstream version 6.10.0.101

Former-commit-id: 83a210db4e58bb87425f179b210ee9c1914ac787

Makefile.in

@@ -385,6 +385,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -472,9 +477,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

acceptance-tests/Makefile.in.REMOVED.git-id

@@ -1 +1 @@
-02cf22b1a6f1207be80708fb28fb3494df2dac7d
+a1910ea7fa5f93873a406165ad72ebe1d0540f58

aclocal.m4

@@ -885,6 +885,241 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# ---------------------------------------------------------------------------
+# Adds support for distributing Python modules and packages.  To
+# install modules, copy them to $(pythondir), using the python_PYTHON
+# automake variable.  To install a package with the same name as the
+# automake package, install to $(pkgpythondir), or use the
+# pkgpython_PYTHON automake variable.
+#
+# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
+# locations to install python extension modules (shared libraries).
+# Another macro is required to find the appropriate flags to compile
+# extension modules.
+#
+# If your package is configured with a different prefix to python,
+# users will have to add the install directory to the PYTHONPATH
+# environment variable, or create a .pth file (see the python
+# documentation for details).
+#
+# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
+# cause an error if the version of python installed on the system
+# doesn't meet the requirement.  MINIMUM-VERSION should consist of
+# numbers and dots only.
+AC_DEFUN([AM_PATH_PYTHON],
+ [
+  dnl Find a Python interpreter.  Python versions prior to 2.0 are not
+  dnl supported. (2.0 was released on October 16, 2000).
+  m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
+ python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
+
+  AC_ARG_VAR([PYTHON], [the Python interpreter])
+
+  m4_if([$1],[],[
+    dnl No version check is needed.
+    # Find any Python interpreter.
+    if test -z "$PYTHON"; then
+      AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
+    fi
+    am_display_PYTHON=python
+  ], [
+    dnl A version check is needed.
+    if test -n "$PYTHON"; then
+      # If the user set $PYTHON, use it and don't search something else.
+      AC_MSG_CHECKING([whether $PYTHON version is >= $1])
+      AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
+			      [AC_MSG_RESULT([yes])],
+			      [AC_MSG_RESULT([no])
+			       AC_MSG_ERROR([Python interpreter is too old])])
+      am_display_PYTHON=$PYTHON
+    else
+      # Otherwise, try each interpreter until we find one that satisfies
+      # VERSION.
+      AC_CACHE_CHECK([for a Python interpreter with version >= $1],
+	[am_cv_pathless_PYTHON],[
+	for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
+	  test "$am_cv_pathless_PYTHON" = none && break
+	  AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
+	done])
+      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
+      if test "$am_cv_pathless_PYTHON" = none; then
+	PYTHON=:
+      else
+        AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
+      fi
+      am_display_PYTHON=$am_cv_pathless_PYTHON
+    fi
+  ])
+
+  if test "$PYTHON" = :; then
+  dnl Run any user-specified action, or abort.
+    m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
+  else
+
+  dnl Query Python for its version number.  Getting [:3] seems to be
+  dnl the best way to do this; it's what "site.py" does in the standard
+  dnl library.
+
+  AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
+    [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
+  AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
+
+  dnl Use the values of $prefix and $exec_prefix for the corresponding
+  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
+  dnl distinct variables so they can be overridden if need be.  However,
+  dnl general consensus is that you shouldn't need this ability.
+
+  AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
+  AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
+
+  dnl At times (like when building shared libraries) you may want
+  dnl to know which OS platform Python thinks this is.
+
+  AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
+    [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
+  AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
+
+  # Just factor out some code duplication.
+  am_python_setup_sysconfig="\
+import sys
+# Prefer sysconfig over distutils.sysconfig, for better compatibility
+# with python 3.x.  See automake bug#10227.
+try:
+    import sysconfig
+except ImportError:
+    can_use_sysconfig = 0
+else:
+    can_use_sysconfig = 1
+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
+# <https://github.com/pypa/virtualenv/issues/118>
+try:
+    from platform import python_implementation
+    if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7':
+        can_use_sysconfig = 0
+except ImportError:
+    pass"
+
+  dnl Set up 4 directories:
+
+  dnl pythondir -- where to install python scripts.  This is the
+  dnl   site-packages directory, not the python standard library
+  dnl   directory like in previous automake betas.  This behavior
+  dnl   is more consistent with lispdir.m4 for example.
+  dnl Query distutils for this directory.
+  AC_CACHE_CHECK([for $am_display_PYTHON script directory],
+    [am_cv_python_pythondir],
+    [if test "x$prefix" = xNONE
+     then
+       am_py_prefix=$ac_default_prefix
+     else
+       am_py_prefix=$prefix
+     fi
+     am_cv_python_pythondir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+else:
+    from distutils import sysconfig
+    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
+     case $am_cv_python_pythondir in
+     $am_py_prefix*)
+       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+       ;;
+     *)
+       case $am_py_prefix in
+         /usr|/System*) ;;
+         *)
+	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	  ;;
+       esac
+       ;;
+     esac
+    ])
+  AC_SUBST([pythondir], [$am_cv_python_pythondir])
+
+  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
+  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
+  dnl   more consistent with the rest of automake.
+
+  AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
+
+  dnl pyexecdir -- directory for installing python extension modules
+  dnl   (shared libraries)
+  dnl Query distutils for this directory.
+  AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
+    [am_cv_python_pyexecdir],
+    [if test "x$exec_prefix" = xNONE
+     then
+       am_py_exec_prefix=$am_py_prefix
+     else
+       am_py_exec_prefix=$exec_prefix
+     fi
+     am_cv_python_pyexecdir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+else:
+    from distutils import sysconfig
+    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
+     case $am_cv_python_pyexecdir in
+     $am_py_exec_prefix*)
+       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+       ;;
+     *)
+       case $am_py_exec_prefix in
+         /usr|/System*) ;;
+         *)
+	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	   ;;
+       esac
+       ;;
+     esac
+    ])
+  AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+
+  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
+
+  AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
+
+  dnl Run any user-specified action.
+  $2
+  fi
+
+])
+
+
+# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# ---------------------------------------------------------------------------
+# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
+# Run ACTION-IF-FALSE otherwise.
+# This test uses sys.hexversion instead of the string equivalent (first
+# word of sys.version), in order to cope with versions such as 2.2c1.
+# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
+AC_DEFUN([AM_PYTHON_CHECK_VERSION],
+ [prog="import sys
+# split strings by '.' and convert to numeric.  Append some zeros
+# because we need at least 4 digits for the hex conversion.
+# map returns an iterator in Python 3.0 and a list in 2.x
+minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
+minverhex = 0
+# xrange is not present in Python 3.0 and range returns an iterator
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
+sys.exit(sys.hexversion < minverhex)"
+  AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
+
 # Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation

configure.REMOVED.git-id

@@ -1 +1 @@
-efd87e3ac323a294176585423f9049a4265e0532
+10205f3179b20250f477d9ea3a2ab3191b68d392

configure.ac.REMOVED.git-id

@@ -1 +1 @@
-590028b41f05607587bb461b1826400fc5f72e20
+59cb6ba7455d64c1f53433f002dc1d06f5536a9a

data/Makefile.in

@@ -407,6 +407,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -494,9 +499,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

data/net_2_0/Browsers/Makefile.in

@@ -328,6 +328,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -415,9 +420,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

data/net_2_0/Makefile.in

@@ -388,6 +388,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -475,9 +480,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

data/net_4_0/Browsers/Makefile.in

@@ -328,6 +328,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -415,9 +420,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

data/net_4_0/Makefile.in

@@ -388,6 +388,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -475,9 +480,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

data/net_4_5/Browsers/Makefile.in

@@ -328,6 +328,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -415,9 +420,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

data/net_4_5/Makefile.in

@@ -388,6 +388,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -475,9 +480,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

docs/Makefile.in

@@ -329,6 +329,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -416,9 +421,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

external/bdwgc/autom4te.cache/requests

@@ -42,162 +42,162 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_LIBTOOL_PICMODE' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'include' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        '_LT_DLL_DEF_P' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         'AC_ENABLE_STATIC' => 1,
-                        'AC_PROG_NM' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'AM_PROG_LD' => 1,
-                        'LT_INIT' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
                         'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AU_DEFUN' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'AC_PROG_LD' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'LT_INIT' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'LT_PROG_RC' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
                         'AC_LTDL_OBJDIR' => 1,
                         'AC_ENABLE_SHARED' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'GC_SET_VERSION' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AM_PROG_NM' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'LT_PROG_RC' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'LT_PATH_NM' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        'AC_PROG_LD' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'AM_PROG_AS' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'AU_DEFUN' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        'LT_LANG' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'LT_PROG_GO' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'm4_pattern_forbid' => 1,
-                        '_m4_warn' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'LT_OUTPUT' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'm4_include' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'LT_PATH_LD' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AC_DEFUN' => 1,
-                        'AM_RUN_LOG' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'LT_PROG_GCJ' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AM_PROG_LD' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'LT_LIB_M' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'm4_pattern_allow' => 1,
                         '_AM_IF_OPTION' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
-                        'AC_DISABLE_SHARED' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'LT_LANG' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'm4_include' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'LT_LIB_M' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_m4_warn' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'LT_PATH_NM' => 1,
+                        'include' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AC_DEFUN' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'GC_SET_VERSION' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'LT_OUTPUT' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_PROG_NM' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'AM_DISABLE_STATIC' => 1,
                         'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        '_LT_DLL_DEF_P' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'm4_pattern_forbid' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'm4_pattern_allow' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'AM_PROG_AS' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -212,66 +212,66 @@
                         'configure.ac'
                       ],
                       {
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AC_SUBST' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
                         'include' => 1,
-                        'sinclude' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'AM_NLS' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'm4_sinclude' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AH_OUTPUT' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AM_PROG_CC_C_O' => 1,
                         'AC_FC_SRCEXT' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AC_INIT' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        '_m4_warn' => 1,
-                        'm4_pattern_forbid' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
                         'AM_PROG_F77_C_O' => 1,
                         'AC_CANONICAL_HOST' => 1,
-                        'm4_include' => 1,
+                        'AC_LIBSOURCE' => 1,
-                        'm4_pattern_allow' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_m4_warn' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'LT_INIT' => 1,
                         'AM_PROG_MKDIR_P' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_PATH_GUILE' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AM_NLS' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AC_INIT' => 1,
+                        'm4_sinclude' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
+                        'm4_include' => 1,
+                        'AC_SUBST' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'sinclude' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
                         'AC_FC_PP_DEFINE' => 1,
-                        'LT_INIT' => 1
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_CANONICAL_TARGET' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -313,162 +313,162 @@
                         'configure.ac'
                       ],
                       {
-                        'LT_AC_PROG_EGREP' => 1,
+                        'AM_DEP_TRACK' => 1,
-                        'AC_PROG_LD_GNU' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
+                        'AC_PATH_MAGIC' => 1,
-                        'AC_CHECK_LIBM' => 1,
+                        'AC_LIBTOOL_F77' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        '_LT_AC_LOCK' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'AC_LIBTOOL_FC' => 1,
                         'AC_LIBTOOL_SETUP' => 1,
-                        'AM_RUN_LOG' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'AC_DEFUN' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
-                        '_AM_SET_OPTIONS' => 1,
+                        '_LT_AC_LANG_F77' => 1,
-                        'LT_PROG_GCJ' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
+                        'm4_pattern_forbid' => 1,
-                        'LT_PATH_LD' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
+                        '_LT_DLL_DEF_P' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AM_PROG_AS' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'm4_pattern_allow' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'GC_SET_VERSION' => 1,
                         '_AM_PROG_CC_C_O' => 1,
-                        'AM_MISSING_PROG' => 1,
+                        'AC_DEFUN' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'LT_PATH_NM' => 1,
+                        'include' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        '_m4_warn' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
                         'AC_DISABLE_SHARED' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AM_DISABLE_STATIC' => 1,
                         'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
                         'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'LT_LIB_M' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_PROG_LD' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        'LT_LANG' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AU_DEFUN' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'LT_OUTPUT' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'm4_include' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        'm4_pattern_forbid' => 1,
-                        '_m4_warn' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AM_DEP_TRACK' => 1,
                         '_LT_AC_SYS_COMPILER' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
-                        'LT_PROG_GO' => 1,
-                        'GC_SET_VERSION' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'LT_PROG_RC' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AM_PROG_NM' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'AC_PROG_LD' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AM_PROG_AS' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'LT_PATH_NM' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'include' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        '_LT_PROG_F77' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'LT_INIT' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         'AC_PROG_NM' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'LT_OUTPUT' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'LT_LANG' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'LT_PROG_RC' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'LT_INIT' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'LT_LIB_M' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'm4_include' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AM_PROG_LD' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
                         'AC_ENABLE_STATIC' => 1,
-                        '_AM_SET_OPTION' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_LIBTOOL_F77' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
-                        '_LT_DLL_DEF_P' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
-                        '_AM_PROG_TAR' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AM_PROG_LIBTOOL' => 1
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'AC_PROG_LD' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AU_DEFUN' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1
                       }
                     ], 'Autom4te::Request' )
            );

external/bdwgc/config.log

@@ -10,11 +10,11 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 ## Platform. ##
 ## --------- ##
 
-hostname = az-ubuntu-general1958b0
+hostname = az-ubuntu-generalb689d0
 uname -m = x86_64
-uname -r = 4.15.0-1071-azure
+uname -r = 4.15.0-1075-azure
 uname -s = Linux
-uname -v = #76-Ubuntu SMP Wed Feb 12 03:02:44 UTC 2020
+uname -v = #80-Ubuntu SMP Wed Mar 18 13:27:16 UTC 2020
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
@@ -747,7 +747,7 @@ generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on az-ubuntu-general1958b0
+on az-ubuntu-generalb689d0
 
 config.status:1238: creating Makefile
 config.status:1238: creating bdw-gc.pc

external/bdwgc/libtool.REMOVED.git-id

@@ -1 +1 @@
-667b39ef8fe65d14bf9f50207f4cb4fd6120026d
+abae4b1e0e194e32e1b1b62dbeefb289666203c5

external/bockbuild/bockbuild/unixprofile.py

@@ -24,7 +24,7 @@ class UnixProfile (Profile):
                      '%{staged_prefix}/bin',
                      '/usr/bin',
                      '/bin',
-                     '/usr/local/git/bin')
+                     '/usr/local/bin')
 
         self.env.set('C_INCLUDE_PATH',  '%{staged_prefix}/include')
 

external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.File.Move.cs

@@ -22,7 +22,7 @@ namespace System.IO.Tests
         [PlatformSpecific(TestPlatforms.AnyUnix)]  // Expected WatcherChangeTypes are different based on OS
         public void Unix_File_Move_To_Same_Directory()
         {
-            FileMove_SameDirectory(WatcherChangeTypes.Created | WatcherChangeTypes.Deleted);
+            FileMove_SameDirectory(WatcherChangeTypes.Renamed);
         }
 
         [Fact]
@@ -73,7 +73,7 @@ namespace System.IO.Tests
         [PlatformSpecific(TestPlatforms.OSX)]  // Expected WatcherChangeTypes are different based on OS
         public void OSX_File_Move_To_Different_Watched_Directory()
         {
-            FileMove_DifferentWatchedDirectory(WatcherChangeTypes.Changed);
+            FileMove_DifferentWatchedDirectory(0);
         }
 
         [Fact]
@@ -104,7 +104,7 @@ namespace System.IO.Tests
         [PlatformSpecific(TestPlatforms.AnyUnix)]  // Expected WatcherChangeTypes are different based on OS
         public void Unix_File_Move_In_Nested_Directory(bool includeSubdirectories)
         {
-            FileMove_NestedDirectory(includeSubdirectories ? WatcherChangeTypes.Created | WatcherChangeTypes.Deleted : 0, includeSubdirectories);
+            FileMove_NestedDirectory(includeSubdirectories ? WatcherChangeTypes.Renamed : 0, includeSubdirectories);
         }
 
         [Fact]
@@ -118,7 +118,7 @@ namespace System.IO.Tests
         [PlatformSpecific(TestPlatforms.AnyUnix)]  // Expected WatcherChangeTypes are different based on OS
         public void Unix_File_Move_With_Set_NotifyFilter()
         {
-            FileMove_WithNotifyFilter(WatcherChangeTypes.Deleted);
+            FileMove_WithNotifyFilter(WatcherChangeTypes.Renamed);
         }
 
         #region Test Helpers

external/corefx/src/System.IO.FileSystem/src/System/IO/FileSystem.Unix.cs

@@ -160,18 +160,19 @@ namespace System.IO
         {
             // The desired behavior for Move(source, dest) is to not overwrite the destination file
             // if it exists. Since rename(source, dest) will replace the file at 'dest' if it exists,
-            // link/unlink are used instead. However, if the source path and the dest path refer to
+            // link/unlink are used instead. Rename is more efficient than link/unlink on file systems
-            // the same file, then do a rename rather than a link and an unlink.  This is important
+            // where hard links are not supported (such as FAT). Therefore, given that source file exists,
-            // for case-insensitive file systems (e.g. renaming a file in a way that just changes casing),
+            // rename is used in 2 cases: when dest file does not exist or when source path and dest
-            // so that we support changing the casing in the naming of the file. If this fails in any
+            // path refer to the same file (on the same device). This is important for case-insensitive
-            // way (e.g. source file doesn't exist, dest file doesn't exist, rename fails, etc.), we
+            // file systems (e.g. renaming a file in a way that just changes casing), so that we support
-            // just fall back to trying the link/unlink approach and generating any exceptional messages
+            // changing the casing in the naming of the file. If this fails in any way (e.g. source file
-            // from there as necessary.
+            // doesn't exist, dest file doesn't exist, rename fails, etc.), we just fall back to trying the
+            // link/unlink approach and generating any exceptional messages from there as necessary.
             Interop.Sys.FileStatus sourceStat, destStat;
             if (Interop.Sys.LStat(sourceFullPath, out sourceStat) == 0 && // source file exists
-                Interop.Sys.LStat(destFullPath, out destStat) == 0 && // dest file exists
+                (Interop.Sys.LStat(destFullPath, out destStat) != 0 || // dest file does not exist
-                sourceStat.Dev == destStat.Dev && // source and dest are on the same device
+                (sourceStat.Dev == destStat.Dev && // source and dest are on the same device
-                sourceStat.Ino == destStat.Ino && // and source and dest are the same file on that device
+                sourceStat.Ino == destStat.Ino)) && // source and dest are the same file on that device
                 Interop.Sys.Rename(sourceFullPath, destFullPath) == 0) // try the rename
             {
                 // Renamed successfully.

ikvm-native/Makefile.in

@@ -376,6 +376,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -463,9 +468,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

llvm/Makefile.in

@@ -299,6 +299,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -386,9 +391,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

m4/Makefile.in

@@ -298,6 +298,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -385,9 +390,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

man/Makefile.in

@@ -330,6 +330,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -417,9 +422,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mcs/build/common/Consts.cs

@@ -41,7 +41,7 @@ static partial class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//
 
-	public const string MonoVersion = "6.10.0.96";
+	public const string MonoVersion = "6.10.0.101";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-bda41cc8ae7e442bd0960790fe7641ff7a803e2a
+427da533549c676bd15876366bdf13286d7b751a

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-6b2edf87937ca40228d3dd9c2d8f8d049003b7ec
+7f5c228d7f166733a82b476d8cb061948b15951f

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-ae94f5162d568acadfdcc056901f74e74da92bbf
+76fb3a951a844cd303316789cf0f6636e14a0b83

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id

@@ -1 +1 @@
-70baee58a128a23fe3be9462422fd4f27c1b0c85
+20989f78a8eb3402d5b2c7d2789a7b66a132d8ee

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id

@@ -1 +1 @@
-bb922ae99dcf54b73a5cca3792c17766b26e1502
+f9322e0046e3c0040a6705cff8b5b5b73d5c3c1b

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id

@@ -1 +1 @@
-6b58700b2196fe104b219bc07aa30b181484b24b
+2dd3abed9fc618abe7db13732c238e7837f2c3c1

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id

@@ -1 +1 @@
-96ac8882963340a22c5e2ed4ec38ab9f29bea148
+c7aee50b709d39e3baabeb9f702efd2d5f7f36b2

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id

@@ -1 +1 @@
-5a3472f25df0ff091f5c9760a01cb97d512288ad
+d0cefa61b032c5de65b1632ab1d359a3919ef86b

mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-bda41cc8ae7e442bd0960790fe7641ff7a803e2a
+427da533549c676bd15876366bdf13286d7b751a

mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-6b2edf87937ca40228d3dd9c2d8f8d049003b7ec
+7f5c228d7f166733a82b476d8cb061948b15951f

mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-ae94f5162d568acadfdcc056901f74e74da92bbf
+76fb3a951a844cd303316789cf0f6636e14a0b83

mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id

@@ -1 +1 @@
-70baee58a128a23fe3be9462422fd4f27c1b0c85
+20989f78a8eb3402d5b2c7d2789a7b66a132d8ee

mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id

@@ -1 +1 @@
-bb922ae99dcf54b73a5cca3792c17766b26e1502
+f9322e0046e3c0040a6705cff8b5b5b73d5c3c1b

mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id

@@ -1 +1 @@
-6b58700b2196fe104b219bc07aa30b181484b24b
+2dd3abed9fc618abe7db13732c238e7837f2c3c1

mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id

@@ -1 +1 @@
-96ac8882963340a22c5e2ed4ec38ab9f29bea148
+c7aee50b709d39e3baabeb9f702efd2d5f7f36b2

mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id

@@ -1 +1 @@
-5a3472f25df0ff091f5c9760a01cb97d512288ad
+d0cefa61b032c5de65b1632ab1d359a3919ef86b

mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-bda41cc8ae7e442bd0960790fe7641ff7a803e2a
+427da533549c676bd15876366bdf13286d7b751a

mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-6b2edf87937ca40228d3dd9c2d8f8d049003b7ec
+7f5c228d7f166733a82b476d8cb061948b15951f

mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-ae94f5162d568acadfdcc056901f74e74da92bbf
+76fb3a951a844cd303316789cf0f6636e14a0b83

mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id

@@ -1 +1 @@
-70baee58a128a23fe3be9462422fd4f27c1b0c85
+20989f78a8eb3402d5b2c7d2789a7b66a132d8ee

mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id

@@ -1 +1 @@
-bb922ae99dcf54b73a5cca3792c17766b26e1502
+f9322e0046e3c0040a6705cff8b5b5b73d5c3c1b

mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id

@@ -1 +1 @@
-6b58700b2196fe104b219bc07aa30b181484b24b
+2dd3abed9fc618abe7db13732c238e7837f2c3c1

mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id

@@ -1 +1 @@
-96ac8882963340a22c5e2ed4ec38ab9f29bea148
+c7aee50b709d39e3baabeb9f702efd2d5f7f36b2

mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id

@@ -1 +1 @@
-5a3472f25df0ff091f5c9760a01cb97d512288ad
+d0cefa61b032c5de65b1632ab1d359a3919ef86b

mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-bda41cc8ae7e442bd0960790fe7641ff7a803e2a
+427da533549c676bd15876366bdf13286d7b751a

mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-6b2edf87937ca40228d3dd9c2d8f8d049003b7ec
+7f5c228d7f166733a82b476d8cb061948b15951f

mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-161da0efa414265ddc73dc2588cfbe38243d5795
+cd2b08870002801df573e4c82c5e2fd294c9e511

mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id

@@ -1 +1 @@
-70baee58a128a23fe3be9462422fd4f27c1b0c85
+20989f78a8eb3402d5b2c7d2789a7b66a132d8ee

mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id

@@ -1 +1 @@
-bb922ae99dcf54b73a5cca3792c17766b26e1502
+f9322e0046e3c0040a6705cff8b5b5b73d5c3c1b

mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id

@@ -1 +1 @@
-6b58700b2196fe104b219bc07aa30b181484b24b
+2dd3abed9fc618abe7db13732c238e7837f2c3c1

mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id

@@ -1 +1 @@
-96ac8882963340a22c5e2ed4ec38ab9f29bea148
+c7aee50b709d39e3baabeb9f702efd2d5f7f36b2

mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id

@@ -1 +1 @@
-95741c166f60fda5b306b3fc950668d3af12d5ad
+c03807fc7bce0b64b8764a1ed39e94d17e1e9db8

mk/Makefile.in

@@ -298,6 +298,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -385,9 +390,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/Makefile.in

@@ -358,6 +358,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -445,9 +450,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/arch/Makefile.in

@@ -358,6 +358,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -445,9 +450,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/arch/amd64/Makefile.in

@@ -299,6 +299,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -386,9 +391,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/arch/arm/Makefile.in

@@ -299,6 +299,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -386,9 +391,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/arch/arm64/Makefile.in

@@ -299,6 +299,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -386,9 +391,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/arch/mips/Makefile.in

@@ -341,6 +341,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -428,9 +433,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/arch/ppc/Makefile.in

@@ -299,6 +299,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -386,9 +391,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/arch/riscv/Makefile.in

@@ -346,6 +346,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -433,9 +438,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/arch/s390x/Makefile.in

@@ -344,6 +344,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -431,9 +436,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/arch/sparc/Makefile.in

@@ -299,6 +299,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -386,9 +391,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/arch/x86/Makefile.in

@@ -299,6 +299,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -386,9 +391,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/benchmark/Makefile.in

@@ -299,6 +299,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -386,9 +391,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/btls/Makefile.in

@@ -298,6 +298,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -385,9 +390,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/cil/Makefile.in

@@ -329,6 +329,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -416,9 +421,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/dis/Makefile.in

@@ -421,6 +421,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -508,9 +513,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/eglib/Makefile.in

@@ -474,6 +474,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -561,9 +566,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/eglib/glib.h

@@ -247,13 +247,11 @@ typedef guint32 gunichar;
 #define ABS(a)         ((a) > 0 ? (a) : -(a))
 #endif
 
-#ifndef ALIGN_TO
 #define ALIGN_TO(val,align) ((((gssize)val) + ((align) - 1)) & ~((align) - 1))
-#endif
 
-#ifndef ALIGN_PTR_TO
+#define ALIGN_DOWN_TO(val,align) (((gssize)val) & ~((align) - 1))
+
 #define ALIGN_PTR_TO(ptr,align) (gpointer)((((gssize)(ptr)) + (align - 1)) & (~(align - 1)))
-#endif
 
 #define G_STRUCT_OFFSET(p_type,field) offsetof(p_type,field)
 

mono/eglib/test/Makefile.in

@@ -373,6 +373,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -460,9 +465,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/metadata/Makefile.in.REMOVED.git-id

@@ -1 +1 @@
-8685cae612944abba3fb47e9c788b931ce5ccb50
+3c71e1b499ff288487b6eed27607614303c8540c

mono/mini/Makefile.am

@@ -825,7 +825,7 @@ MemoryIntrinsics.dll: MemoryIntrinsics.il
 
 GENMDESC_OPTS=
 
-GENMDESC_PRG=python $(srcdir)/genmdesc.py $(target_define) $(srcdir)
+GENMDESC_PRG=$(PYTHON) $(srcdir)/genmdesc.py $(target_define) $(srcdir)
 
 cpu-wasm.h: mini-ops.h cpu-wasm.md $(srcdir)/genmdesc.py
 	$(GENMDESC_PRG) cpu-wasm.h wasm_desc $(srcdir)/cpu-wasm.md

mono/mini/Makefile.am.in

@@ -825,7 +825,7 @@ MemoryIntrinsics.dll: MemoryIntrinsics.il
 
 GENMDESC_OPTS=
 
-GENMDESC_PRG=python $(srcdir)/genmdesc.py $(target_define) $(srcdir)
+GENMDESC_PRG=$(PYTHON) $(srcdir)/genmdesc.py $(target_define) $(srcdir)
 
 cpu-wasm.h: mini-ops.h cpu-wasm.md $(srcdir)/genmdesc.py
 	$(GENMDESC_PRG) cpu-wasm.h wasm_desc $(srcdir)/cpu-wasm.md

mono/mini/Makefile.in.REMOVED.git-id

@@ -1 +1 @@
-4a54e4d4e572e18b59f27e5d955149f0636e2da5
+3a59b6e7859ef70595cb15d099441a77f6d068a7

mono/mini/exceptions-amd64.c

@@ -926,8 +926,7 @@ mono_arch_handle_altstack_exception (void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *s
 	 * requires allocation on the stack, as this wouldn't be encoded in unwind
 	 * information for the caller frame.
 	 */
-	sp = (gpointer *)UCONTEXT_REG_RSP (sigctx);
+	sp = (gpointer *) ALIGN_DOWN_TO (UCONTEXT_REG_RSP (sigctx), 16);
-	g_assertf (((unsigned long) sp & 15) == 0, "sp: %p\n", sp);
 	sp [-1] = (gpointer)UCONTEXT_REG_RIP (sigctx);
 	mono_sigctx_to_monoctx (sigctx, copied_ctx);
 	/* at the return from the signal handler execution starts in altstack_handle_and_restore() */

mono/mini/genmdesc.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 #
 # This tool is used to generate the cpu-<ARCH>.h files used by the JIT. The input is the

mono/mini/version.h

@@ -1 +1 @@
-#define FULL_VERSION "explicit/8487188"
+#define FULL_VERSION "explicit/6f0bf73"

mono/native/Makefile.in.REMOVED.git-id

@@ -1 +1 @@
-09494fd28195855f87b649376afa452987bfd504
+268b6b9deb66d45ed0589da61ac6c6bd39180a48

mono/profiler/Makefile.in

@@ -504,6 +504,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -591,9 +596,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/sgen/Makefile.in

@@ -391,6 +391,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -478,9 +483,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/tests/Makefile.am.REMOVED.git-id

@@ -1 +1 @@
-323ca18627f2d49b6d9c6d90f5b533e93fd463e7
+54947b9ffc112a39386da6a5fcb2109c9b00ecab

mono/tests/Makefile.in.REMOVED.git-id

@@ -1 +1 @@
-e53aa4118645dc768c7e98aa31d5af003e6c9c58
+9382d1d592112b4e49a47b3417746ed2825afe37

mono/tests/assembly-load-reference/Makefile.in

@@ -310,6 +310,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -397,9 +402,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/tests/fullaot-mixed/Makefile.in

@@ -316,6 +316,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -403,9 +408,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/tests/gc-descriptors/Makefile.in

@@ -299,6 +299,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -386,9 +391,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/tests/gc-descriptors/gen-descriptor-tests.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 from optparse import OptionParser

mono/tests/llvmonly-mixed/Makefile.in

@@ -316,6 +316,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -403,9 +408,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/tests/test_lldb.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 import os
 import sys

mono/tests/testing_gac/Makefile.in

@@ -301,6 +301,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -388,9 +393,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

mono/unit-tests/Makefile.in

@@ -701,6 +701,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -788,9 +793,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
@@ -1601,10 +1610,10 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@CROSS_COMPILE_TRUE@clean-local:
-@HOST_WIN32_TRUE@clean-local:
 @CROSS_COMPILE_TRUE@test-local:
 @HOST_WIN32_TRUE@test-local:
+@CROSS_COMPILE_TRUE@clean-local:
+@HOST_WIN32_TRUE@clean-local:
 clean: clean-am
 
 clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \

mono/utils/Makefile.in.REMOVED.git-id

@@ -1 +1 @@
-8bea2cccb35f643f2650223941fb6ebaffe2b103
+df5621f345d2f42667485d303087cbc461100441

mono/utils/jemalloc/Makefile.in

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# This is a python script and a set of make targets to implement support for conditional submodules
+# This is a Python script and a set of make targets to implement support for conditional submodules
 # Set the SUBMODULES_CONFIG_FILE make variable to the srcdir path of a SUBMODULES.json file which contains information about the submodules.
 #
 VPATH = @srcdir@
@@ -305,6 +305,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -392,9 +397,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@
@@ -633,11 +642,11 @@ uninstall-am:
 
 define ValidateVersionTemplate
 #$(eval REPOSITORY_$(2):=$(shell test -z $(3) && echo $(1) || echo "$(3)"))
-#$(eval DIRECTORY_$(2):=$(shell python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) get-dir $(1)))
+#$(eval DIRECTORY_$(2):=$(shell $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) get-dir $(1)))
 #$(eval DIRECTORY_$(2):=$(shell test -z $(DIRECTORY_$(2)) && echo $(1) || echo $(DIRECTORY_$(2))))
-#$(eval MODULE_$(2):=$(shell python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) get-url $(1)))
+#$(eval MODULE_$(2):=$(shell $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) get-url $(1)))
-#$(eval NEEDED_$(2)_VERSION:=$(shell python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) get-rev $(1)))
+#$(eval NEEDED_$(2)_VERSION:=$(shell $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) get-rev $(1)))
-#$(eval $(2)_BRANCH_AND_REMOTE:=$(shell python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) get-remote-branch $(1)))
+#$(eval $(2)_BRANCH_AND_REMOTE:=$(shell $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) get-remote-branch $(1)))
 
 #$(eval $(2)_VERSION:=$$$$(shell cd $($(2)_PATH) 2>/dev/null && git rev-parse HEAD ))
 
@@ -729,19 +738,19 @@ reset:
 
 __bump-version-%:
 	@if [ "$(REV)" = "" ]; then echo "Usage: make bump-version-$* REV=<ref>"; exit 1; fi
-	python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-rev $* $(REV)
+	$(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-rev $* $(REV)
 	@if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to pick up $(REV)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi
 
 __bump-branch-%:
 	@if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
 	@if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
-	python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
+	$(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
-	python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
+	$(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
 	@if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi
 
 __bump-current-version-%:
 	REV=$(shell cd $(ACCEPTANCE_TESTS_PATH)/$* && git log -1 --pretty=format:%H); \
-	python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-rev $* $$REV; \
+	$(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-rev $* $$REV; \
 	if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to pick up $$REV:" | git commit -F - $(SUBMODULES_CONFIG_FILE); fi
 
 $(eval $(call ValidateVersionTemplate,jemalloc,JEMALLOC))

mono/zlib/Makefile.in

@@ -347,6 +347,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -434,9 +439,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

msvc/Makefile.in

@@ -299,6 +299,11 @@ PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
 PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RID = @RID@
 SEARCHSEP = @SEARCHSEP@
@@ -386,9 +391,13 @@ mono_runtime = @mono_runtime@
 mono_runtime_wrapper = @mono_runtime_wrapper@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 reloc_libdir = @reloc_libdir@
 runstatedir = @runstatedir@
 sbindir = @sbindir@

netcore/Makefile

@@ -19,7 +19,7 @@ ifeq ($(HOST_PLATFORM),win32)
 PLATFORM_AOT_SUFFIX := .dll
 PLATFORM_AOT_PREFIX :=
 NETCORESDK_EXT = zip
-UNZIPCMD = python -c "import zipfile,sys; zipfile.ZipFile(sys.argv[1], 'r').extractall()"
+UNZIPCMD = $(PYTHON) -c "import zipfile,sys; zipfile.ZipFile(sys.argv[1], 'r').extractall()"
 XUNIT_INNER_ARGS = -notrait category=nonwindowstests @../../../../CoreFX.issues_windows.rsp
 TESTS_PLATFORM = Windows_NT.x64
 ON_RUNTIME_EXTRACT = chmod -R 755 {host,shared,./dotnet}