Merge branch 'upstream'

Former-commit-id: bba432fb0810e1b3bf02feb96495dab41828fd77
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2020-01-16 19:19:52 +00:00
commit a5ab9af1ac
109 changed files with 458 additions and 393 deletions

View File

@ -3,6 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = $(WERROR_CFLAGS)
SUBDIRS = @MONO_SUBDIRS@
noinst_SUBDIRS = @MONO_NOINST_SUBDIRS@
DIST_SUBDIRS = $(SUBDIRS) m4 netcore netcore/corerun
if !ENABLE_NETCORE
@ -93,6 +94,11 @@ mcs-do-compiler-tests:
bootstrap-world: compiler-tests
$(MAKE) install
install:
for mydir in $(filter-out $(noinst_SUBDIRS),$(SUBDIRS)); do \
(cd $${mydir} && ${MAKE} install) \
done
update-csproj:
-rm msvc/scripts/order
-rm msvc/scripts/order.xml

View File

@ -358,6 +358,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
@ -492,6 +493,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = $(WERROR_CFLAGS)
SUBDIRS = @MONO_SUBDIRS@
noinst_SUBDIRS = @MONO_NOINST_SUBDIRS@
DIST_SUBDIRS = $(SUBDIRS) m4 netcore netcore/corerun
@ENABLE_NETCORE_FALSE@EXTRA_DIST = \
@ENABLE_NETCORE_FALSE@ README.md \
@ -882,7 +884,7 @@ check: check-recursive
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
install: install-recursive
@ENABLE_NETCORE_TRUE@install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
@ -1072,6 +1074,11 @@ uninstall-am:
@ENABLE_NETCORE_FALSE@bootstrap-world: compiler-tests
@ENABLE_NETCORE_FALSE@ $(MAKE) install
@ENABLE_NETCORE_FALSE@install:
@ENABLE_NETCORE_FALSE@ for mydir in $(filter-out $(noinst_SUBDIRS),$(SUBDIRS)); do \
@ENABLE_NETCORE_FALSE@ (cd $${mydir} && ${MAKE} install) \
@ENABLE_NETCORE_FALSE@ done
@ENABLE_NETCORE_FALSE@update-csproj:
@ENABLE_NETCORE_FALSE@ -rm msvc/scripts/order
@ENABLE_NETCORE_FALSE@ -rm msvc/scripts/order.xml

View File

@ -1 +1 @@
1820b91f00fc9aeb3844cca31e35bdc86a014626
02cf22b1a6f1207be80708fb28fb3494df2dac7d

View File

@ -1 +1 @@
32c603d7a06648b42b7a38c8bfb6630b4972acbd
ef11c1ff05c98927135b8eab10f71dd057555a8d

View File

@ -1 +1 @@
a4f0b4fb19e0ccbd08a64929fc4b7630b158a628
9c5cdd579a634d4e1d0449db05ac34fd7ca21729

View File

@ -380,6 +380,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@

View File

@ -301,6 +301,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@

View File

@ -361,6 +361,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@

View File

@ -301,6 +301,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@

View File

@ -361,6 +361,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@

View File

@ -301,6 +301,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@

View File

@ -361,6 +361,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@

View File

@ -302,6 +302,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@

File diff suppressed because it is too large Load Diff

View File

@ -10,7 +10,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
## Platform. ##
## --------- ##
hostname = az-ubuntu-generala47ed4
hostname = az-ubuntu-generala658d1
uname -m = x86_64
uname -r = 4.15.0-1066-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-generala47ed4
on az-ubuntu-generala658d1
config.status:1238: creating Makefile
config.status:1238: creating bdw-gc.pc

View File

@ -1 +1 @@
6f68ef9420fa0c48ec88fa0b32765d9d16bdd6fc
5bad0b776e17bad9058d0d9ed681038e314be96e

View File

@ -349,6 +349,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@

View File

@ -272,6 +272,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@

View File

@ -271,6 +271,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@

View File

@ -303,6 +303,7 @@ 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@
MONO_NOINST_SUBDIRS = @MONO_NOINST_SUBDIRS@
MONO_SUBDIRS = @MONO_SUBDIRS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@

Some files were not shown because too many files have changed in this diff Show More