Merge branch 'upstream'
Former-commit-id: b685da42021e78203bf3bb5d6581c7a8c29d490c
This commit is contained in:
commit
985ebe1a6b
@ -314,6 +314,8 @@ MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
MONO_NATIVE_COMPAT_LDFLAGS = @MONO_NATIVE_COMPAT_LDFLAGS@
|
||||
MONO_NATIVE_CPPFLAGS = @MONO_NATIVE_CPPFLAGS@
|
||||
MONO_NATIVE_CXX = @MONO_NATIVE_CXX@
|
||||
@ -326,6 +328,8 @@ 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_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS = @MONO_NATIVE_UNIFIED_LDFLAGS@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGFMT_015 = @MSGFMT_015@
|
||||
|
@ -1 +1 @@
|
||||
cb058025d26cfa053c0882a56a7f57c3c6f3039f
|
||||
1ed468975838f057de10bcd4b5bb2cbd72870be2
|
@ -1 +1 @@
|
||||
dedcdea54ed22b2f5d3bb7e1de37b77702527d1a
|
||||
aa151640e62ace72c1206365bf089ac239d0bce9
|
@ -1 +1 @@
|
||||
aef91595c533d430081888c8af71445b4fc3f164
|
||||
af5f5a8cea2b4af29ce60ef165f2fe81bc7844ee
|
@ -337,6 +337,8 @@ MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
MONO_NATIVE_COMPAT_LDFLAGS = @MONO_NATIVE_COMPAT_LDFLAGS@
|
||||
MONO_NATIVE_CPPFLAGS = @MONO_NATIVE_CPPFLAGS@
|
||||
MONO_NATIVE_CXX = @MONO_NATIVE_CXX@
|
||||
@ -349,6 +351,8 @@ 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_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS = @MONO_NATIVE_UNIFIED_LDFLAGS@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGFMT_015 = @MSGFMT_015@
|
||||
|
@ -259,6 +259,8 @@ MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
MONO_NATIVE_COMPAT_LDFLAGS = @MONO_NATIVE_COMPAT_LDFLAGS@
|
||||
MONO_NATIVE_CPPFLAGS = @MONO_NATIVE_CPPFLAGS@
|
||||
MONO_NATIVE_CXX = @MONO_NATIVE_CXX@
|
||||
@ -271,6 +273,8 @@ 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_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS = @MONO_NATIVE_UNIFIED_LDFLAGS@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGFMT_015 = @MSGFMT_015@
|
||||
|
@ -319,6 +319,8 @@ MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
MONO_NATIVE_COMPAT_LDFLAGS = @MONO_NATIVE_COMPAT_LDFLAGS@
|
||||
MONO_NATIVE_CPPFLAGS = @MONO_NATIVE_CPPFLAGS@
|
||||
MONO_NATIVE_CXX = @MONO_NATIVE_CXX@
|
||||
@ -331,6 +333,8 @@ 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_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS = @MONO_NATIVE_UNIFIED_LDFLAGS@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGFMT_015 = @MSGFMT_015@
|
||||
|
@ -259,6 +259,8 @@ MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
MONO_NATIVE_COMPAT_LDFLAGS = @MONO_NATIVE_COMPAT_LDFLAGS@
|
||||
MONO_NATIVE_CPPFLAGS = @MONO_NATIVE_CPPFLAGS@
|
||||
MONO_NATIVE_CXX = @MONO_NATIVE_CXX@
|
||||
@ -271,6 +273,8 @@ 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_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS = @MONO_NATIVE_UNIFIED_LDFLAGS@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGFMT_015 = @MSGFMT_015@
|
||||
|
@ -319,6 +319,8 @@ MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
MONO_NATIVE_COMPAT_LDFLAGS = @MONO_NATIVE_COMPAT_LDFLAGS@
|
||||
MONO_NATIVE_CPPFLAGS = @MONO_NATIVE_CPPFLAGS@
|
||||
MONO_NATIVE_CXX = @MONO_NATIVE_CXX@
|
||||
@ -331,6 +333,8 @@ 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_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS = @MONO_NATIVE_UNIFIED_LDFLAGS@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGFMT_015 = @MSGFMT_015@
|
||||
|
@ -259,6 +259,8 @@ MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
MONO_NATIVE_COMPAT_LDFLAGS = @MONO_NATIVE_COMPAT_LDFLAGS@
|
||||
MONO_NATIVE_CPPFLAGS = @MONO_NATIVE_CPPFLAGS@
|
||||
MONO_NATIVE_CXX = @MONO_NATIVE_CXX@
|
||||
@ -271,6 +273,8 @@ 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_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS = @MONO_NATIVE_UNIFIED_LDFLAGS@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGFMT_015 = @MSGFMT_015@
|
||||
|
@ -319,6 +319,8 @@ MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
MONO_NATIVE_COMPAT_LDFLAGS = @MONO_NATIVE_COMPAT_LDFLAGS@
|
||||
MONO_NATIVE_CPPFLAGS = @MONO_NATIVE_CPPFLAGS@
|
||||
MONO_NATIVE_CXX = @MONO_NATIVE_CXX@
|
||||
@ -331,6 +333,8 @@ 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_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS = @MONO_NATIVE_UNIFIED_LDFLAGS@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGFMT_015 = @MSGFMT_015@
|
||||
|
@ -259,6 +259,8 @@ MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS = @MONO_NATIVE_COMPAT_CPPFLAGS@
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS = @MONO_NATIVE_COMPAT_CXXFLAGS@
|
||||
MONO_NATIVE_COMPAT_LDFLAGS = @MONO_NATIVE_COMPAT_LDFLAGS@
|
||||
MONO_NATIVE_CPPFLAGS = @MONO_NATIVE_CPPFLAGS@
|
||||
MONO_NATIVE_CXX = @MONO_NATIVE_CXX@
|
||||
@ -271,6 +273,8 @@ 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_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS = @MONO_NATIVE_UNIFIED_CPPFLAGS@
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS = @MONO_NATIVE_UNIFIED_CXXFLAGS@
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS = @MONO_NATIVE_UNIFIED_LDFLAGS@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGFMT_015 = @MSGFMT_015@
|
||||
|
Binary file not shown.
@ -1 +1 @@
|
||||
df99021e1f9d29842410c9074e797c6149149d9c
|
||||
214a7f68c15e23f48ea3eb49dbd9e73ad2052618
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
c1e2d534c3f65b1f852ab4f374e977c8f2686282
|
||||
ca26456da711ef88ad51b815bf58d1d0d54b5bfe
|
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