Merge branch 'upstream'
Former-commit-id: 9bee55a539b67eebcd678c333715922b40cad658
This commit is contained in:
commit
e0697c595e
@ -312,7 +312,9 @@ MONO_JEMALLOC_ASSERT = @MONO_JEMALLOC_ASSERT@
|
||||
MONO_JEMALLOC_DEFAULT = @MONO_JEMALLOC_DEFAULT@
|
||||
MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CCASFLAGS = @MONO_NATIVE_CCASFLAGS@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS = @MONO_NATIVE_COMPAT_CCASFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
@ -327,6 +329,7 @@ MONO_NATIVE_PLATFORM = @MONO_NATIVE_PLATFORM@
|
||||
MONO_NATIVE_PLATFORM_TYPE = @MONO_NATIVE_PLATFORM_TYPE@
|
||||
MONO_NATIVE_PLATFORM_TYPE_COMPAT = @MONO_NATIVE_PLATFORM_TYPE_COMPAT@
|
||||
MONO_NATIVE_PLATFORM_TYPE_UNIFIED = @MONO_NATIVE_PLATFORM_TYPE_UNIFIED@
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS = @MONO_NATIVE_UNIFIED_CCASFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
|
@ -1 +1 @@
|
||||
1ed468975838f057de10bcd4b5bb2cbd72870be2
|
||||
c8e438c99e4a6e712ac2d889cf2db2868f407c70
|
@ -1 +1 @@
|
||||
a95e320dc816cf245e735ade01aba6ea08cc8dfb
|
||||
b2acb6902a5f57d5868b7097d44a9d18078a7e47
|
@ -1 +1 @@
|
||||
7fc911b48686244d25c2890ed5bf73bcc205f10a
|
||||
025cff6c7131acc2afc6a9005a3b2484b7bf6ac0
|
@ -335,7 +335,9 @@ MONO_JEMALLOC_ASSERT = @MONO_JEMALLOC_ASSERT@
|
||||
MONO_JEMALLOC_DEFAULT = @MONO_JEMALLOC_DEFAULT@
|
||||
MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CCASFLAGS = @MONO_NATIVE_CCASFLAGS@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS = @MONO_NATIVE_COMPAT_CCASFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
@ -350,6 +352,7 @@ MONO_NATIVE_PLATFORM = @MONO_NATIVE_PLATFORM@
|
||||
MONO_NATIVE_PLATFORM_TYPE = @MONO_NATIVE_PLATFORM_TYPE@
|
||||
MONO_NATIVE_PLATFORM_TYPE_COMPAT = @MONO_NATIVE_PLATFORM_TYPE_COMPAT@
|
||||
MONO_NATIVE_PLATFORM_TYPE_UNIFIED = @MONO_NATIVE_PLATFORM_TYPE_UNIFIED@
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS = @MONO_NATIVE_UNIFIED_CCASFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
|
@ -257,7 +257,9 @@ MONO_JEMALLOC_ASSERT = @MONO_JEMALLOC_ASSERT@
|
||||
MONO_JEMALLOC_DEFAULT = @MONO_JEMALLOC_DEFAULT@
|
||||
MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CCASFLAGS = @MONO_NATIVE_CCASFLAGS@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS = @MONO_NATIVE_COMPAT_CCASFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
@ -272,6 +274,7 @@ MONO_NATIVE_PLATFORM = @MONO_NATIVE_PLATFORM@
|
||||
MONO_NATIVE_PLATFORM_TYPE = @MONO_NATIVE_PLATFORM_TYPE@
|
||||
MONO_NATIVE_PLATFORM_TYPE_COMPAT = @MONO_NATIVE_PLATFORM_TYPE_COMPAT@
|
||||
MONO_NATIVE_PLATFORM_TYPE_UNIFIED = @MONO_NATIVE_PLATFORM_TYPE_UNIFIED@
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS = @MONO_NATIVE_UNIFIED_CCASFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
|
@ -317,7 +317,9 @@ MONO_JEMALLOC_ASSERT = @MONO_JEMALLOC_ASSERT@
|
||||
MONO_JEMALLOC_DEFAULT = @MONO_JEMALLOC_DEFAULT@
|
||||
MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CCASFLAGS = @MONO_NATIVE_CCASFLAGS@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS = @MONO_NATIVE_COMPAT_CCASFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
@ -332,6 +334,7 @@ MONO_NATIVE_PLATFORM = @MONO_NATIVE_PLATFORM@
|
||||
MONO_NATIVE_PLATFORM_TYPE = @MONO_NATIVE_PLATFORM_TYPE@
|
||||
MONO_NATIVE_PLATFORM_TYPE_COMPAT = @MONO_NATIVE_PLATFORM_TYPE_COMPAT@
|
||||
MONO_NATIVE_PLATFORM_TYPE_UNIFIED = @MONO_NATIVE_PLATFORM_TYPE_UNIFIED@
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS = @MONO_NATIVE_UNIFIED_CCASFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
|
@ -257,7 +257,9 @@ MONO_JEMALLOC_ASSERT = @MONO_JEMALLOC_ASSERT@
|
||||
MONO_JEMALLOC_DEFAULT = @MONO_JEMALLOC_DEFAULT@
|
||||
MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CCASFLAGS = @MONO_NATIVE_CCASFLAGS@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS = @MONO_NATIVE_COMPAT_CCASFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
@ -272,6 +274,7 @@ MONO_NATIVE_PLATFORM = @MONO_NATIVE_PLATFORM@
|
||||
MONO_NATIVE_PLATFORM_TYPE = @MONO_NATIVE_PLATFORM_TYPE@
|
||||
MONO_NATIVE_PLATFORM_TYPE_COMPAT = @MONO_NATIVE_PLATFORM_TYPE_COMPAT@
|
||||
MONO_NATIVE_PLATFORM_TYPE_UNIFIED = @MONO_NATIVE_PLATFORM_TYPE_UNIFIED@
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS = @MONO_NATIVE_UNIFIED_CCASFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
|
@ -317,7 +317,9 @@ MONO_JEMALLOC_ASSERT = @MONO_JEMALLOC_ASSERT@
|
||||
MONO_JEMALLOC_DEFAULT = @MONO_JEMALLOC_DEFAULT@
|
||||
MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CCASFLAGS = @MONO_NATIVE_CCASFLAGS@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS = @MONO_NATIVE_COMPAT_CCASFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
@ -332,6 +334,7 @@ MONO_NATIVE_PLATFORM = @MONO_NATIVE_PLATFORM@
|
||||
MONO_NATIVE_PLATFORM_TYPE = @MONO_NATIVE_PLATFORM_TYPE@
|
||||
MONO_NATIVE_PLATFORM_TYPE_COMPAT = @MONO_NATIVE_PLATFORM_TYPE_COMPAT@
|
||||
MONO_NATIVE_PLATFORM_TYPE_UNIFIED = @MONO_NATIVE_PLATFORM_TYPE_UNIFIED@
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS = @MONO_NATIVE_UNIFIED_CCASFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
|
@ -257,7 +257,9 @@ MONO_JEMALLOC_ASSERT = @MONO_JEMALLOC_ASSERT@
|
||||
MONO_JEMALLOC_DEFAULT = @MONO_JEMALLOC_DEFAULT@
|
||||
MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CCASFLAGS = @MONO_NATIVE_CCASFLAGS@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS = @MONO_NATIVE_COMPAT_CCASFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
@ -272,6 +274,7 @@ MONO_NATIVE_PLATFORM = @MONO_NATIVE_PLATFORM@
|
||||
MONO_NATIVE_PLATFORM_TYPE = @MONO_NATIVE_PLATFORM_TYPE@
|
||||
MONO_NATIVE_PLATFORM_TYPE_COMPAT = @MONO_NATIVE_PLATFORM_TYPE_COMPAT@
|
||||
MONO_NATIVE_PLATFORM_TYPE_UNIFIED = @MONO_NATIVE_PLATFORM_TYPE_UNIFIED@
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS = @MONO_NATIVE_UNIFIED_CCASFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
|
@ -317,7 +317,9 @@ MONO_JEMALLOC_ASSERT = @MONO_JEMALLOC_ASSERT@
|
||||
MONO_JEMALLOC_DEFAULT = @MONO_JEMALLOC_DEFAULT@
|
||||
MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CCASFLAGS = @MONO_NATIVE_CCASFLAGS@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS = @MONO_NATIVE_COMPAT_CCASFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
@ -332,6 +334,7 @@ MONO_NATIVE_PLATFORM = @MONO_NATIVE_PLATFORM@
|
||||
MONO_NATIVE_PLATFORM_TYPE = @MONO_NATIVE_PLATFORM_TYPE@
|
||||
MONO_NATIVE_PLATFORM_TYPE_COMPAT = @MONO_NATIVE_PLATFORM_TYPE_COMPAT@
|
||||
MONO_NATIVE_PLATFORM_TYPE_UNIFIED = @MONO_NATIVE_PLATFORM_TYPE_UNIFIED@
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS = @MONO_NATIVE_UNIFIED_CCASFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
|
@ -257,7 +257,9 @@ MONO_JEMALLOC_ASSERT = @MONO_JEMALLOC_ASSERT@
|
||||
MONO_JEMALLOC_DEFAULT = @MONO_JEMALLOC_DEFAULT@
|
||||
MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CCASFLAGS = @MONO_NATIVE_CCASFLAGS@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS = @MONO_NATIVE_COMPAT_CCASFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
@ -272,6 +274,7 @@ MONO_NATIVE_PLATFORM = @MONO_NATIVE_PLATFORM@
|
||||
MONO_NATIVE_PLATFORM_TYPE = @MONO_NATIVE_PLATFORM_TYPE@
|
||||
MONO_NATIVE_PLATFORM_TYPE_COMPAT = @MONO_NATIVE_PLATFORM_TYPE_COMPAT@
|
||||
MONO_NATIVE_PLATFORM_TYPE_UNIFIED = @MONO_NATIVE_PLATFORM_TYPE_UNIFIED@
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS = @MONO_NATIVE_UNIFIED_CCASFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
|
Binary file not shown.
@ -1 +1 @@
|
||||
214a7f68c15e23f48ea3eb49dbd9e73ad2052618
|
||||
6ec2f0592c236ff76bf4b842d2e474d66d404185
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
ca26456da711ef88ad51b815bf58d1d0d54b5bfe
|
||||
2d7cda29ae1cba433df347e812db76054aa0b76e
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user