Merge branch 'upstream'

Former-commit-id: d639e04b562d9f5bde03c6f02232ddda2d88b9da
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2020-09-16 08:49:33 +00:00
commit 2db2add2bd
53 changed files with 745 additions and 742 deletions

View File

@ -1 +1 @@
8698325c01e1f4f45fadab99512b09ba684b21dd
c38f3778688ee63257f4b3a3ca142916bfcb4f3b

View File

@ -1 +1 @@
9dbc60240997b31d8917b11dc02b0f7c7777237f
8418148d36e8ad970932794701d21a0dc32fe87c

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-general49eaf0
hostname = az-ubuntu-generalebba61
uname -m = x86_64
uname -r = 4.15.0-1095-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-general49eaf0
on az-ubuntu-generalebba61
config.status:1238: creating Makefile
config.status:1238: creating bdw-gc.pc

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
ed9b497d611a8294a3dad8919e545c027ef410d0
3bcfb68c6a9cacf20cef1c15dd0ac4a363f8fd42

View File

@ -429,6 +429,7 @@ LLVM_VERSION := $(shell git -C "$(abs_top_srcdir)/external/llvm-project/llvm" re
# FIXME: URL should be http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-$(LLVM_BRANCH)/llvm-osx64-$(LLVM_VERSION).tar.gz
LLVM_DOWNLOAD_LOCATION = "http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-release60/llvm-osx64-$(LLVM_VERSION).tar.gz"
CPU_COUNT := $(shell getconf _NPROCESSORS_ONLN || echo 8)
NINJA := $(shell which ninja)
EXTRA_LLVM_ARGS = $(if $(filter $(LLVM_TARGET),wasm32), -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly",) \
$(if $(STATIC_GCC_LIBS),-DCMAKE_EXE_LINKER_FLAGS="-static")
@ -695,7 +696,7 @@ configure-llvm: $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile)
.PHONY: build-llvm
build-llvm: configure-llvm
DESTDIR="" $(if $(NINJA),$(NINJA),$(MAKE) -j) -C $(LLVM_BUILD)
DESTDIR="" $(if $(NINJA),$(NINJA),$(MAKE) -j$(CPU_COUNT)) -C $(LLVM_BUILD)
.PHONY: install-llvm
install-llvm: build-llvm

View File

@ -9,6 +9,8 @@ LLVM_VERSION := $(shell git -C "$(abs_top_srcdir)/external/llvm-project/llvm" re
# FIXME: URL should be http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-$(LLVM_BRANCH)/llvm-osx64-$(LLVM_VERSION).tar.gz
LLVM_DOWNLOAD_LOCATION = "http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-release60/llvm-osx64-$(LLVM_VERSION).tar.gz"
CPU_COUNT := $(shell getconf _NPROCESSORS_ONLN || echo 8)
CMAKE := $(or $(CMAKE),$(shell which cmake))
NINJA := $(shell which ninja)
@ -43,7 +45,7 @@ configure-llvm: $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile)
.PHONY: build-llvm
build-llvm: configure-llvm
DESTDIR="" $(if $(NINJA),$(NINJA),$(MAKE) -j) -C $(LLVM_BUILD)
DESTDIR="" $(if $(NINJA),$(NINJA),$(MAKE) -j$(CPU_COUNT)) -C $(LLVM_BUILD)
.PHONY: install-llvm
install-llvm: build-llvm

View File

@ -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.98";
public const string MonoVersion = "6.12.0.99";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
1c75687948c4942ceadf9e0aea9f2071755f58a0
6d2f0584d978543f0cfb8b3b4113a36ec0f4347c

View File

@ -1 +1 @@
f8f2558a14462eb0628a69de89749bdd4b624980
5c10674d284da6052f4f581eca9a40b408ce9a79

View File

@ -1 +1 @@
480ec8e660d0b59ace894d6a437fe85daf134bd4
b4e8f8c5a3c0522f5df9fbe9f3e1a3bd08e4cd1e

View File

@ -1 +1 @@
64388ecf9113efa25ea3cb83bdcef27bf26be7b6
d6728512960e27df79e68fa026ef26e6c7f9287d

View File

@ -1 +1 @@
bcec45c69a095ad0c9b0c33eed3dbd6d87093299
9eede7decf0cc8752a79447fc46a2e40d48f0725

View File

@ -1 +1 @@
e478a81b39236d06502888d5daddcf9024d33ee1
e03a2061199122b446c6f186e20234361bba2a88

View File

@ -1 +1 @@
b024cfb3f6e8408e93c9bf1fb4c9ca40c0d0e151
acec93363da96132af846ba6b6ee1ec913f91afd

View File

@ -1 +1 @@
cb902767dbf84e1ed910a3001c9ffb7b370215ac
45a5b1df128f80312774138ff8ad3fa7eade0e8c

View File

@ -1 +1 @@
1c75687948c4942ceadf9e0aea9f2071755f58a0
6d2f0584d978543f0cfb8b3b4113a36ec0f4347c

View File

@ -1 +1 @@
f8f2558a14462eb0628a69de89749bdd4b624980
5c10674d284da6052f4f581eca9a40b408ce9a79

View File

@ -1 +1 @@
480ec8e660d0b59ace894d6a437fe85daf134bd4
b4e8f8c5a3c0522f5df9fbe9f3e1a3bd08e4cd1e

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