From 3996966487fb20f83c585c45eb52c9c8fa9bdf50 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 11 Mar 2021 08:50:30 +0000 Subject: [PATCH] Imported Upstream version 6.12.0.129 Former-commit-id: 63ba228c1290c357a050293415887a15c2945697 --- config.h.in | 3 + configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/bdwgc/autom4te.cache/requests | 704 +++++++++--------- external/bdwgc/config.log | 4 +- .../libatomic_ops/autom4te.cache/requests | 694 ++++++++--------- external/bdwgc/libtool.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/arch/arm64/Makefile.am | 6 + mono/arch/arm64/Makefile.in | 6 + mono/arch/arm64/arm64-codegen.h | 36 + mono/arch/arm64/codegen-test.c | 13 + mono/eglib/eglib-remap.h | 3 + mono/mini/aot-compiler.c.REMOVED.git-id | 2 +- mono/mini/exceptions-arm64.c | 22 +- mono/mini/helpers.c | 2 +- mono/mini/llvm-jit.cpp | 2 +- mono/mini/mini-arm64.c.REMOVED.git-id | 2 +- mono/mini/mini-arm64.h | 5 +- mono/mini/mini-llvm.c.REMOVED.git-id | 2 +- mono/mini/mini-runtime.c.REMOVED.git-id | 2 +- mono/mini/mini-runtime.h | 11 + mono/mini/mini.c.REMOVED.git-id | 2 +- mono/mini/mini.h.REMOVED.git-id | 2 +- mono/mini/trace.c | 2 +- mono/mini/tramp-arm64-gsharedvt.c | 11 +- mono/mini/tramp-arm64.c | 61 +- mono/mini/version.h | 2 +- mono/tests/Makefile.am.REMOVED.git-id | 2 +- mono/tests/Makefile.in.REMOVED.git-id | 2 +- mono/utils/dtrace.h | 2 +- mono/utils/mono-codeman.c | 61 +- mono/utils/mono-codeman.h | 3 + mono/utils/mono-dl.h | 6 +- mono/utils/mono-merp.c | 7 +- mono/utils/mono-mmap.c | 6 + msvc/Makefile.in | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 +- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- support/Makefile.in | 2 +- support/sys-uio.c | 6 + 80 files changed, 981 insertions(+), 801 deletions(-) diff --git a/config.h.in b/config.h.in index 78ea6355e3..ba5ba6ddbf 100644 --- a/config.h.in +++ b/config.h.in @@ -834,6 +834,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PTHREAD_H +/* Define to 1 if you have the `pthread_jit_write_protect_np' function. */ +#undef HAVE_PTHREAD_JIT_WRITE_PROTECT_NP + /* Define to 1 if you have the `pthread_kill' function. */ #undef HAVE_PTHREAD_KILL diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 369bf0b55c..f7bc54104f 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -501ae9a5f84a477e39e1e89410c87260e352c10e \ No newline at end of file +74baf28e5181597cfc079e342ab476b2de64fc32 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 9048d968c2..59800ddae6 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -9184f9fa886dc397ac530f235edd352a44678db4 \ No newline at end of file +192faea884cf85ded273ffc82fd926e643d786db \ No newline at end of file diff --git a/external/bdwgc/autom4te.cache/requests b/external/bdwgc/autom4te.cache/requests index 4fcbcc01a0..a3039a816b 100644 --- a/external/bdwgc/autom4te.cache/requests +++ b/external/bdwgc/autom4te.cache/requests @@ -42,162 +42,162 @@ 'configure.ac' ], { - '_AM_PROG_TAR' => 1, - '_LT_PROG_CXX' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'AM_MAKE_INCLUDE' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - '_LT_DLL_DEF_P' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - '_AC_PROG_LIBTOOL' => 1, - 'm4_include' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, - 'AU_DEFUN' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - 'AC_PROG_NM' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - 'LT_CMD_MAX_LEN' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, - 'AM_ENABLE_SHARED' => 1, - '_LT_PROG_ECHO_BACKSLASH' => 1, - 'LT_AC_PROG_SED' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - 'AM_PROG_LD' => 1, - 'AC_LIBTOOL_FC' => 1, - 'AC_LIBTOOL_RC' => 1, - 'AM_PROG_INSTALL_SH' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - '_LT_LINKER_OPTION' => 1, - 'm4_pattern_allow' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - 'LT_PATH_NM' => 1, - '_m4_warn' => 1, - '_LT_AC_TAGCONFIG' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - '_LT_AC_LOCK' => 1, - 'AM_CONDITIONAL' => 1, - '_AM_IF_OPTION' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, - 'AC_DEFUN' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - 'LTOBSOLETE_VERSION' => 1, - '_LT_PROG_LTMAIN' => 1, - 'AC_LIBTOOL_GCJ' => 1, - 'AC_PROG_LD_GNU' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - '_LT_COMPILER_BOILERPLATE' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'LTVERSION_VERSION' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - 'AC_ENABLE_STATIC' => 1, - '_AM_PROG_CC_C_O' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AM_PROG_CC_C_O' => 1, - 'include' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, - 'AM_DISABLE_STATIC' => 1, - 'AC_DISABLE_SHARED' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - '_LT_WITH_SYSROOT' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'AM_SANITY_CHECK' => 1, - 'LT_AC_PROG_GCJ' => 1, - '_LT_PROG_FC' => 1, - 'LT_AC_PROG_EGREP' => 1, - 'AM_ENABLE_STATIC' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - '_LT_CC_BASENAME' => 1, - '_LT_PROG_F77' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'LT_LANG' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - 'LTSUGAR_VERSION' => 1, - 'LT_INIT' => 1, - 'AC_LTDL_ENABLE_INSTALL' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'AC_LIBTOOL_F77' => 1, - 'LT_PROG_RC' => 1, - 'AC_LTDL_OBJDIR' => 1, - 'LT_PATH_LD' => 1, - 'AC_LTDL_PREOPEN' => 1, - '_LT_AC_SYS_COMPILER' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'GC_SET_VERSION' => 1, - '_AM_SET_OPTION' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - 'LT_PROG_GO' => 1, - 'AC_DISABLE_STATIC' => 1, - 'AM_DEP_TRACK' => 1, - 'AM_PROG_AS' => 1, - 'AM_SUBST_NOTMAKE' => 1, - '_LT_AC_LANG_GCJ' => 1, - 'AM_MISSING_PROG' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'AM_PROG_NM' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - '_AM_AUTOCONF_VERSION' => 1, - 'm4_pattern_forbid' => 1, - 'AC_PROG_EGREP' => 1, - 'LT_AC_PROG_RC' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'AC_LIBTOOL_CXX' => 1, - 'LT_PROG_GCJ' => 1, - 'AC_CHECK_LIBM' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - 'AC_LIBTOOL_SETUP' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'AM_SET_DEPDIR' => 1, - 'AM_RUN_LOG' => 1, - '_LT_AC_LANG_CXX' => 1, - '_AM_MANGLE_OPTION' => 1, - 'AC_ENABLE_SHARED' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - '_AM_SET_OPTIONS' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AC_DEFUN_ONCE' => 1, '_LT_AC_SHELL_INIT' => 1, - '_LT_COMPILER_OPTION' => 1, - 'LTOPTIONS_VERSION' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - 'AM_DISABLE_SHARED' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AC_PROG_LD' => 1, - 'AM_SILENT_RULES' => 1, - 'LT_LIB_M' => 1, - 'AC_PATH_MAGIC' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'LT_OUTPUT' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - '_AM_DEPENDENCIES' => 1, - '_LT_AC_LANG_F77' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, + '_LT_PROG_CXX' => 1, + '_LT_WITH_SYSROOT' => 1, + 'LT_PATH_NM' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + '_AM_SET_OPTIONS' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'AM_SANITY_CHECK' => 1, + '_AM_IF_OPTION' => 1, + 'AU_DEFUN' => 1, + 'LT_LANG' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + 'AC_CHECK_LIBM' => 1, + '_LT_PROG_F77' => 1, '_LT_AC_TAGVAR' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1 + 'AC_PROG_EGREP' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'AM_DISABLE_SHARED' => 1, + 'm4_pattern_allow' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AM_PROG_NM' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AM_PROG_LD' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + 'AM_RUN_LOG' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, + '_AM_SUBST_NOTMAKE' => 1, + '_LT_LINKER_OPTION' => 1, + 'LT_AC_PROG_RC' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'AM_ENABLE_STATIC' => 1, + 'AC_LIBTOOL_PICMODE' => 1, + 'AC_LIBTOOL_F77' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'AC_ENABLE_FAST_INSTALL' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + 'LT_PROG_GCJ' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + '_AM_PROG_TAR' => 1, + '_AC_PROG_LIBTOOL' => 1, + 'AC_LIBTOOL_FC' => 1, + 'AM_SET_DEPDIR' => 1, + '_LT_DLL_DEF_P' => 1, + 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, + 'AC_LIBTOOL_PROG_CC_C_O' => 1, + 'LT_SUPPORTED_TAG' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, + '_LT_AC_LANG_F77' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'AC_DEFUN' => 1, + 'AM_SUBST_NOTMAKE' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, + 'AM_PROG_INSTALL_SH' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + '_LT_CC_BASENAME' => 1, + 'AC_PROG_NM' => 1, + 'AC_DISABLE_SHARED' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + 'LT_PATH_LD' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, + 'm4_include' => 1, + 'AC_ENABLE_STATIC' => 1, + 'LTOBSOLETE_VERSION' => 1, + 'AM_PROG_CC_C_O' => 1, + 'LT_PROG_RC' => 1, + 'LTSUGAR_VERSION' => 1, + 'AM_MISSING_HAS_RUN' => 1, + 'AC_PROG_LIBTOOL' => 1, + '_AM_MANGLE_OPTION' => 1, + 'AM_MISSING_PROG' => 1, + 'AM_DEP_TRACK' => 1, + 'AC_PROG_LD' => 1, + '_AM_PROG_CC_C_O' => 1, + 'AM_ENABLE_SHARED' => 1, + 'AC_DISABLE_STATIC' => 1, + 'AC_PROG_LD_GNU' => 1, + 'LT_OUTPUT' => 1, + '_LT_PROG_ECHO_BACKSLASH' => 1, + 'LT_PROG_GO' => 1, + 'LT_AC_PROG_EGREP' => 1, + 'GC_SET_VERSION' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'AC_LIBTOOL_RC' => 1, + '_LT_AC_SYS_COMPILER' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + 'AC_PATH_MAGIC' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AC_LIBTOOL_SETUP' => 1, + 'AC_LTDL_PREOPEN' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + 'AC_LTDL_ENABLE_INSTALL' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'LTOPTIONS_VERSION' => 1, + 'include' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AC_ENABLE_SHARED' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + 'AC_LTDL_OBJDIR' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + '_AM_SET_OPTION' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + 'AC_DEFUN_ONCE' => 1, + '_LT_AC_PROG_CXXCPP' => 1, + '_LT_AC_TAGCONFIG' => 1, + '_m4_warn' => 1, + '_LT_AC_LOCK' => 1, + 'AM_MAKE_INCLUDE' => 1, + '_LT_AC_LANG_C_CONFIG' => 1, + 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + '_AM_AUTOCONF_VERSION' => 1, + '_LT_PROG_LTMAIN' => 1, + 'AC_LIBTOOL_CXX' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + '_LT_AC_LANG_CXX' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'LT_INIT' => 1, + 'AM_DISABLE_STATIC' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'AC_PROG_LD_RELOAD_FLAG' => 1, + '_LT_AC_LANG_GCJ' => 1, + 'LT_LIB_M' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'LT_AC_PROG_SED' => 1, + '_LT_COMPILER_BOILERPLATE' => 1, + 'LTVERSION_VERSION' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + 'AM_SILENT_RULES' => 1, + 'm4_pattern_forbid' => 1, + 'LT_CMD_MAX_LEN' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + '_LT_AC_CHECK_DLFCN' => 1, + '_AM_DEPENDENCIES' => 1, + '_LT_PROG_FC' => 1, + 'AC_LIBTOOL_GCJ' => 1, + 'LT_AC_PROG_GCJ' => 1, + 'AM_PROG_AS' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, + '_LT_COMPILER_OPTION' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -212,66 +212,66 @@ 'configure.ac' ], { - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'LT_INIT' => 1, - 'AM_PROG_MOC' => 1, - 'AC_SUBST_TRACE' => 1, - '_AM_SUBST_NOTMAKE' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, - 'm4_sinclude' => 1, - '_AM_COND_ENDIF' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AM_PROG_MKDIR_P' => 1, - 'AM_NLS' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, - '_AM_COND_ELSE' => 1, - 'AC_SUBST' => 1, - 'm4_include' => 1, - 'AC_CONFIG_AUX_DIR' => 1, 'AM_PROG_FC_C_O' => 1, - '_LT_AC_TAGCONFIG' => 1, - '_m4_warn' => 1, - 'AM_PROG_AR' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AM_CONDITIONAL' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AM_PROG_CXX_C_O' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AC_INIT' => 1, - 'AM_ENABLE_MULTILIB' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'include' => 1, 'm4_pattern_forbid' => 1, - 'sinclude' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AM_SILENT_RULES' => 1, + '_AM_COND_ENDIF' => 1, + 'AM_PROG_MOC' => 1, + 'AC_FC_FREEFORM' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AM_PROG_F77_C_O' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'LT_INIT' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'AM_POT_TOOLS' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AM_PROG_AR' => 1, + 'AC_CANONICAL_BUILD' => 1, + 'AM_NLS' => 1, + 'AC_CONFIG_LINKS' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'AC_LIBSOURCE' => 1, - 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'AC_CONFIG_FILES' => 1, - 'AC_CONFIG_HEADERS' => 1, - '_AM_COND_IF' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_FC_FREEFORM' => 1, - 'AM_GNU_GETTEXT' => 1, - 'AM_PATH_GUILE' => 1, - 'AM_PROG_F77_C_O' => 1, - 'AM_POT_TOOLS' => 1, - 'AC_FC_PP_DEFINE' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AC_FC_SRCEXT' => 1, - 'AC_CONFIG_LINKS' => 1, + 'AC_SUBST' => 1, + 'AM_PROG_LIBTOOL' => 1, 'm4_pattern_allow' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'AH_OUTPUT' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'AM_PROG_CC_C_O' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + '_m4_warn' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'sinclude' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + '_AM_COND_IF' => 1, + 'AC_INIT' => 1, 'AC_CANONICAL_HOST' => 1, - 'include' => 1, - 'AM_SILENT_RULES' => 1, - 'AM_XGETTEXT_OPTION' => 1 + 'AC_PROG_LIBTOOL' => 1, + 'AC_FC_PP_SRCEXT' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AM_PROG_MKDIR_P' => 1, + 'AC_CONFIG_FILES' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_SUBST_TRACE' => 1, + 'm4_sinclude' => 1, + 'AC_CONFIG_HEADERS' => 1, + 'AH_OUTPUT' => 1, + 'AM_GNU_GETTEXT' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'm4_include' => 1, + 'AM_ENABLE_MULTILIB' => 1, + '_AM_COND_ELSE' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AC_FC_SRCEXT' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'AM_PATH_GUILE' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -313,162 +313,162 @@ 'configure.ac' ], { + '_LT_LINKER_BOILERPLATE' => 1, + 'LT_PATH_LD' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, '_LT_CC_BASENAME' => 1, - '_LT_PROG_F77' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'LT_LANG' => 1, + 'AC_DISABLE_SHARED' => 1, + 'AC_PROG_NM' => 1, + 'AM_PROG_CC_C_O' => 1, + 'LTOBSOLETE_VERSION' => 1, + 'AC_ENABLE_STATIC' => 1, + 'm4_include' => 1, + 'AM_MISSING_HAS_RUN' => 1, + 'LTSUGAR_VERSION' => 1, + '_AM_MANGLE_OPTION' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'LT_PROG_RC' => 1, + 'AC_PROG_LD_GNU' => 1, + 'AC_DISABLE_STATIC' => 1, + 'AM_ENABLE_SHARED' => 1, + '_LT_PROG_ECHO_BACKSLASH' => 1, + 'LT_OUTPUT' => 1, + 'AM_MISSING_PROG' => 1, + '_AM_PROG_CC_C_O' => 1, + 'AM_DEP_TRACK' => 1, + 'AC_PROG_LD' => 1, + 'AC_LIBTOOL_RC' => 1, + 'AC_PATH_MAGIC' => 1, + '_LT_AC_SYS_COMPILER' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + 'LT_PROG_GO' => 1, + 'GC_SET_VERSION' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, 'LT_AC_PROG_EGREP' => 1, - 'AM_ENABLE_STATIC' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'AC_LIBTOOL_SETUP' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'LTOPTIONS_VERSION' => 1, + 'include' => 1, + 'AC_LTDL_PREOPEN' => 1, 'AC_LTDL_ENABLE_INSTALL' => 1, 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'AC_LIBTOOL_F77' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - 'LTSUGAR_VERSION' => 1, - 'LT_INIT' => 1, - 'LT_SUPPORTED_TAG' => 1, - '_AM_SET_OPTION' => 1, - 'GC_SET_VERSION' => 1, - 'LT_PROG_RC' => 1, - 'AC_LTDL_OBJDIR' => 1, - 'LT_PATH_LD' => 1, - '_LT_AC_SYS_COMPILER' => 1, - 'AC_LTDL_PREOPEN' => 1, - 'AM_MISSING_PROG' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'AM_PROG_NM' => 1, - '_AM_AUTOCONF_VERSION' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - 'm4_pattern_forbid' => 1, - 'AC_PROG_EGREP' => 1, - 'LT_AC_PROG_RC' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - 'LT_PROG_GO' => 1, - 'AC_DISABLE_STATIC' => 1, - 'AM_PROG_AS' => 1, - 'AM_DEP_TRACK' => 1, - 'AM_SUBST_NOTMAKE' => 1, - '_LT_AC_LANG_GCJ' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, - 'AC_LIBTOOL_SETUP' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'AM_SET_DEPDIR' => 1, - 'AC_LIBTOOL_CXX' => 1, - 'LT_PROG_GCJ' => 1, - 'AC_CHECK_LIBM' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AC_DEFUN_ONCE' => 1, - '_LT_AC_SHELL_INIT' => 1, - 'AM_RUN_LOG' => 1, - '_AM_MANGLE_OPTION' => 1, - '_LT_AC_LANG_CXX' => 1, - 'AC_ENABLE_SHARED' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - '_AM_SET_OPTIONS' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, - 'AM_DISABLE_SHARED' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AC_PROG_LD' => 1, - 'AM_SILENT_RULES' => 1, - 'LT_LIB_M' => 1, - 'LTOPTIONS_VERSION' => 1, - '_LT_COMPILER_OPTION' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - '_LT_AC_TAGVAR' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_PATH_MAGIC' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - 'LT_OUTPUT' => 1, - '_AM_DEPENDENCIES' => 1, - '_LT_AC_LANG_F77' => 1, - 'AM_PROG_LIBTOOL' => 1, - '_LT_DLL_DEF_P' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - '_AC_PROG_LIBTOOL' => 1, - 'm4_include' => 1, - '_LT_PROG_CXX' => 1, - '_AM_PROG_TAR' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'AM_MAKE_INCLUDE' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, - 'AM_ENABLE_SHARED' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'AU_DEFUN' => 1, - 'AC_PROG_NM' => 1, 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - 'LT_CMD_MAX_LEN' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - 'AC_LIBTOOL_FC' => 1, - 'AM_PROG_LD' => 1, - 'AC_LIBTOOL_RC' => 1, - 'AM_PROG_INSTALL_SH' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - '_LT_LINKER_OPTION' => 1, - 'm4_pattern_allow' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - 'LT_PATH_NM' => 1, - 'LT_AC_PROG_SED' => 1, - '_LT_PROG_ECHO_BACKSLASH' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - '_AM_IF_OPTION' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, + 'AC_ENABLE_SHARED' => 1, + 'AC_LTDL_OBJDIR' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + 'AC_DEFUN_ONCE' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + '_AM_SET_OPTION' => 1, + '_LT_AC_PROG_CXXCPP' => 1, + 'AM_MAKE_INCLUDE' => 1, + '_LT_AC_LOCK' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + '_LT_AC_LANG_C_CONFIG' => 1, '_m4_warn' => 1, '_LT_AC_TAGCONFIG' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - '_LT_AC_LOCK' => 1, + '_LT_AC_LANG_CXX' => 1, 'AM_CONDITIONAL' => 1, - 'AC_LIBTOOL_GCJ' => 1, - 'AC_PROG_LD_GNU' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - '_LT_COMPILER_BOILERPLATE' => 1, - 'AC_DEFUN' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - 'LTOBSOLETE_VERSION' => 1, + '_AM_AUTOCONF_VERSION' => 1, '_LT_PROG_LTMAIN' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - 'include' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'LTVERSION_VERSION' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - 'AC_ENABLE_STATIC' => 1, 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - '_AM_PROG_CC_C_O' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'AM_SANITY_CHECK' => 1, - 'LT_AC_PROG_GCJ' => 1, - '_LT_PROG_FC' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, + 'AC_LIBTOOL_CXX' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'AC_PROG_LD_RELOAD_FLAG' => 1, + 'LT_INIT' => 1, + 'AC_LIBTOOL_CONFIG' => 1, 'AM_DISABLE_STATIC' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - 'AC_DISABLE_SHARED' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + '_LT_AC_LANG_GCJ' => 1, + 'LT_LIB_M' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + 'LT_AC_PROG_SED' => 1, + 'LTVERSION_VERSION' => 1, + '_LT_COMPILER_BOILERPLATE' => 1, + 'LT_AC_PROG_GCJ' => 1, + 'AM_PROG_AS' => 1, + 'AC_LIBTOOL_GCJ' => 1, + '_AM_DEPENDENCIES' => 1, + '_LT_PROG_FC' => 1, + '_LT_COMPILER_OPTION' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, + 'm4_pattern_forbid' => 1, + 'AM_SILENT_RULES' => 1, + '_LT_AC_CHECK_DLFCN' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'LT_CMD_MAX_LEN' => 1, '_LT_WITH_SYSROOT' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1 + '_LT_AC_SHELL_INIT' => 1, + '_LT_PROG_CXX' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'LT_PATH_NM' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + '_AM_SET_OPTIONS' => 1, + 'AM_SANITY_CHECK' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + 'AC_CHECK_LIBM' => 1, + 'LT_LANG' => 1, + '_LT_PROG_F77' => 1, + '_AM_IF_OPTION' => 1, + 'AU_DEFUN' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AM_MAINTAINER_MODE' => 1, + '_LT_AC_TAGVAR' => 1, + 'AC_PROG_EGREP' => 1, + 'AM_PROG_NM' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'm4_pattern_allow' => 1, + 'AM_DISABLE_SHARED' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + 'AM_PROG_LD' => 1, + '_AM_SUBST_NOTMAKE' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, + 'LT_AC_PROG_RC' => 1, + '_LT_LINKER_OPTION' => 1, + 'AM_RUN_LOG' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'AM_ENABLE_STATIC' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'AC_ENABLE_FAST_INSTALL' => 1, + 'AC_LIBTOOL_PICMODE' => 1, + 'AC_LIBTOOL_F77' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + '_AC_PROG_LIBTOOL' => 1, + 'LT_PROG_GCJ' => 1, + '_AM_PROG_TAR' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + 'AC_LIBTOOL_FC' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, + 'AM_SET_DEPDIR' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, + '_LT_DLL_DEF_P' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AC_LIBTOOL_PROG_CC_C_O' => 1, + 'AC_DEFUN' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, + 'AM_SUBST_NOTMAKE' => 1, + '_LT_AC_LANG_F77' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + 'AM_PROG_INSTALL_SH' => 1, + 'AC_LIBTOOL_OBJDIR' => 1 } ], 'Autom4te::Request' ) ); diff --git a/external/bdwgc/config.log b/external/bdwgc/config.log index 8fa3b50fef..da26ba57a4 100644 --- a/external/bdwgc/config.log +++ b/external/bdwgc/config.log @@ -10,7 +10,7 @@ generated by GNU Autoconf 2.69. Invocation command line was ## Platform. ## ## --------- ## -hostname = az-ubuntu-general6d86a0 +hostname = az-ubuntu-general757aa1 uname -m = x86_64 uname -r = 4.15.0-1108-azure uname -s = Linux @@ -747,7 +747,7 @@ generated by GNU Autoconf 2.69. Invocation command line was CONFIG_COMMANDS = $ ./config.status -on az-ubuntu-general6d86a0 +on az-ubuntu-general757aa1 config.status:1238: creating Makefile config.status:1238: creating bdw-gc.pc diff --git a/external/bdwgc/libatomic_ops/autom4te.cache/requests b/external/bdwgc/libatomic_ops/autom4te.cache/requests index 7e9668000d..9046356b96 100644 --- a/external/bdwgc/libatomic_ops/autom4te.cache/requests +++ b/external/bdwgc/libatomic_ops/autom4te.cache/requests @@ -41,161 +41,161 @@ 'configure.ac' ], { - 'AC_LIBTOOL_SETUP' => 1, - 'include' => 1, - 'LTSUGAR_VERSION' => 1, - 'LT_INIT' => 1, - '_LT_COMPILER_OPTION' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - '_LT_AC_LANG_CXX' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - '_AM_IF_OPTION' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - 'AM_DISABLE_SHARED' => 1, - 'AM_DEP_TRACK' => 1, - '_AM_SET_OPTIONS' => 1, - 'LTOBSOLETE_VERSION' => 1, - 'AM_PROG_AS' => 1, - 'LT_PATH_LD' => 1, - '_LT_PROG_F77' => 1, - '_LT_AC_LANG_F77' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'LT_PROG_GCJ' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, - 'AC_DEFUN_ONCE' => 1, - '_LT_PROG_ECHO_BACKSLASH' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - 'AC_DEFUN' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'AC_LIBTOOL_RC' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - 'AC_LIBTOOL_CXX' => 1, - '_AM_SET_OPTION' => 1, - 'AM_MISSING_PROG' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - 'AM_PROG_NM' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'm4_pattern_allow' => 1, - 'AM_ENABLE_STATIC' => 1, - 'LTOPTIONS_VERSION' => 1, - 'LT_AC_PROG_SED' => 1, - 'LT_PATH_NM' => 1, - 'AM_CONDITIONAL' => 1, - 'AM_SUBST_NOTMAKE' => 1, - 'AM_SANITY_CHECK' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, - 'AC_PATH_MAGIC' => 1, - 'LT_AC_PROG_RC' => 1, - '_AM_DEPENDENCIES' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'AC_DISABLE_STATIC' => 1, - 'AM_SET_DEPDIR' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - 'AM_PROG_INSTALL_SH' => 1, - '_LT_PROG_LTMAIN' => 1, - 'm4_pattern_forbid' => 1, - 'LT_CMD_MAX_LEN' => 1, - '_AC_PROG_LIBTOOL' => 1, - 'LT_LIB_M' => 1, - 'LT_PROG_GO' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, - 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'AM_PROG_CC_C_O' => 1, - '_LT_LINKER_OPTION' => 1, - '_LT_COMPILER_BOILERPLATE' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - '_LT_PROG_FC' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_LIBTOOL_FC' => 1, - 'AC_LIBTOOL_GCJ' => 1, - '_LT_AC_LANG_GCJ' => 1, - '_LT_AC_SHELL_INIT' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, '_LT_AC_TAGVAR' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AC_LTDL_ENABLE_INSTALL' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - '_LT_WITH_SYSROOT' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - 'AC_PROG_NM' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - '_m4_warn' => 1, - 'AC_PROG_EGREP' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - 'LT_AC_PROG_EGREP' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - 'LT_LANG' => 1, - 'm4_include' => 1, - 'AC_LTDL_OBJDIR' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - '_AM_MANGLE_OPTION' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - 'AM_PROG_LD' => 1, - 'AC_PROG_LD' => 1, - 'AM_SILENT_RULES' => 1, - 'AM_ENABLE_SHARED' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'AC_ENABLE_STATIC' => 1, - 'LT_AC_PROG_GCJ' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - '_LT_AC_SYS_COMPILER' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - '_AM_AUTOCONF_VERSION' => 1, - 'AM_DISABLE_STATIC' => 1, - 'AC_ENABLE_SHARED' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - 'AC_DISABLE_SHARED' => 1, - 'LT_OUTPUT' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + 'AC_LIBTOOL_GCJ' => 1, 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - '_LT_AC_LOCK' => 1, - '_LT_CC_BASENAME' => 1, - 'AC_CHECK_LIBM' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AM_SET_LEADING_DOT' => 1, - '_LT_DLL_DEF_P' => 1, - 'AC_LIBTOOL_F77' => 1, - 'LTVERSION_VERSION' => 1, - 'AC_PROG_LD_GNU' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - 'AM_RUN_LOG' => 1, - '_AM_PROG_TAR' => 1, - 'LT_PROG_RC' => 1, - 'AC_LTDL_PREOPEN' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - '_AM_PROG_CC_C_O' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AU_DEFUN' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - '_LT_PROG_CXX' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, 'AM_MAKE_INCLUDE' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'AM_ENABLE_STATIC' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AC_LIBTOOL_PROG_CC_C_O' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + 'LT_AC_PROG_SED' => 1, + 'AC_DISABLE_STATIC' => 1, + 'm4_pattern_allow' => 1, + '_AM_SET_OPTIONS' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + '_LT_PROG_FC' => 1, + 'LTOBSOLETE_VERSION' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + 'AC_LIBTOOL_RC' => 1, + 'include' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'LT_LIB_M' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'AM_SANITY_CHECK' => 1, + 'AM_PROG_LD' => 1, + 'LT_AC_PROG_EGREP' => 1, + '_LT_AC_CHECK_DLFCN' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'AM_PROG_AS' => 1, + 'AM_DISABLE_STATIC' => 1, + 'AM_SILENT_RULES' => 1, + '_m4_warn' => 1, + 'AC_LIBTOOL_FC' => 1, + 'AM_ENABLE_SHARED' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + '_AM_PROG_CC_C_O' => 1, + 'LT_PATH_LD' => 1, + 'AC_LIBTOOL_PICMODE' => 1, + '_LT_CC_BASENAME' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'AM_SUBST_NOTMAKE' => 1, + 'LT_PROG_RC' => 1, + '_LT_LINKER_OPTION' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AC_PROG_LD_RELOAD_FLAG' => 1, + '_LT_DLL_DEF_P' => 1, + 'AM_SET_DEPDIR' => 1, + 'AC_PATH_MAGIC' => 1, + 'AC_ENABLE_SHARED' => 1, + '_AM_AUTOCONF_VERSION' => 1, + 'LT_CMD_MAX_LEN' => 1, + 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + 'AC_PROG_LD' => 1, + 'AU_DEFUN' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + 'AM_RUN_LOG' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + '_LT_PROG_F77' => 1, + '_AM_IF_OPTION' => 1, + 'LT_PROG_GCJ' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, + 'AM_DISABLE_SHARED' => 1, + '_LT_AC_LANG_CXX' => 1, + 'AC_PROG_LD_GNU' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, + 'AC_CHECK_LIBM' => 1, + 'LTOPTIONS_VERSION' => 1, + 'AC_LTDL_OBJDIR' => 1, + 'LTVERSION_VERSION' => 1, + '_AM_PROG_TAR' => 1, + 'LT_AC_PROG_GCJ' => 1, + 'm4_include' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, + 'AC_DEFUN' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + 'AM_PROG_NM' => 1, + 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, + '_LT_AC_SHELL_INIT' => 1, + 'AM_PROG_INSTALL_SH' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + '_LT_COMPILER_OPTION' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'LT_AC_PROG_RC' => 1, + '_LT_WITH_SYSROOT' => 1, + 'AC_ENABLE_STATIC' => 1, + '_LT_AC_LANG_C_CONFIG' => 1, + 'AC_PROG_EGREP' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, + '_LT_PROG_LTMAIN' => 1, + 'AM_CONDITIONAL' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'AC_PROG_LIBTOOL' => 1, 'AM_MISSING_HAS_RUN' => 1, + 'LT_INIT' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + 'LT_PATH_NM' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + '_AC_PROG_LIBTOOL' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, + '_AM_DEPENDENCIES' => 1, + '_LT_PROG_ECHO_BACKSLASH' => 1, + 'LT_SUPPORTED_TAG' => 1, + '_AM_MANGLE_OPTION' => 1, + 'LT_PROG_GO' => 1, + 'AC_LIBTOOL_SETUP' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, + 'AM_DEP_TRACK' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, + '_LT_PROG_CXX' => 1, + 'LT_LANG' => 1, + 'LT_OUTPUT' => 1, '_LT_AC_TAGCONFIG' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1 + 'AC_LIBTOOL_F77' => 1, + 'AC_DEFUN_ONCE' => 1, + '_LT_AC_PROG_CXXCPP' => 1, + 'AC_LTDL_ENABLE_INSTALL' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + '_LT_AC_SYS_COMPILER' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + '_LT_AC_LANG_F77' => 1, + 'AC_PROG_NM' => 1, + 'm4_pattern_forbid' => 1, + 'LTSUGAR_VERSION' => 1, + '_LT_AC_LANG_GCJ' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AM_MISSING_PROG' => 1, + 'AC_LIBTOOL_CXX' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'AC_DISABLE_SHARED' => 1, + '_LT_AC_LOCK' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + 'AC_ENABLE_FAST_INSTALL' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'AC_LTDL_PREOPEN' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + '_LT_COMPILER_BOILERPLATE' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + '_AM_SET_OPTION' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -210,66 +210,66 @@ 'configure.ac' ], { - '_m4_warn' => 1, - 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_FC_FREEFORM' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'AC_CONFIG_LINKS' => 1, - 'm4_pattern_forbid' => 1, - 'AM_PROG_CXX_C_O' => 1, - 'AM_PROG_F77_C_O' => 1, - 'AC_FC_SRCEXT' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AM_PROG_MOC' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'AM_PROG_AR' => 1, - 'AH_OUTPUT' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AC_FC_PP_DEFINE' => 1, - 'AC_CONFIG_AUX_DIR' => 1, - 'AC_SUBST' => 1, - 'm4_include' => 1, - 'AM_ENABLE_MULTILIB' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'AM_PROG_CC_C_O' => 1, - '_AM_SUBST_NOTMAKE' => 1, - '_AM_COND_IF' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'm4_sinclude' => 1, - 'AM_POT_TOOLS' => 1, - 'AM_XGETTEXT_OPTION' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'AM_SILENT_RULES' => 1, - 'AC_SUBST_TRACE' => 1, - 'AM_GNU_GETTEXT' => 1, 'LT_INIT' => 1, - '_AM_COND_ELSE' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'AM_PROG_AR' => 1, + 'AM_GNU_GETTEXT' => 1, + 'include' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AC_CANONICAL_HOST' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_LIBSOURCE' => 1, 'AC_INIT' => 1, 'AM_NLS' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'm4_pattern_allow' => 1, + 'AM_ENABLE_MULTILIB' => 1, 'AC_PROG_LIBTOOL' => 1, - 'include' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - 'sinclude' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AM_CONDITIONAL' => 1, - 'AM_PATH_GUILE' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AC_CONFIG_FILES' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, - 'AM_PROG_MKDIR_P' => 1, - 'AC_LIBSOURCE' => 1, + 'm4_include' => 1, + 'AM_PROG_CXX_C_O' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AC_CANONICAL_HOST' => 1, - '_AM_COND_ENDIF' => 1 + 'sinclude' => 1, + '_m4_warn' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'AM_SILENT_RULES' => 1, + 'AC_CONFIG_FILES' => 1, + 'AC_CONFIG_LINKS' => 1, + '_AM_COND_ELSE' => 1, + 'AM_PROG_F77_C_O' => 1, + '_AM_COND_ENDIF' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AH_OUTPUT' => 1, + '_AM_COND_IF' => 1, + 'AC_FC_PP_SRCEXT' => 1, + 'AM_PROG_MKDIR_P' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AC_CONFIG_HEADERS' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'AM_PROG_CC_C_O' => 1, + 'm4_sinclude' => 1, + 'AC_SUBST' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + 'AC_CANONICAL_BUILD' => 1, + 'AM_PROG_FC_C_O' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'AM_PATH_GUILE' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'm4_pattern_forbid' => 1, + 'AC_FC_FREEFORM' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'AC_FC_SRCEXT' => 1, + 'AC_SUBST_TRACE' => 1, + 'AM_PROG_MOC' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AM_POT_TOOLS' => 1, + 'm4_pattern_allow' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + '_AM_SUBST_NOTMAKE' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -310,161 +310,161 @@ 'configure.ac' ], { - '_LT_AC_SYS_COMPILER' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - '_AM_AUTOCONF_VERSION' => 1, - 'AC_ENABLE_SHARED' => 1, - 'AM_DISABLE_STATIC' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - 'AC_DISABLE_SHARED' => 1, - 'LT_OUTPUT' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - '_LT_AC_LOCK' => 1, - '_LT_CC_BASENAME' => 1, - 'AC_CHECK_LIBM' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'LTVERSION_VERSION' => 1, - '_LT_DLL_DEF_P' => 1, - 'AC_LIBTOOL_F77' => 1, - 'AC_PROG_LD_GNU' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - 'AM_RUN_LOG' => 1, - '_AM_PROG_TAR' => 1, - 'LT_PROG_RC' => 1, - 'AC_LTDL_PREOPEN' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - 'AM_PROG_LIBTOOL' => 1, - '_AM_PROG_CC_C_O' => 1, - '_LT_PROG_CXX' => 1, - 'AU_DEFUN' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, - 'AM_MAKE_INCLUDE' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - 'AM_MISSING_HAS_RUN' => 1, - '_LT_AC_TAGCONFIG' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, '_LT_AC_CHECK_DLFCN' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_LIBTOOL_FC' => 1, - 'AC_LIBTOOL_GCJ' => 1, - '_LT_AC_LANG_GCJ' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - '_LT_AC_SHELL_INIT' => 1, - '_LT_AC_TAGVAR' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'AC_LTDL_ENABLE_INSTALL' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - '_LT_WITH_SYSROOT' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'AC_PROG_NM' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - '_m4_warn' => 1, - 'AC_PROG_EGREP' => 1, - '_LT_LINKER_BOILERPLATE' => 1, 'LT_AC_PROG_EGREP' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - 'LT_LANG' => 1, - 'm4_include' => 1, - 'AC_LTDL_OBJDIR' => 1, - '_AM_MANGLE_OPTION' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - 'AM_PROG_LD' => 1, - 'AC_PROG_LD' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, 'AM_SILENT_RULES' => 1, - 'AM_ENABLE_SHARED' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'LT_AC_PROG_GCJ' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AM_PROG_NM' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'm4_pattern_allow' => 1, - 'AM_ENABLE_STATIC' => 1, - 'LTOPTIONS_VERSION' => 1, - 'LT_PATH_NM' => 1, - 'LT_AC_PROG_SED' => 1, - 'AM_CONDITIONAL' => 1, - 'AM_SUBST_NOTMAKE' => 1, - 'AM_SANITY_CHECK' => 1, - 'LT_AC_PROG_RC' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, - '_AM_DEPENDENCIES' => 1, - 'AC_PATH_MAGIC' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - 'AC_DISABLE_STATIC' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'AM_SET_DEPDIR' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - 'AM_PROG_INSTALL_SH' => 1, - '_LT_PROG_LTMAIN' => 1, - 'm4_pattern_forbid' => 1, - '_AC_PROG_LIBTOOL' => 1, - 'LT_CMD_MAX_LEN' => 1, - 'LT_LIB_M' => 1, - 'LT_PROG_GO' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, - 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'AM_PROG_CC_C_O' => 1, - '_LT_LINKER_OPTION' => 1, - '_LT_COMPILER_BOILERPLATE' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - '_LT_PROG_FC' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - 'AC_LIBTOOL_SETUP' => 1, - 'include' => 1, - 'LTSUGAR_VERSION' => 1, - 'LT_INIT' => 1, - '_LT_COMPILER_OPTION' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - '_LT_AC_LANG_CXX' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - '_AM_IF_OPTION' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - 'AM_DISABLE_SHARED' => 1, - 'AM_DEP_TRACK' => 1, - 'LTOBSOLETE_VERSION' => 1, - '_AM_SET_OPTIONS' => 1, - '_LT_PROG_F77' => 1, - 'LT_PATH_LD' => 1, - '_LT_AC_LANG_F77' => 1, + '_m4_warn' => 1, + 'AM_DISABLE_STATIC' => 1, 'AM_PROG_AS' => 1, + 'LT_LIB_M' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'AC_LIBTOOL_RC' => 1, + 'include' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'AM_SANITY_CHECK' => 1, + 'AM_PROG_LD' => 1, + 'AC_DISABLE_STATIC' => 1, + 'm4_pattern_allow' => 1, + '_AM_SET_OPTIONS' => 1, + 'LT_AC_PROG_SED' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + '_LT_PROG_FC' => 1, + 'LTOBSOLETE_VERSION' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + 'AC_LIBTOOL_GCJ' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + '_LT_AC_TAGVAR' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + 'AM_MAKE_INCLUDE' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'AM_ENABLE_STATIC' => 1, + 'AM_PROG_CC_C_O' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_LIBTOOL_PROG_CC_C_O' => 1, + 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'AC_CHECK_LIBM' => 1, + 'LTOPTIONS_VERSION' => 1, + 'LTVERSION_VERSION' => 1, + 'AC_LTDL_OBJDIR' => 1, + 'LT_AC_PROG_GCJ' => 1, + '_AM_PROG_TAR' => 1, + 'm4_include' => 1, + 'AM_MAINTAINER_MODE' => 1, + '_AM_IF_OPTION' => 1, 'LT_PROG_GCJ' => 1, + 'AM_RUN_LOG' => 1, + '_LT_PROG_F77' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'AM_DISABLE_SHARED' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, + '_LT_AC_LANG_CXX' => 1, + 'AC_PROG_LD_GNU' => 1, + 'AM_SET_DEPDIR' => 1, + 'AC_ENABLE_SHARED' => 1, + 'AC_PATH_MAGIC' => 1, + '_LT_DLL_DEF_P' => 1, + '_AM_AUTOCONF_VERSION' => 1, + 'LT_CMD_MAX_LEN' => 1, + 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + 'AC_PROG_LD' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + 'AU_DEFUN' => 1, + 'AC_LIBTOOL_FC' => 1, + 'AM_ENABLE_SHARED' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + '_AM_PROG_CC_C_O' => 1, + 'LT_PATH_LD' => 1, + 'LT_PROG_RC' => 1, + '_LT_LINKER_OPTION' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AC_LIBTOOL_PICMODE' => 1, + '_LT_CC_BASENAME' => 1, 'AC_DISABLE_FAST_INSTALL' => 1, - 'AC_DEFUN_ONCE' => 1, + 'AM_SUBST_NOTMAKE' => 1, + 'AC_PROG_LD_RELOAD_FLAG' => 1, + '_AM_DEPENDENCIES' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, '_LT_PROG_ECHO_BACKSLASH' => 1, + '_AM_MANGLE_OPTION' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'LT_PROG_GO' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, + 'AC_LIBTOOL_SETUP' => 1, + 'AM_CONDITIONAL' => 1, + '_LT_PROG_LTMAIN' => 1, + 'AM_MISSING_HAS_RUN' => 1, + 'AC_PROG_LIBTOOL' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + 'LT_INIT' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + '_AC_PROG_LIBTOOL' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'LT_PATH_NM' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'AM_PROG_INSTALL_SH' => 1, + '_AM_SUBST_NOTMAKE' => 1, + '_LT_COMPILER_OPTION' => 1, + 'LT_AC_PROG_RC' => 1, + '_LT_WITH_SYSROOT' => 1, + 'AC_PROG_EGREP' => 1, + '_LT_AC_LANG_C_CONFIG' => 1, + 'AC_ENABLE_STATIC' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, 'AC_DEFUN' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'AC_LIBTOOL_RC' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - 'AC_LIBTOOL_CXX' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, + '_LT_AC_SHELL_INIT' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + 'AM_PROG_NM' => 1, + 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'AC_LTDL_PREOPEN' => 1, + '_LT_COMPILER_BOILERPLATE' => 1, + 'AM_AUTOMAKE_VERSION' => 1, '_AM_SET_OPTION' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'AM_MISSING_PROG' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1 + 'AC_LIBTOOL_CXX' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + '_LT_AC_LOCK' => 1, + 'AC_ENABLE_FAST_INSTALL' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + 'AC_DISABLE_SHARED' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + '_LT_AC_LANG_F77' => 1, + 'AC_PROG_NM' => 1, + 'LTSUGAR_VERSION' => 1, + '_LT_AC_LANG_GCJ' => 1, + 'm4_pattern_forbid' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, + 'AM_DEP_TRACK' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AC_LIBTOOL_F77' => 1, + '_LT_PROG_CXX' => 1, + 'LT_LANG' => 1, + 'LT_OUTPUT' => 1, + '_LT_AC_PROG_CXXCPP' => 1, + 'AC_LTDL_ENABLE_INSTALL' => 1, + 'AC_DEFUN_ONCE' => 1, + '_LT_AC_SYS_COMPILER' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1 } ], 'Autom4te::Request' ) ); diff --git a/external/bdwgc/libtool.REMOVED.git-id b/external/bdwgc/libtool.REMOVED.git-id index b81a67669b..f9e2db4f3e 100644 --- a/external/bdwgc/libtool.REMOVED.git-id +++ b/external/bdwgc/libtool.REMOVED.git-id @@ -1 +1 @@ -aaff894b1760817106d89a84ce7e5d7c1cf4f1e7 \ No newline at end of file +708c8881d1b51b1b29e63e3e7ce4ac5dab63c520 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 5a605a19ba..70f756ccb3 100644 --- a/mcs/build/common/Consts.cs +++ b/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.12.0.126"; + public const string MonoVersion = "6.12.0.129"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id index baeb5a59d3..2924a6c6e3 100644 --- a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -501ebfb9ac697ca80e5f7c9848ee8902a81cf95c \ No newline at end of file +0ec1d45b9ed01f430dfd6d31fa784c72db11abd8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id index a0e74b6b31..6386b49d44 100644 --- a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -d78ceb9530a15cbff4980b7826721b8434df8381 \ No newline at end of file +f9d30412c54baeac181a8d1256845e6d46d8a8df \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id index bdc6737db2..9cc42d852e 100644 --- a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -6396cccac765c2aef0e4bd844dc389c3979826d6 \ No newline at end of file +39b13de32be0854a09abfa8526d94aba0f8848f9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id index a2652d16e3..f9dfc7f0ec 100644 --- a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -4489c61a9fe332fd058274eadd0e1cb05e09dc5c \ No newline at end of file +edb4e6230d7668dd081a7ef80a97684aa1d7fd56 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id index 16e1389659..7b0fd7aa0d 100644 --- a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -1ed59b36063adb664a770c69e097795577691ab7 \ No newline at end of file +d168c768119c9fd79ff70cb2f309350f39a38c89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id index d4970fc46e..5751bb0bd9 100644 --- a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c649f0eddb6c2767e372b3b586371bf66aafd132 \ No newline at end of file +2b785f778ebd588b4d3f15d738ed389a46776b36 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id index c417014bd3..791c07b2fe 100644 --- a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -010951884ef3bdea13353971bd90310285d3c47f \ No newline at end of file +884e28709dedbdc3b90db415ea64722128fcbaf9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id index 82a648b260..cdb42ed555 100644 --- a/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -e32b99e3b2be977771f61fb5a23e9ffc98739ef7 \ No newline at end of file +ac5fb58bed2966fd5a98a6d29e90d67cd58adb23 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id index baeb5a59d3..2924a6c6e3 100644 --- a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -501ebfb9ac697ca80e5f7c9848ee8902a81cf95c \ No newline at end of file +0ec1d45b9ed01f430dfd6d31fa784c72db11abd8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id index a0e74b6b31..6386b49d44 100644 --- a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -d78ceb9530a15cbff4980b7826721b8434df8381 \ No newline at end of file +f9d30412c54baeac181a8d1256845e6d46d8a8df \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id index bdc6737db2..9cc42d852e 100644 --- a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -6396cccac765c2aef0e4bd844dc389c3979826d6 \ No newline at end of file +39b13de32be0854a09abfa8526d94aba0f8848f9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id index a2652d16e3..f9dfc7f0ec 100644 --- a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -4489c61a9fe332fd058274eadd0e1cb05e09dc5c \ No newline at end of file +edb4e6230d7668dd081a7ef80a97684aa1d7fd56 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id index 16e1389659..7b0fd7aa0d 100644 --- a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -1ed59b36063adb664a770c69e097795577691ab7 \ No newline at end of file +d168c768119c9fd79ff70cb2f309350f39a38c89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id index d4970fc46e..5751bb0bd9 100644 --- a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c649f0eddb6c2767e372b3b586371bf66aafd132 \ No newline at end of file +2b785f778ebd588b4d3f15d738ed389a46776b36 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id index c417014bd3..791c07b2fe 100644 --- a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -010951884ef3bdea13353971bd90310285d3c47f \ No newline at end of file +884e28709dedbdc3b90db415ea64722128fcbaf9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id index 82a648b260..cdb42ed555 100644 --- a/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -e32b99e3b2be977771f61fb5a23e9ffc98739ef7 \ No newline at end of file +ac5fb58bed2966fd5a98a6d29e90d67cd58adb23 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id index baeb5a59d3..2924a6c6e3 100644 --- a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -501ebfb9ac697ca80e5f7c9848ee8902a81cf95c \ No newline at end of file +0ec1d45b9ed01f430dfd6d31fa784c72db11abd8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id index a0e74b6b31..6386b49d44 100644 --- a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -d78ceb9530a15cbff4980b7826721b8434df8381 \ No newline at end of file +f9d30412c54baeac181a8d1256845e6d46d8a8df \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id index bdc6737db2..9cc42d852e 100644 --- a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -6396cccac765c2aef0e4bd844dc389c3979826d6 \ No newline at end of file +39b13de32be0854a09abfa8526d94aba0f8848f9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id index a2652d16e3..f9dfc7f0ec 100644 --- a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -4489c61a9fe332fd058274eadd0e1cb05e09dc5c \ No newline at end of file +edb4e6230d7668dd081a7ef80a97684aa1d7fd56 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id index 16e1389659..7b0fd7aa0d 100644 --- a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -1ed59b36063adb664a770c69e097795577691ab7 \ No newline at end of file +d168c768119c9fd79ff70cb2f309350f39a38c89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id index d4970fc46e..5751bb0bd9 100644 --- a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c649f0eddb6c2767e372b3b586371bf66aafd132 \ No newline at end of file +2b785f778ebd588b4d3f15d738ed389a46776b36 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id index c417014bd3..791c07b2fe 100644 --- a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -010951884ef3bdea13353971bd90310285d3c47f \ No newline at end of file +884e28709dedbdc3b90db415ea64722128fcbaf9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id index 82a648b260..cdb42ed555 100644 --- a/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -e32b99e3b2be977771f61fb5a23e9ffc98739ef7 \ No newline at end of file +ac5fb58bed2966fd5a98a6d29e90d67cd58adb23 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id index baeb5a59d3..2924a6c6e3 100644 --- a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -501ebfb9ac697ca80e5f7c9848ee8902a81cf95c \ No newline at end of file +0ec1d45b9ed01f430dfd6d31fa784c72db11abd8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id index a0e74b6b31..6386b49d44 100644 --- a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -d78ceb9530a15cbff4980b7826721b8434df8381 \ No newline at end of file +f9d30412c54baeac181a8d1256845e6d46d8a8df \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id index b95942ac83..b6af10e9c9 100644 --- a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -a069eb5fd335ab2649cb8e2d67657cdf5cb54cc3 \ No newline at end of file +80f70d0e346d03f320221e83c44628b24ba4d302 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id index a2652d16e3..f9dfc7f0ec 100644 --- a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -4489c61a9fe332fd058274eadd0e1cb05e09dc5c \ No newline at end of file +edb4e6230d7668dd081a7ef80a97684aa1d7fd56 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id index 16e1389659..7b0fd7aa0d 100644 --- a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -1ed59b36063adb664a770c69e097795577691ab7 \ No newline at end of file +d168c768119c9fd79ff70cb2f309350f39a38c89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id index d4970fc46e..5751bb0bd9 100644 --- a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c649f0eddb6c2767e372b3b586371bf66aafd132 \ No newline at end of file +2b785f778ebd588b4d3f15d738ed389a46776b36 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id index c417014bd3..791c07b2fe 100644 --- a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -010951884ef3bdea13353971bd90310285d3c47f \ No newline at end of file +884e28709dedbdc3b90db415ea64722128fcbaf9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id index 167d3d4e79..7267f1c196 100644 --- a/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -9fc05010b984fbd4832d6f42a203b8964973f379 \ No newline at end of file +6850c63dc98285d5ef1bfe50fb1d952b2463fd13 \ No newline at end of file diff --git a/mono/arch/arm64/Makefile.am b/mono/arch/arm64/Makefile.am index bdc37622a6..e735d0ed69 100644 --- a/mono/arch/arm64/Makefile.am +++ b/mono/arch/arm64/Makefile.am @@ -1,3 +1,9 @@ MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules EXTRA_DIST = arm64-codegen.h codegen-test.c + +test-codegen: + $(CC) $(CFLAGS) -I../../.. -I../../eglib/ ../../eglib/.libs/libeglib.a -o codegen-test codegen-test.c + ./codegen-test > tmp.s + $(CC) $(CFLAGS) -c -o tmp.o tmp.s + objdump -d --triple=arm64e tmp.o diff --git a/mono/arch/arm64/Makefile.in b/mono/arch/arm64/Makefile.in index 09624c78b0..637d58e8c6 100644 --- a/mono/arch/arm64/Makefile.in +++ b/mono/arch/arm64/Makefile.in @@ -617,6 +617,12 @@ uninstall-am: .PRECIOUS: Makefile +test-codegen: + $(CC) $(CFLAGS) -I../../.. -I../../eglib/ ../../eglib/.libs/libeglib.a -o codegen-test codegen-test.c + ./codegen-test > tmp.s + $(CC) $(CFLAGS) -c -o tmp.o tmp.s + objdump -d --triple=arm64e tmp.o + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/mono/arch/arm64/arm64-codegen.h b/mono/arch/arm64/arm64-codegen.h index 239f4161fd..d35fda1175 100644 --- a/mono/arch/arm64/arm64-codegen.h +++ b/mono/arch/arm64/arm64-codegen.h @@ -867,4 +867,40 @@ arm_encode_arith_imm (int imm, guint32 *shift) #define arm_cmpp arm_cmpx #endif +/* ARM v8.3 */ + +/* PACIA */ + +#define arm_format_pacia(p, crm, op2) arm_emit ((p), (0b11010101000000110010000000011111 << 0) | ((crm) << 8) | ((op2) << 5)) +#define arm_paciasp(p) arm_format_pacia ((p), 0b0011, 0b001) + +/* PACIB */ + +#define arm_format_pacib(p, crm, op2) arm_emit ((p), (0b11010101000000110010000000011111 << 0) | ((crm) << 8) | ((op2) << 5)) +#define arm_pacibsp(p) arm_format_pacib ((p), 0b0011, 0b011) + +/* RETA */ +#define arm_format_reta(p,key) arm_emit ((p), 0b11010110010111110000101111111111 + ((key) << 10)) + +#define arm_retaa(p) arm_format_reta ((p),0) +#define arm_retab(p) arm_format_reta ((p),1) + +/* BRA */ + +#define arm_format_bra(p, z, m, rn, rm) arm_emit ((p), (0b1101011000011111000010 << 10) + ((z) << 24) + ((m) << 10) + ((rn) << 5) + ((rm) << 0)) + +#define arm_braaz(p, rn) arm_format_bra ((p), 0, 0, (rn), 0b11111) +#define arm_brabz(p, rn) arm_format_bra ((p), 0, 1, (rn), 0b11111) +#define arm_braa(p, rn, rm) arm_format_bra ((p), 1, 0, (rn), (rm)) +#define arm_brab(p, rn, rm) arm_format_bra ((p), 1, 1, (rn), (rm)) + +/* BLRA */ + +#define arm_format_blra(p, z, m, rn, rm) arm_emit ((p), (0b1101011000111111000010 << 10) + ((z) << 24) + ((m) << 10) + ((rn) << 5) + ((rm) << 0)) + +#define arm_blraaz(p, rn) arm_format_blra ((p), 0, 0, (rn), 0b11111) +#define arm_blraa(p, rn, rm) arm_format_blra ((p), 1, 0, (rn), (rm)) +#define arm_blrabz(p, rn) arm_format_blra ((p), 0, 1, (rn), 0b11111) +#define arm_blrab(p, rn, rm) arm_format_blra ((p), 1, 1, (rn), (rm)) + #endif /* __arm_CODEGEN_H__ */ diff --git a/mono/arch/arm64/codegen-test.c b/mono/arch/arm64/codegen-test.c index bb9d9dcdec..efb991e842 100644 --- a/mono/arch/arm64/codegen-test.c +++ b/mono/arch/arm64/codegen-test.c @@ -416,6 +416,19 @@ main (int argc, char *argv []) arm_stlxrx (code, ARMREG_R0, ARMREG_R1, ARMREG_R2); arm_stlxrw (code, ARMREG_R0, ARMREG_R1, ARMREG_R2); + arm_paciasp (code); + arm_pacibsp (code); + arm_retaa (code); + arm_retab (code); + arm_braaz (code, ARMREG_R1); + arm_brabz (code, ARMREG_R1); + arm_braa (code, ARMREG_R1, ARMREG_R2); + arm_brab (code, ARMREG_R1, ARMREG_R2); + arm_blraaz (code, ARMREG_R1); + arm_blraa (code, ARMREG_R1, ARMREG_R2); + arm_blrabz (code, ARMREG_R1); + arm_blrab (code, ARMREG_R1, ARMREG_R2); + for (i = 0; i < code - buf; ++i) printf (".byte %d\n", buf [i]); printf ("\n"); diff --git a/mono/eglib/eglib-remap.h b/mono/eglib/eglib-remap.h index c5e27adae8..c9751049c3 100644 --- a/mono/eglib/eglib-remap.h +++ b/mono/eglib/eglib-remap.h @@ -311,3 +311,6 @@ #define g_set_printerr_handler monoeg_set_printerr_handler #define g_size_to_int monoeg_size_to_int +#define g_ascii_charcmp monoeg_ascii_charcmp +#define g_ascii_charcasecmp monoeg_ascii_charcasecmp +#define g_warning_d monoeg_warning_d diff --git a/mono/mini/aot-compiler.c.REMOVED.git-id b/mono/mini/aot-compiler.c.REMOVED.git-id index 40b4f05dbf..4b832d1956 100644 --- a/mono/mini/aot-compiler.c.REMOVED.git-id +++ b/mono/mini/aot-compiler.c.REMOVED.git-id @@ -1 +1 @@ -e0dcfbc0b15a5f9e7762d94d9e35385ee4999ab9 \ No newline at end of file +b2dcabf154a69e137755421dc49d4196f02df309 \ No newline at end of file diff --git a/mono/mini/exceptions-arm64.c b/mono/mini/exceptions-arm64.c index 11cb6ccdd9..3c06a2ac07 100644 --- a/mono/mini/exceptions-arm64.c +++ b/mono/mini/exceptions-arm64.c @@ -36,6 +36,8 @@ mono_arch_get_restore_context (MonoTrampInfo **info, gboolean aot) size = 256; code = start = mono_global_codeman_reserve (size); + MINI_BEGIN_CODEGEN (); + arm_movx (code, ARMREG_IP0, ARMREG_R0); ctx_reg = ARMREG_IP0; @@ -63,8 +65,8 @@ mono_arch_get_restore_context (MonoTrampInfo **info, gboolean aot) arm_brk (code, 0); g_assert ((code - start) < size); - mono_arch_flush_icache (start, code - start); - MONO_PROFILER_RAISE (jit_code_buffer, (start, code - start, MONO_PROFILER_CODE_BUFFER_EXCEPTION_HANDLING, NULL)); + + MINI_END_CODEGEN (start, code - start, MONO_PROFILER_CODE_BUFFER_EXCEPTION_HANDLING, NULL); if (info) *info = mono_tramp_info_create ("restore_context", start, code - start, ji, unwind_ops); @@ -106,6 +108,8 @@ mono_arch_get_call_filter (MonoTrampInfo **info, gboolean aot) * returning the value returned by the call. */ + MINI_BEGIN_CODEGEN (); + /* Setup a frame */ arm_stpx_pre (code, ARMREG_FP, ARMREG_LR, ARMREG_SP, -frame_size); arm_movspx (code, ARMREG_FP, ARMREG_SP); @@ -152,8 +156,8 @@ mono_arch_get_call_filter (MonoTrampInfo **info, gboolean aot) arm_retx (code, ARMREG_LR); g_assert ((code - start) < size); - mono_arch_flush_icache (start, code - start); - MONO_PROFILER_RAISE (jit_code_buffer, (start, code - start, MONO_PROFILER_CODE_BUFFER_EXCEPTION_HANDLING, NULL)); + + MINI_END_CODEGEN (start, code - start, MONO_PROFILER_CODE_BUFFER_EXCEPTION_HANDLING, NULL); if (info) *info = mono_tramp_info_create ("call_filter", start, code - start, ji, unwind_ops); @@ -186,6 +190,8 @@ get_throw_trampoline (int size, gboolean corlib, gboolean rethrow, gboolean llvm offset += num_fregs * 8; frame_size = ALIGN_TO (offset, MONO_ARCH_FRAME_ALIGNMENT); + MINI_BEGIN_CODEGEN (); + /* Setup a frame */ arm_stpx_pre (code, ARMREG_FP, ARMREG_LR, ARMREG_SP, -frame_size); arm_movspx (code, ARMREG_FP, ARMREG_SP); @@ -254,8 +260,8 @@ get_throw_trampoline (int size, gboolean corlib, gboolean rethrow, gboolean llvm arm_brk (code, 0x0); g_assert ((code - start) < size); - mono_arch_flush_icache (start, code - start); - MONO_PROFILER_RAISE (jit_code_buffer, (start, code - start, MONO_PROFILER_CODE_BUFFER_EXCEPTION_HANDLING, NULL)); + + MINI_END_CODEGEN (start, code - start, MONO_PROFILER_CODE_BUFFER_EXCEPTION_HANDLING, NULL); if (info) *info = mono_tramp_info_create (tramp_name, start, code - start, ji, unwind_ops); @@ -329,9 +335,6 @@ mono_arch_exceptions_init (void) GSList *tramps, *l; if (mono_aot_only) { - - // FIXME Macroize. - tramp = mono_aot_get_trampoline ("llvm_throw_corlib_exception_trampoline"); mono_register_jit_icall_info (&mono_get_jit_icall_info ()->mono_llvm_throw_corlib_exception_trampoline, tramp, "llvm_throw_corlib_exception_trampoline", NULL, TRUE, NULL); @@ -340,7 +343,6 @@ mono_arch_exceptions_init (void) tramp = mono_aot_get_trampoline ("llvm_resume_unwind_trampoline"); mono_register_jit_icall_info (&mono_get_jit_icall_info ()->mono_llvm_resume_unwind_trampoline, tramp, "llvm_resume_unwind_trampoline", NULL, TRUE, NULL); - } else { tramps = mono_arm_get_exception_trampolines (FALSE); for (l = tramps; l; l = l->next) { diff --git a/mono/mini/helpers.c b/mono/mini/helpers.c index 3ceffe6f13..b62361ed53 100644 --- a/mono/mini/helpers.c +++ b/mono/mini/helpers.c @@ -263,7 +263,7 @@ mono_disassemble_code (MonoCompile *cfg, guint8 *code, int size, char *id) fflush (stdout); -#if defined(__arm__) || defined(__aarch64__) +#if (defined(__arm__) || defined(__aarch64__)) && !defined(TARGET_OSX) /* * The arm assembler inserts ELF directives instructing objdump to display * everything as data. diff --git a/mono/mini/llvm-jit.cpp b/mono/mini/llvm-jit.cpp index 9f4d4d2cb8..68107c2713 100644 --- a/mono/mini/llvm-jit.cpp +++ b/mono/mini/llvm-jit.cpp @@ -187,7 +187,7 @@ struct MonoLLVMJIT { void *sym = nullptr; auto err = mono_dl_symbol (current, name, &sym); if (!sym) { - outs () << "R: " << namestr << "\n"; + outs () << "R: " << namestr << " " << err << "\n"; } assert (sym); return JITSymbol{(uint64_t)(gssize)sym, flags}; diff --git a/mono/mini/mini-arm64.c.REMOVED.git-id b/mono/mini/mini-arm64.c.REMOVED.git-id index 7398725e1f..30907979e9 100644 --- a/mono/mini/mini-arm64.c.REMOVED.git-id +++ b/mono/mini/mini-arm64.c.REMOVED.git-id @@ -1 +1 @@ -6b420e10b0be02fe8d4f890130ae5a5a10648616 \ No newline at end of file +2dc1a5532ef80957a46fb5df6a84cbdc4135de0e \ No newline at end of file diff --git a/mono/mini/mini-arm64.h b/mono/mini/mini-arm64.h index 381160ebdc..9f6784be91 100644 --- a/mono/mini/mini-arm64.h +++ b/mono/mini/mini-arm64.h @@ -168,6 +168,9 @@ typedef struct { #define MONO_ARCH_FLOAT32_SUPPORTED 1 #define MONO_ARCH_HAVE_INTERP_PINVOKE_TRAMP 1 #define MONO_ARCH_LLVM_TARGET_LAYOUT "e-i64:64-i128:128-n32:64-S128" +#ifdef TARGET_OSX +#define MONO_ARCH_FORCE_FLOAT32 1 +#endif // Does the ABI have a volatile non-parameter register, so tailcall // can pass context to generics or interfaces? @@ -241,7 +244,7 @@ typedef struct { struct CallInfo { int nargs; int gr, fr, stack_usage; - gboolean pinvoke; + gboolean pinvoke, vararg; ArgInfo ret; ArgInfo sig_cookie; ArgInfo args [1]; diff --git a/mono/mini/mini-llvm.c.REMOVED.git-id b/mono/mini/mini-llvm.c.REMOVED.git-id index d6676dc9eb..770887426e 100644 --- a/mono/mini/mini-llvm.c.REMOVED.git-id +++ b/mono/mini/mini-llvm.c.REMOVED.git-id @@ -1 +1 @@ -9287d5656e39f7e584cd7292025e945476b6b3dc \ No newline at end of file +57113a19dcf4d6cc01eb48e50612c55f66275f7d \ No newline at end of file diff --git a/mono/mini/mini-runtime.c.REMOVED.git-id b/mono/mini/mini-runtime.c.REMOVED.git-id index 2e06025ef0..0faba8f348 100644 --- a/mono/mini/mini-runtime.c.REMOVED.git-id +++ b/mono/mini/mini-runtime.c.REMOVED.git-id @@ -1 +1 @@ -3b44af7adff6c9839158f50fa08c49f66fef543d \ No newline at end of file +4619638f31be476c564809f2c68fdbfe9a5dce23 \ No newline at end of file diff --git a/mono/mini/mini-runtime.h b/mono/mini/mini-runtime.h index e2fd25ae4d..122b107e5d 100644 --- a/mono/mini/mini-runtime.h +++ b/mono/mini/mini-runtime.h @@ -608,5 +608,16 @@ gboolean MONO_SIG_HANDLER_SIGNATURE (mono_chain_signal); void mini_register_sigterm_handler (void); +#define MINI_BEGIN_CODEGEN() do { \ + mono_codeman_enable_write (); \ + } while (0) + +#define MINI_END_CODEGEN(buf,size,type,arg) do { \ + mono_codeman_disable_write (); \ + mono_arch_flush_icache ((buf), (size)); \ + if ((int)type != -1) \ + MONO_PROFILER_RAISE (jit_code_buffer, ((buf), (size), (type), (arg))); \ + } while (0) + #endif /* __MONO_MINI_RUNTIME_H__ */ diff --git a/mono/mini/mini.c.REMOVED.git-id b/mono/mini/mini.c.REMOVED.git-id index 6200da2100..b5e1dc37c6 100644 --- a/mono/mini/mini.c.REMOVED.git-id +++ b/mono/mini/mini.c.REMOVED.git-id @@ -1 +1 @@ -9b5b2cba220be5f436d8c7d16144e52eb1a65d70 \ No newline at end of file +10d5efb73f305b30dd2a0ce51577f7fae355e184 \ No newline at end of file diff --git a/mono/mini/mini.h.REMOVED.git-id b/mono/mini/mini.h.REMOVED.git-id index 58b71a1c14..87aab36814 100644 --- a/mono/mini/mini.h.REMOVED.git-id +++ b/mono/mini/mini.h.REMOVED.git-id @@ -1 +1 @@ -ca2d416e733dcdcb5c4571697655318de0a37220 \ No newline at end of file +5099cdaaf96083e328c04d8692d341fb3792c893 \ No newline at end of file diff --git a/mono/mini/trace.c b/mono/mini/trace.c index d9bca2f144..571aa492c6 100644 --- a/mono/mini/trace.c +++ b/mono/mini/trace.c @@ -27,7 +27,7 @@ #include "trace.h" #include -#if defined (HOST_ANDROID) || (defined (TARGET_IOS) && defined (TARGET_IOS)) +#if defined (HOST_ANDROID) || defined (TARGET_IOS) # undef printf # define printf(...) g_log("mono", G_LOG_LEVEL_MESSAGE, __VA_ARGS__) # undef fprintf diff --git a/mono/mini/tramp-arm64-gsharedvt.c b/mono/mini/tramp-arm64-gsharedvt.c index c1038511d6..269624c259 100644 --- a/mono/mini/tramp-arm64-gsharedvt.c +++ b/mono/mini/tramp-arm64-gsharedvt.c @@ -13,6 +13,7 @@ #include "mini.h" #include "mini-arm64.h" #include "mini-arm64-gsharedvt.h" +#include "mini-runtime.h" /* * GSHAREDVT @@ -36,13 +37,16 @@ mono_arch_get_gsharedvt_arg_trampoline (MonoDomain *domain, gpointer arg, gpoint */ buf = code = mono_global_codeman_reserve (buf_len); + MINI_BEGIN_CODEGEN (); + code = mono_arm_emit_imm64 (code, ARMREG_IP1, (guint64)arg); code = mono_arm_emit_imm64 (code, ARMREG_IP0, (guint64)addr); arm_brx (code, ARMREG_IP0); g_assert ((code - buf) < buf_len); - mono_arch_flush_icache (buf, code - buf); + + MINI_END_CODEGEN (buf, code - buf, -1, NULL); return buf; } @@ -248,6 +252,8 @@ mono_arch_get_gsharedvt_trampoline (MonoTrampInfo **info, gboolean aot) cfa_offset = offset; + MINI_BEGIN_CODEGEN (); + /* Setup frame */ arm_stpx_pre (code, ARMREG_FP, ARMREG_LR, ARMREG_SP, -cfa_offset); mono_add_unwind_op_def_cfa (unwind_ops, code, buf, ARMREG_SP, cfa_offset); @@ -547,7 +553,8 @@ mono_arch_get_gsharedvt_trampoline (MonoTrampInfo **info, gboolean aot) if (info) *info = mono_tramp_info_create ("gsharedvt_trampoline", buf, code - buf, ji, unwind_ops); - mono_arch_flush_icache (buf, code - buf); + MINI_END_CODEGEN (buf, code - buf, -1, NULL); + return buf; } diff --git a/mono/mini/tramp-arm64.c b/mono/mini/tramp-arm64.c index 04eda906c4..7b889a3ffd 100644 --- a/mono/mini/tramp-arm64.c +++ b/mono/mini/tramp-arm64.c @@ -30,8 +30,9 @@ void mono_arch_patch_callsite (guint8 *method_start, guint8 *code_ptr, guint8 *addr) { + MINI_BEGIN_CODEGEN (); mono_arm_patch (code_ptr - 4, addr, MONO_R_ARM64_BL); - mono_arch_flush_icache (code_ptr - 4, 4); + MINI_END_CODEGEN (code_ptr - 4, 4, -1, NULL); } void @@ -133,6 +134,8 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf //offset += 22 * 8; frame_size = ALIGN_TO (offset, MONO_ARCH_FRAME_ALIGNMENT); + MINI_BEGIN_CODEGEN (); + /* Setup stack frame */ imm = frame_size; mono_add_unwind_op_def_cfa (unwind_ops, code, buf, ARMREG_SP, 0); @@ -303,8 +306,8 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf arm_brx (code, ARMREG_IP0); g_assert ((code - buf) < buf_len); - mono_arch_flush_icache (buf, code - buf); - MONO_PROFILER_RAISE (jit_code_buffer, (buf, code - buf, MONO_PROFILER_CODE_BUFFER_HELPER, NULL)); + + MINI_END_CODEGEN (buf, code - buf, MONO_PROFILER_CODE_BUFFER_HELPER, NULL); if (info) { tramp_name = mono_get_generic_trampoline_name (tramp_type); @@ -328,14 +331,16 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty buf = code = mono_domain_code_reserve (domain, buf_len); + MINI_BEGIN_CODEGEN (); + code = mono_arm_emit_imm64 (code, ARMREG_IP1, (guint64)arg1); code = mono_arm_emit_imm64 (code, ARMREG_IP0, (guint64)tramp); arm_brx (code, ARMREG_IP0); g_assert ((code - buf) < buf_len); - mono_arch_flush_icache (buf, code - buf); - MONO_PROFILER_RAISE (jit_code_buffer, (buf, code - buf, MONO_PROFILER_CODE_BUFFER_SPECIFIC_TRAMPOLINE, mono_get_generic_trampoline_simple_name (tramp_type))); + + MINI_END_CODEGEN (buf, code - buf, MONO_PROFILER_CODE_BUFFER_SPECIFIC_TRAMPOLINE, mono_get_generic_trampoline_simple_name (tramp_type)); if (code_len) *code_len = code - buf; @@ -351,13 +356,17 @@ mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr) MonoDomain *domain = mono_domain_get (); start = code = mono_domain_code_reserve (domain, size); + + MINI_BEGIN_CODEGEN (); + code = mono_arm_emit_imm64 (code, ARMREG_IP0, (guint64)addr); arm_addx_imm (code, ARMREG_R0, ARMREG_R0, MONO_ABI_SIZEOF (MonoObject)); arm_brx (code, ARMREG_IP0); g_assert ((code - start) <= size); - mono_arch_flush_icache (start, code - start); - MONO_PROFILER_RAISE (jit_code_buffer, (start, code - start, MONO_PROFILER_CODE_BUFFER_UNBOX_TRAMPOLINE, m)); + + MINI_END_CODEGEN (start, code - start, MONO_PROFILER_CODE_BUFFER_UNBOX_TRAMPOLINE, m); + return start; } @@ -369,14 +378,16 @@ mono_arch_get_static_rgctx_trampoline (gpointer arg, gpointer addr) MonoDomain *domain = mono_domain_get (); start = code = mono_domain_code_reserve (domain, buf_len); + + MINI_BEGIN_CODEGEN (); + code = mono_arm_emit_imm64 (code, MONO_ARCH_RGCTX_REG, (guint64)arg); code = mono_arm_emit_imm64 (code, ARMREG_IP0, (guint64)addr); arm_brx (code, ARMREG_IP0); - g_assert ((code - start) <= buf_len); + MINI_END_CODEGEN (start, code - start, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL); - mono_arch_flush_icache (start, code - start); - MONO_PROFILER_RAISE (jit_code_buffer, (start, code - start, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL)); + g_assert ((code - start) <= buf_len); return start; } @@ -415,6 +426,8 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info /* The vtable/mrgtx is in R0 */ g_assert (MONO_ARCH_VTABLE_REG == ARMREG_R0); + MINI_BEGIN_CODEGEN (); + if (is_mrgctx) { /* get mrgctx ptr */ arm_movx (code, ARMREG_IP1, ARMREG_R0); @@ -468,11 +481,10 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info } arm_brx (code, ARMREG_IP0); - mono_arch_flush_icache (buf, code - buf); - MONO_PROFILER_RAISE (jit_code_buffer, (buf, code - buf, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL)); - g_assert (code - buf <= buf_size); + MINI_END_CODEGEN (buf, code - buf, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL); + if (info) { char *name = mono_get_rgctx_fetch_trampoline_name (slot); *info = mono_tramp_info_create (name, buf, code - buf, ji, unwind_ops); @@ -498,6 +510,8 @@ mono_arch_create_general_rgctx_lazy_fetch_trampoline (MonoTrampInfo **info, gboo mono_add_unwind_op_def_cfa (unwind_ops, code, buf, ARMREG_SP, 0); + MINI_BEGIN_CODEGEN (); + // FIXME: Currently, we always go to the slow path. /* Load trampoline addr */ arm_ldrx (code, ARMREG_IP0, MONO_ARCH_RGCTX_REG, 8); @@ -505,11 +519,10 @@ mono_arch_create_general_rgctx_lazy_fetch_trampoline (MonoTrampInfo **info, gboo g_assert (MONO_ARCH_VTABLE_REG == ARMREG_R0); arm_brx (code, ARMREG_IP0); - mono_arch_flush_icache (buf, code - buf); - MONO_PROFILER_RAISE (jit_code_buffer, (buf, code - buf, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL)); - g_assert (code - buf <= tramp_size); + MINI_END_CODEGEN (buf, code - buf, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL); + if (info) *info = mono_tramp_info_create ("rgctx_fetch_trampoline_general", buf, code - buf, ji, unwind_ops); @@ -547,6 +560,8 @@ mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gbo // FIXME: Unwind info + MINI_BEGIN_CODEGEN (); + /* Setup stack frame */ imm = frame_size; while (imm > 256) { @@ -605,10 +620,10 @@ mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gbo arm_retx (code, ARMREG_LR); - mono_arch_flush_icache (code, code - buf); - MONO_PROFILER_RAISE (jit_code_buffer, (buf, code - buf, MONO_PROFILER_CODE_BUFFER_HELPER, NULL)); g_assert (code - buf <= tramp_size); + MINI_END_CODEGEN (buf, code - buf, MONO_PROFILER_CODE_BUFFER_HELPER, NULL); + const char *tramp_name = single_step ? "sdb_single_step_trampoline" : "sdb_breakpoint_trampoline"; *info = mono_tramp_info_create (tramp_name, buf, code - buf, ji, unwind_ops); @@ -644,6 +659,8 @@ mono_arch_get_interp_to_native_trampoline (MonoTrampInfo **info) framesize = ALIGN_TO (framesize, MONO_ARCH_FRAME_ALIGNMENT); + MINI_BEGIN_CODEGEN (); + arm_subx_imm (code, ARMREG_SP, ARMREG_SP, framesize); arm_stpx (code, ARMREG_FP, ARMREG_LR, ARMREG_SP, 0); arm_movspx (code, ARMREG_FP, ARMREG_SP); @@ -712,8 +729,7 @@ mono_arch_get_interp_to_native_trampoline (MonoTrampInfo **info) g_assert (code - start < buf_len); - mono_arch_flush_icache (start, code - start); - MONO_PROFILER_RAISE (jit_code_buffer, (start, code - start, MONO_PROFILER_CODE_BUFFER_HELPER, NULL)); + MINI_END_CODEGEN (start, code - start, MONO_PROFILER_CODE_BUFFER_HELPER, NULL); if (info) *info = mono_tramp_info_create ("interp_to_native_trampoline", start, code - start, ji, unwind_ops); @@ -744,6 +760,8 @@ mono_arch_get_native_to_interp_trampoline (MonoTrampInfo **info) offset += sizeof (CallContext); framesize = ALIGN_TO (offset, MONO_ARCH_FRAME_ALIGNMENT); + MINI_BEGIN_CODEGEN (); + mono_add_unwind_op_def_cfa (unwind_ops, code, start, ARMREG_SP, 0); arm_subx_imm (code, ARMREG_SP, ARMREG_SP, framesize); @@ -788,8 +806,7 @@ mono_arch_get_native_to_interp_trampoline (MonoTrampInfo **info) g_assert (code - start < buf_len); - mono_arch_flush_icache (start, code - start); - MONO_PROFILER_RAISE (jit_code_buffer, (start, code - start, MONO_PROFILER_CODE_BUFFER_EXCEPTION_HANDLING, NULL)); + MINI_END_CODEGEN (start, code - start, MONO_PROFILER_CODE_BUFFER_EXCEPTION_HANDLING, NULL); if (info) *info = mono_tramp_info_create ("native_to_interp_trampoline", start, code - start, ji, unwind_ops); diff --git a/mono/mini/version.h b/mono/mini/version.h index 889fce9cc6..579313308f 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/fdf57e7" +#define FULL_VERSION "explicit/be9218f" diff --git a/mono/tests/Makefile.am.REMOVED.git-id b/mono/tests/Makefile.am.REMOVED.git-id index cf4e865826..21ff351a9b 100644 --- a/mono/tests/Makefile.am.REMOVED.git-id +++ b/mono/tests/Makefile.am.REMOVED.git-id @@ -1 +1 @@ -929e9db71c5c6039cf9c1bc5a66ef0d27b90594b \ No newline at end of file +fc76d20d3101f6db66f99ea2e74d57ec2cfba67b \ No newline at end of file diff --git a/mono/tests/Makefile.in.REMOVED.git-id b/mono/tests/Makefile.in.REMOVED.git-id index c43c8d16ed..b2c64e2948 100644 --- a/mono/tests/Makefile.in.REMOVED.git-id +++ b/mono/tests/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -b16a4fffdcd5f108af2144fa7b65b1217807b729 \ No newline at end of file +453c2bf6f337babca79096edd1befa8ae0c4cf29 \ No newline at end of file diff --git a/mono/utils/dtrace.h b/mono/utils/dtrace.h index 540f2588a8..bd3062530f 100644 --- a/mono/utils/dtrace.h +++ b/mono/utils/dtrace.h @@ -10,7 +10,7 @@ #ifndef __UTILS_DTRACE_H__ #define __UTILS_DTRACE_H__ -#ifdef ENABLE_DTRACE +#if defined(ENABLE_DTRACE) && !defined(MONO_GENERATING_OFFSETS) #include diff --git a/mono/utils/mono-codeman.c b/mono/utils/mono-codeman.c index a69f25bb43..234aac4b0c 100644 --- a/mono/utils/mono-codeman.c +++ b/mono/utils/mono-codeman.c @@ -4,6 +4,11 @@ #include "config.h" +#if defined(TARGET_OSX) +/* So we can use the declaration of pthread_jit_write_protect_np () */ +#define _DARWIN_C_SOURCE +#endif + #ifdef HAVE_UNISTD_H #include #endif @@ -27,7 +32,7 @@ static void* mono_code_manager_heap; #endif #include - +#include static uintptr_t code_memory_used = 0; static size_t dynamic_code_alloc_count; @@ -102,6 +107,7 @@ struct _MonoCodeManager { static mono_mutex_t valloc_mutex; static GHashTable *valloc_freelists; +static MonoNativeTlsKey write_level_tls_id; static void* codechunk_valloc (void *preferred, guint32 size) @@ -121,7 +127,9 @@ codechunk_valloc (void *preferred, guint32 size) freelist = (GSList *) g_hash_table_lookup (valloc_freelists, GUINT_TO_POINTER (size)); if (freelist) { ptr = freelist->data; + mono_codeman_enable_write (); memset (ptr, 0, size); + mono_codeman_disable_write (); freelist = g_slist_delete_link (freelist, freelist); g_hash_table_insert (valloc_freelists, GUINT_TO_POINTER (size), freelist); } else { @@ -176,6 +184,8 @@ mono_code_manager_init (void) mono_counters_register ("Dynamic code allocs", MONO_COUNTER_JIT | MONO_COUNTER_ULONG, &dynamic_code_alloc_count); mono_counters_register ("Dynamic code bytes", MONO_COUNTER_JIT | MONO_COUNTER_ULONG, &dynamic_code_bytes_count); mono_counters_register ("Dynamic code frees", MONO_COUNTER_JIT | MONO_COUNTER_ULONG, &dynamic_code_frees_count); + + mono_native_tls_alloc (&write_level_tls_id, NULL); } void @@ -271,7 +281,10 @@ mono_codeman_malloc (gsize n) g_assert (heap); return HeapAlloc (heap, 0, n); #else - return dlmemalign (MIN_ALIGN, n); + mono_codeman_enable_write (); + gpointer res = dlmemalign (MIN_ALIGN, n); + mono_codeman_disable_write (); + return res; #endif } @@ -285,7 +298,9 @@ mono_codeman_free (gpointer p) g_assert (heap); HeapFree (heap, 0, p); #else + mono_codeman_enable_write (); dlfree (p); + mono_codeman_disable_write (); #endif } @@ -476,7 +491,9 @@ new_codechunk (MonoCodeManager *cman, int size) #ifdef BIND_ROOM if (flags == CODE_FLAG_MALLOC) { /* Make sure the thunks area is zeroed */ + mono_codeman_enable_write (); memset (ptr, 0, bsize); + mono_codeman_disable_write (); } #endif @@ -639,3 +656,43 @@ mono_code_manager_size (MonoCodeManager *cman, int *used_size) *used_size = used; return size; } + +/* + * mono_codeman_enable_write (): + * + * Enable writing to code memory on the current thread on platforms that need it. + * Calls can be nested. + */ +void +mono_codeman_enable_write (void) +{ +#if defined(HAVE_PTHREAD_JIT_WRITE_PROTECT_NP) && defined(TARGET_OSX) + if (__builtin_available (macOS 11, *)) { + int level = GPOINTER_TO_INT (mono_native_tls_get_value (write_level_tls_id)); + level ++; + mono_native_tls_set_value (write_level_tls_id, GINT_TO_POINTER (level)); + pthread_jit_write_protect_np (0); + } +#endif +} + +/* + * mono_codeman_disable_write (): + * + * Disable writing to code memory on the current thread on platforms that need it. + * Calls can be nested. + */ +void +mono_codeman_disable_write (void) +{ +#if defined(HAVE_PTHREAD_JIT_WRITE_PROTECT_NP) && defined(TARGET_OSX) + if (__builtin_available (macOS 11, *)) { + int level = GPOINTER_TO_INT (mono_native_tls_get_value (write_level_tls_id)); + g_assert (level); + level --; + mono_native_tls_set_value (write_level_tls_id, GINT_TO_POINTER (level)); + if (level == 0) + pthread_jit_write_protect_np (1); + } +#endif +} diff --git a/mono/utils/mono-codeman.h b/mono/utils/mono-codeman.h index 4cf447f6e0..fbe2a2f2d4 100644 --- a/mono/utils/mono-codeman.h +++ b/mono/utils/mono-codeman.h @@ -41,5 +41,8 @@ void mono_code_manager_install_callbacks (const MonoCodeManagerCallb typedef int (*MonoCodeManagerFunc) (void *data, int csize, int size, void *user_data); void mono_code_manager_foreach (MonoCodeManager *cman, MonoCodeManagerFunc func, void *user_data); +void mono_codeman_enable_write (void); +void mono_codeman_disable_write (void); + #endif /* __MONO_CODEMAN_H__ */ diff --git a/mono/utils/mono-dl.h b/mono/utils/mono-dl.h index 7e81bc5a16..bfbbefc0c0 100644 --- a/mono/utils/mono-dl.h +++ b/mono/utils/mono-dl.h @@ -11,11 +11,7 @@ #ifdef TARGET_WIN32 #define MONO_SOLIB_EXT ".dll" -#elif defined(__ppc__) && defined(TARGET_MACH) -#define MONO_SOLIB_EXT ".dylib" -#elif defined(TARGET_MACH) && defined(TARGET_X86) -#define MONO_SOLIB_EXT ".dylib" -#elif defined(TARGET_MACH) && defined(TARGET_AMD64) +#elif defined(TARGET_MACH) #define MONO_SOLIB_EXT ".dylib" #else #define MONO_SOLIB_EXT ".so" diff --git a/mono/utils/mono-merp.c b/mono/utils/mono-merp.c index 0da6f07a22..7a21658d73 100644 --- a/mono/utils/mono-merp.c +++ b/mono/utils/mono-merp.c @@ -129,7 +129,8 @@ typedef enum { MerpArchx86_64 = 1, MerpArchx86 = 2, MerpArchPPC = 3, - MerpArchPPC64 = 4 + MerpArchPPC64 = 4, + MerpArchARM64 = 5 } MerpArch; typedef enum @@ -218,6 +219,8 @@ get_merp_bitness (MerpArch arch) return "x64"; case MerpArchx86: return "x32"; + case MerpArchARM64: + return "arm64"; default: g_assert_not_reached (); } @@ -234,6 +237,8 @@ get_merp_arch (void) return MerpArchPPC; #elif defined(TARGET_POWERPC64) return MerpArchPPC64; +#elif defined(TARGET_ARM64) + return MerpArchARM64; #else g_assert_not_reached (); #endif diff --git a/mono/utils/mono-mmap.c b/mono/utils/mono-mmap.c index 6f9e2c9629..41dc2070f2 100644 --- a/mono/utils/mono-mmap.c +++ b/mono/utils/mono-mmap.c @@ -304,6 +304,12 @@ mono_valloc (void *addr, size_t length, int flags, MonoMemAccountType type) } if ((flags & MONO_MMAP_JIT) && (use_mmap_jit || is_hardened_runtime == 1)) mflags |= MAP_JIT; +#if defined(HOST_ARM64) + /* Patching code on apple silicon seems to cause random crashes without this flag */ + /* No __builtin_available in old versions of Xcode that could be building Mono on x86 or amd64 */ + if (__builtin_available (macOS 11, *)) + mflags |= MAP_JIT; +#endif } #endif diff --git a/msvc/Makefile.in b/msvc/Makefile.in index 0f6e48313f..6d7caae6c8 100644 --- a/msvc/Makefile.in +++ b/msvc/Makefile.in @@ -535,8 +535,8 @@ 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." -@ENABLE_MSVC_FALSE@install-exec-local: @ENABLE_MSVC_FALSE@clean-local: +@ENABLE_MSVC_FALSE@install-exec-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 4495d354b4b72746f49381df9588c96a39f8e104..db78ff4dda7e05c39fb23ba82ce864af607e388a 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aKx1p^B!L&ME)xQw^}N=^oG delta 20 bcmbQIHBW29Q!aJ`1p^B!L-WmVxQw^}N@fOj diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 0853ad8230..8931ae8caa 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -de5be68f68176e23b8317653cde149b5381540fd \ No newline at end of file +8de9655ba821ad492bf4627a81897a71469b6487 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index fc575f91ea5b2bdfcbdec502d858131f78eff914..e0af7be44f5489a8622a954a3e994a1b8ec13840 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)Uf`NsVq2Xpz#VK+CQEmpO delta 20 bcmX?Ef3kjqo+7(}f`NsVq4{Q0#VK+CQHBPr diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 9b3aa9c6d6..63558153ad 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -1dc0a4313ffcb12e86a6b2cd97f60314f6ad1e60 \ No newline at end of file +8830dd8bd341922f5557d0cad793b4c721d424b7 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 72b252d24053d1a191e26fdc8b99d1e84cfaaf05..d3f979fdf88ae36f0b21a007a8d1694bdabc5c84 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m?1l;k7FLFaoB7oXv;bhh2Lk{A delta 22 dcmeyri1Gg-#tj_m>;?)37FLGloB7oXv;bh(2M7QF diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index eef15586ee..e7db21ed14 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -5370556c443f4857c354273b3f4bf764bb9d2fe8 \ No newline at end of file +a316f271b896a175665f79082e750db4ccd1af72 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index f7ee74477d..4b650ed4ad 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.12.0.126\n" +"Project-Id-Version: mono 6.12.0.129\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2021-03-10 08:17+0000\n" +"POT-Creation-Date: 2021-03-11 08:11+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 75cb6fa3db5c0dbd58c8d4f896eaa068db8e1fe1..3d3374b796c88b63aabccc5f44344163b88f4864 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*$ov8EUXL-H>XZzYzF{sw+MLv delta 22 ecmaF1gXP%{mJM-J*$os7EUXO8H>XZzYzF{s&j@}1 diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 5f6738dc56..f127536e03 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -eeaedbb3bde684658d345506bdc5738a3c4e10d5 \ No newline at end of file +8e0baa1d7ed3f50c49acf5746d0545940fc59e85 \ No newline at end of file diff --git a/support/Makefile.in b/support/Makefile.in index fb97dac120..0a48bf127b 100644 --- a/support/Makefile.in +++ b/support/Makefile.in @@ -927,8 +927,8 @@ 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." -@ENABLE_MSVC_ONLY_TRUE@test-bundle-local: @ENABLE_MSVC_ONLY_FALSE@clean-local: +@ENABLE_MSVC_ONLY_TRUE@test-bundle-local: clean: clean-am clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \ diff --git a/support/sys-uio.c b/support/sys-uio.c index 53e162f9fd..dbbb54ed82 100644 --- a/support/sys-uio.c +++ b/support/sys-uio.c @@ -11,6 +11,12 @@ #define _GNU_SOURCE #endif /* ndef _GNU_SOURCE */ +#include +#if defined(TARGET_MACH) + /* So we can use the declaration of preadv () */ +#define _DARWIN_C_SOURCE +#endif + #include "sys-uio.h" #include