From ff3020fced6039d79ba202aedac7bb914eed28eb Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 26 Jul 2019 15:03:30 -0400 Subject: [PATCH] Refreshed from master --- llvm_llc_opt_default_path.patch | 16 ++++++++-------- mono-core.spec | 7 ++++--- use_python3_not_unversioned.patch | 6 +++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/llvm_llc_opt_default_path.patch b/llvm_llc_opt_default_path.patch index 969b956c94..33a6a84137 100644 --- a/llvm_llc_opt_default_path.patch +++ b/llvm_llc_opt_default_path.patch @@ -1,13 +1,13 @@ -Index: xamarin-pkg-mono/mono/mini/aot-compiler.c -=================================================================== ---- xamarin-pkg-mono.orig/mono/mini/aot-compiler.c -+++ xamarin-pkg-mono/mono/mini/aot-compiler.c -@@ -12744,7 +12744,7 @@ mono_compile_assembly (MonoAssembly *ass - acfg->aot_opts.nftnptr_arg_trampolines = 128; +diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c +index d75d3f934f2..885877869da 100644 +--- a/mono/mini/aot-compiler.c ++++ b/mono/mini/aot-compiler.c +@@ -13279,7 +13279,7 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options, #endif acfg->aot_opts.nunbox_arbitrary_trampolines = 256; -- acfg->aot_opts.llvm_path = g_strdup (""); -+ acfg->aot_opts.llvm_path = g_strdup ("/usr/lib/mono/llvm/bin/"); + if (!acfg->aot_opts.llvm_path) +- acfg->aot_opts.llvm_path = g_strdup (""); ++ acfg->aot_opts.llvm_path = g_strdup ("/usr/lib/mono/llvm/bin/"); acfg->aot_opts.temp_path = g_strdup (""); #ifdef MONOTOUCH acfg->aot_opts.use_trampolines_page = TRUE; diff --git a/mono-core.spec b/mono-core.spec index 42f82362d2..17d7d0eb94 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -126,10 +126,10 @@ Provides: mono(Mono.Configuration.Crypto) = 4.0.0.0 %define _use_internal_dependency_generator 0 %if 0%{?fedora} || 0%{?rhel} || 0%{?centos} %define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/redhat/find-provides && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}%{_prefix} %{buildroot}%{_bindir}/mono-find-provides; } | sort | uniq' -%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/redhat/find-requires && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}%{_prefix} %{buildroot}%{_bindir}/mono-find-requires; } | grep -v "Mono.Configuration.Crypto" | sort | uniq | grep ^... | sed "s/mono\(System.IO.Compression\).*/mono\(System.IO.Compression\) = 4.0.0.0/" | sed "s/mono\(System.Text.Encoding.CodePages\).*/mono\(System.Text.Encoding.CodePages\) = 4.1.0.0/" | sed "s/mono\(System.Security.Cryptography.Algorithms\).*/mono\(System.Security.Cryptography.Algorithms\) = 4.3.1.0/" | sed "s/mono\(System.Collections.Immutable\).*/mono\(System.Collections.Immutable\) = 1.2.1.0/" | sed "s/mono\(System.Xml.XPath.XDocument\).*/mono\(System.Xml.XPath.XDocument\) = 4.1.1.0/" | sed "s/mono\(System.ValueTuple\).*/mono\(System.ValueTuple\) = 4.0.3.0/" | sed "s/mono\(System.Xml.ReaderWriter\).*/mono\(System.Xml.ReaderWriter\) = 4.0.0.0/" | grep -v "System.Runtime.InteropServices.RuntimeInformation" | grep -v "System.Diagnostics.StackTrace" | grep -v "System.Runtime.Loader" | grep -v "System.Security.AccessControl" | grep -v "System.Diagnostics.Process" | grep -v "System.IO.Pipes.AccessControl" | grep -v "System.Security.Principal.Windows" | grep -v "System.Collection" | grep -v "System.Diagnostics.Debug" | grep -v "System.Globalization" | grep -v "System.IO" | grep -v "System.Linq" | grep -v "System.Linq.Expressions" | grep -v "System.Reflection" | grep -v "System.Runtime" | grep -v "System.Runtime.Extensions" | grep -v "System.Runtime.InteropServices" | grep -v "System.Text.Encoding" | grep -v "System.Text.Encoding.Extensions" | grep -v "System.Threading" | grep -v "System.Numerics.Vectors" | grep -v "System.Buffers" | grep -v "Mono.Cecil" ' +%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/redhat/find-requires && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}%{_prefix} %{buildroot}%{_bindir}/mono-find-requires; } | grep -v "Mono.Configuration.Crypto" | sort | uniq | grep ^... | sed "s/mono\(System.IO.Compression\).*/mono\(System.IO.Compression\) = 4.0.0.0/" | sed "s/mono\(System.Text.Encoding.CodePages\).*/mono\(System.Text.Encoding.CodePages\) = 4.1.0.0/" | sed "s/mono\(System.Security.Cryptography.Algorithms\).*/mono\(System.Security.Cryptography.Algorithms\) = 4.3.1.0/" | sed "s/mono\(System.Collections.Immutable\).*/mono\(System.Collections.Immutable\) = 1.2.1.0/" | sed "s/mono\(System.Xml.XPath.XDocument\).*/mono\(System.Xml.XPath.XDocument\) = 4.1.1.0/" | sed "s/mono\(System.ValueTuple\).*/mono\(System.ValueTuple\) = 4.0.3.0/" | sed "s/mono\(System.Xml.ReaderWriter\).*/mono\(System.Xml.ReaderWriter\) = 4.0.0.0/" | grep -v "System.Runtime.InteropServices.RuntimeInformation" | grep -v "System.Diagnostics.StackTrace" | grep -v "System.Runtime.Loader" | grep -v "System.Security.AccessControl" | grep -v "System.Diagnostics.Process" | grep -v "System.IO.Pipes.AccessControl" | grep -v "System.Security.Principal.Windows" | grep -v "System.Collection" | grep -v "System.Diagnostics.Debug" | grep -v "System.Globalization" | grep -v "System.IO" | grep -v "System.Linq" | grep -v "System.Linq.Expressions" | grep -v "System.Reflection" | grep -v "System.Runtime" | grep -v "System.Runtime.Extensions" | grep -v "System.Runtime.InteropServices" | grep -v "System.Text.Encoding" | grep -v "System.Text.Encoding.Extensions" | grep -v "System.Threading" | grep -v "System.IO.Pipes.AccessControl" | grep -v "System.Buffers" | grep -v "System.Numerics.Vectors" | grep -v "Mono.Cecil"' %else %define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}%{_prefix} %{buildroot}%{_bindir}/mono-find-provides; } | sort | uniq' -%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}%{_prefix} %{buildroot}%{_bindir}/mono-find-requires; } | grep -v "Mono.Configuration.Crypto" | sort | uniq | grep ^... | sed "s/mono\(System.IO.Compression\).*/mono\(System.IO.Compression\) = 4.0.0.0/" | sed "s/mono\(System.Text.Encoding.CodePages\).*/mono\(System.Text.Encoding.CodePages\) = 4.1.0.0/" | sed "s/mono\(System.Security.Cryptography.Algorithms\).*/mono\(System.Security.Cryptography.Algorithms\) = 4.3.1.0/" | sed "s/mono\(System.Collections.Immutable\).*/mono\(System.Collections.Immutable\) = 1.2.1.0/" | sed "s/mono\(System.Xml.XPath.XDocument\).*/mono\(System.Xml.XPath.XDocument\) = 4.1.1.0/" | sed "s/mono\(System.ValueTuple\).*/mono\(System.ValueTuple\) = 4.0.3.0/" | sed "s/mono\(System.Xml.ReaderWriter\).*/mono\(System.Xml.ReaderWriter\) = 4.0.0.0/" | grep -v "System.Runtime.InteropServices.RuntimeInformation" | grep -v "System.Diagnostics.StackTrace" | grep -v "System.Runtime.Loader" | grep -v "System.Security.AccessControl" | grep -v "System.Diagnostics.Process" | grep -v "System.IO.Pipes.AccessControl | grep -v "System.Security.Principal.Windows" | grep -v "System.Collection" | grep -v "System.Diagnostics.Debug" | grep -v "System.Globalization" | grep -v "System.IO" | grep -v "System.Linq" | grep -v "System.Linq.Expressions" | grep -v "System.Reflection" | grep -v "System.Runtime" | grep -v "System.Runtime.Extensions" | grep -v "System.Runtime.InteropServices" | grep -v "System.Text.Encoding" | grep -v "System.Text.Encoding.Extensions" | grep -v "System.Threading" | grep -v "System.Numerics.Vectors" | grep -v "System.Buffers | grep -v "Mono.Cecil" ' +%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}%{_prefix} %{buildroot}%{_bindir}/mono-find-requires; } | grep -v "Mono.Configuration.Crypto" | sort | uniq | grep ^... | sed "s/mono\(System.IO.Compression\).*/mono\(System.IO.Compression\) = 4.0.0.0/" | sed "s/mono\(System.Text.Encoding.CodePages\).*/mono\(System.Text.Encoding.CodePages\) = 4.1.0.0/" | sed "s/mono\(System.Security.Cryptography.Algorithms\).*/mono\(System.Security.Cryptography.Algorithms\) = 4.3.1.0/" | sed "s/mono\(System.Collections.Immutable\).*/mono\(System.Collections.Immutable\) = 1.2.1.0/" | sed "s/mono\(System.Xml.XPath.XDocument\).*/mono\(System.Xml.XPath.XDocument\) = 4.1.1.0/" | sed "s/mono\(System.ValueTuple\).*/mono\(System.ValueTuple\) = 4.0.3.0/" | sed "s/mono\(System.Xml.ReaderWriter\).*/mono\(System.Xml.ReaderWriter\) = 4.0.0.0/" | grep -v "System.Runtime.InteropServices.RuntimeInformation" | grep -v "System.Diagnostics.StackTrace" | grep -v "System.Runtime.Loader" | grep -v "System.Security.AccessControl" | grep -v "System.Diagnostics.Process" | grep -v "System.IO.Pipes.AccessControl | grep -v "System.Security.Principal.Windows" | grep -v "System.Collection" | grep -v "System.Diagnostics.Debug" | grep -v "System.Globalization" | grep -v "System.IO" | grep -v "System.Linq" | grep -v "System.Linq.Expressions" | grep -v "System.Reflection" | grep -v "System.Runtime" | grep -v "System.Runtime.Extensions" | grep -v "System.Runtime.InteropServices" | grep -v "System.Text.Encoding" | grep -v "System.Text.Encoding.Extensions" | grep -v "System.Threading" | grep -v "System.IO.Pipes.AccessControl" | grep -v "System.Buffers" | grep -v "System.Numerics.Vectors" | grep -v "Mono.Cecil"' %endif %description @@ -195,9 +195,10 @@ rm -f %{buildroot}%{_libdir}/libMonoSupportW.* # remove .a files for libraries that are really only for us rm -f %{buildroot}%{_libdir}/libMonoPosixHelper.a -rm -f %{buildroot}%{_libdir}/libmono-native.a rm -f %{buildroot}%{_libdir}/libikvm-native.a rm -f %{buildroot}%{_libdir}/libmono-llvm.a +rm -f %{buildroot}%{_libdir}/libmono-native.a +rm -f %{buildroot}%{_libdir}/libmono-system-native.a # remove libgc cruft rm -rf %{buildroot}%{_datadir}/libgc-mono diff --git a/use_python3_not_unversioned.patch b/use_python3_not_unversioned.patch index 67f4beae91..88ea343264 100644 --- a/use_python3_not_unversioned.patch +++ b/use_python3_not_unversioned.patch @@ -1,15 +1,15 @@ diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in -index 65399906806..4538c5ba428 100755 +index 60055ce9ac9..b91c74ec3a8 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in -@@ -775,7 +775,7 @@ MemoryIntrinsics.dll: MemoryIntrinsics.il +@@ -776,7 +776,7 @@ MemoryIntrinsics.dll: MemoryIntrinsics.il GENMDESC_OPTS= -GENMDESC_PRG=python $(srcdir)/genmdesc.py $(target_define) $(srcdir) +GENMDESC_PRG=python3 $(srcdir)/genmdesc.py $(target_define) $(srcdir) - cpu-wasm.h: mini-ops.h cpu-wasm.md + cpu-wasm.h: mini-ops.h cpu-wasm.md $(srcdir)/genmdesc.py $(GENMDESC_PRG) cpu-wasm.h wasm_desc $(srcdir)/cpu-wasm.md diff --git a/scripts/mono-heapviz b/scripts/mono-heapviz index 27b6f7f6023..c4a4847bbe6 100755