diff options
| author | Ludovic Henry <luhenry@microsoft.com> | 2019-03-06 19:38:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-06 19:38:48 +0300 |
| commit | 6527e21bb4486719fcb512932a27d7535dff2567 (patch) | |
| tree | 361e9780071ed078fa02296f47b63caee4a7f584 /llvm | |
| parent | cacc9b7c4cc84ab110ca93ede0be7f5d82d25b1d (diff) | |
[safepoint] Use LLVM pass to insert safepoint (#11789)
* [safepoint] Use LLVM pass to insert safepoint
This is to avoid safepoints to stop optimizations from happening.
* [safepoint] Use LLVM pass to insert safepoint
This is to avoid safepoints to stop optimizations from happening.
* fix error: emit_gc_safepoint_poll does not return anything
* Revert partial 4150f06f8621f2f2918e3bd747bf80a0f0f8c9c6
* Fix build
* [runtime] Add mono_threads_state_poll to preinited icalls
* [runtime] Adding back in safepoint icall skip code
* Revert mini.c to 100f422
* [runtime] Add missing deref to safepoint poll
* [runtime] Make safepoint functions have WeakODR linkage
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/build.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/llvm/build.mk b/llvm/build.mk index 903f7af618e..2c73a7de6e9 100644 --- a/llvm/build.mk +++ b/llvm/build.mk @@ -12,13 +12,11 @@ LLVM_DOWNLOAD_LOCATION = "http://xamjenkinsartifact.blob.core.windows.net/build- CMAKE := $(or $(CMAKE),$(shell which cmake)) NINJA := $(shell which ninja) -$(LLVM_BUILD) $(LLVM_PREFIX): - mkdir -p $@ - EXTRA_LLVM_ARGS = $(if $(filter $(LLVM_TARGET),wasm32), -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly",) # -DLLVM_ENABLE_LIBXML2=Off is needed because xml2 is not used and it breaks 32-bit builds on 64-bit Linux hosts -$(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(abs_top_srcdir)/external/llvm/CMakeLists.txt | $(LLVM_BUILD) $(LLVM_PREFIX) +$(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(abs_top_srcdir)/external/llvm/CMakeLists.txt + mkdir -p $(LLVM_BUILD) $(LLVM_PREFIX) cd $(LLVM_BUILD) && $(CMAKE) \ $(if $(NINJA),-G Ninja) \ -DCMAKE_INSTALL_PREFIX="$(LLVM_PREFIX)" \ @@ -34,7 +32,7 @@ $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(abs_top_srcdir)/external/ll -DLLVM_ENABLE_LIBXML2=Off \ -DHAVE_FUTIMENS=0 \ $(LLVM_CMAKE_ARGS) \ - $(abs_top_srcdir)/external/llvm + $(dir $<) .PHONY: configure-llvm configure-llvm: $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile) @@ -47,7 +45,7 @@ build-llvm: configure-llvm DESTDIR="" $(if $(NINJA),$(NINJA),$(MAKE)) -C $(LLVM_BUILD) .PHONY: install-llvm -install-llvm: build-llvm | $(LLVM_PREFIX) +install-llvm: build-llvm DESTDIR="" $(if $(NINJA),$(NINJA),$(MAKE)) -C $(LLVM_BUILD) install .PHONY: download-llvm |