Skip to content

Commit

Permalink
Merge pull request JuliaLang#34489 from JuliaLang/vc/llvm8_only
Browse files Browse the repository at this point in the history
Remove support for LLVM6 and LLVM7
  • Loading branch information
vchuravy committed Jan 23, 2020
2 parents c2abaee + 643c931 commit 6d86384
Show file tree
Hide file tree
Showing 49 changed files with 8 additions and 12,588 deletions.
72 changes: 0 additions & 72 deletions deps/llvm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -375,74 +375,6 @@ $$(LLVM_BUILDDIR_withtype)/build-compiled: $$(LLVM_SRC_DIR)/$1.patch-applied
LLVM_PATCH_PREV := $$(LLVM_SRC_DIR)/$1.patch-applied
endef

ifeq ($(LLVM_VER_SHORT),6.0)
ifeq ($(LLVM_VER_PATCH), 0)
$(eval $(call LLVM_PATCH,llvm-D27629-AArch64-large_model_4.0))
else
$(eval $(call LLVM_PATCH,llvm-D27629-AArch64-large_model_6.0.1))
endif
$(eval $(call LLVM_PATCH,llvm-D34078-vectorize-fdiv))
$(eval $(call LLVM_PATCH,llvm-6.0-NVPTX-addrspaces)) # NVPTX
$(eval $(call LLVM_PATCH,llvm-D42262-jumpthreading-not-i1)) # remove for 7.0
$(eval $(call LLVM_PATCH,llvm-PPC-addrspaces)) # remove for 7.0
ifeq ($(LLVM_VER_PATCH), 0)
$(eval $(call LLVM_PATCH,llvm-D42260)) # remove for 7.0
$(eval $(call LLVM_PATCH,llvm-rL326843-missing-header)) # remove for 7.0
$(eval $(call LLVM_PATCH,llvm-6.0-r327540)) # remove for 7.0
endif
$(eval $(call LLVM_PATCH,llvm-6.0.0_D27296-libssp)) # remove for 7.0
$(eval $(call LLVM_PATCH,llvm-6.0-D44650)) # mingw32 build fix
ifeq ($(LLVM_VER_PATCH), 0)
$(eval $(call LLVM_PATCH,llvm-D45008)) # remove for 7.0
$(eval $(call LLVM_PATCH,llvm-D45070)) # remove for 7.0
$(eval $(call LLVM_PATCH,llvm-6.0.0-ifconv-D45819)) # remove for 7.0
endif
$(eval $(call LLVM_PATCH,llvm-D46460))
ifeq ($(LLVM_VER_PATCH), 0)
$(eval $(call LLVM_PATCH,llvm-rL332680)) # remove for 7.0
$(eval $(call LLVM_PATCH,llvm-rL332682)) # remove for 7.0
$(eval $(call LLVM_PATCH,llvm-rL332302)) # remove for 7.0
$(eval $(call LLVM_PATCH,llvm-rL332694)) # remove for 7.0
endif
$(eval $(call LLVM_PATCH,llvm-rL327898)) # remove for 7.0
$(eval $(call LLVM_PATCH,llvm-6.0-DISABLE_ABI_CHECKS))
$(eval $(call LLVM_PATCH,llvm-OProfile-line-num))
$(eval $(call LLVM_PATCH,llvm-D44892-Perf-integration))
$(eval $(call LLVM_PATCH,llvm-D49832-SCEVPred)) # Remove for 7.0
$(eval $(call LLVM_PATCH,llvm-rL323946-LSRTy)) # Remove for 7.0
$(eval $(call LLVM_PATCH,llvm-D50010-VNCoercion-ni))
$(eval $(call LLVM_PATCH,llvm-D50167-scev-umin))
$(eval $(call LLVM_PATCH,llvm-rL326967-aligned-load)) # remove for 7.0
ifeq ($(LLVM_VER_PATCH), 0)
$(eval $(call LLVM_PATCH,llvm-windows-race))
endif
$(eval $(call LLVM_PATCH,llvm-D51842-win64-byval-cc))
$(eval $(call LLVM_PATCH,llvm-D57118-powerpc))
$(eval $(call LLVM_PATCH,llvm-r355582-avxminmax)) # remove for 8.0
$(eval $(call LLVM_PATCH,llvm-rL349068-llvm-config)) # remove for 8.0
$(eval $(call LLVM_PATCH,llvm-6.0-D63688-wasm-isLocal)) # remove for 9.0
$(eval $(call LLVM_PATCH,llvm-6.0-D64032-cmake-cross)) # remove for 9.0
$(eval $(call LLVM_PATCH,llvm-6.0-D64225-cmake-cross2)) # remove for 9.0
$(eval $(call LLVM_PATCH,llvm6-WASM-addrspaces)) # WebAssembly
endif # LLVM_VER 6.0

ifeq ($(LLVM_VER_SHORT),7.0)
$(eval $(call LLVM_PATCH,llvm-D27629-AArch64-large_model_6.0.1))
$(eval $(call LLVM_PATCH,llvm-D34078-vectorize-fdiv))
$(eval $(call LLVM_PATCH,llvm-6.0-NVPTX-addrspaces)) # NVPTX -- warning: this fails check-llvm-codegen-nvptx
$(eval $(call LLVM_PATCH,llvm-7.0-D44650)) # mingw32 build fix
$(eval $(call LLVM_PATCH,llvm-D46460))
$(eval $(call LLVM_PATCH,llvm-6.0-DISABLE_ABI_CHECKS))
$(eval $(call LLVM_PATCH,llvm7-D50010-VNCoercion-ni))
$(eval $(call LLVM_PATCH,llvm-7.0-D50167-scev-umin))
$(eval $(call LLVM_PATCH,llvm7-windows-race))
$(eval $(call LLVM_PATCH,llvm7-D51842-win64-byval-cc)) # remove for 8.0
$(eval $(call LLVM_PATCH,llvm-D57118-powerpc))
$(eval $(call LLVM_PATCH,llvm-rL349068-llvm-config)) # remove for 8.0
$(eval $(call LLVM_PATCH,llvm7-WASM-addrspaces)) # WebAssembly
$(eval $(call LLVM_PATCH,llvm7-revert-D44485))
endif # LLVM_VER 7.0

ifeq ($(LLVM_VER_SHORT),8.0)
$(eval $(call LLVM_PATCH,llvm-D27629-AArch64-large_model_6.0.1))
$(eval $(call LLVM_PATCH,llvm8-D34078-vectorize-fdiv))
Expand Down Expand Up @@ -485,12 +417,8 @@ endif # LLVM_VER 9.0

# Add a JL prefix to the version map. DO NOT REMOVE
ifneq ($(LLVM_VER), svn)
ifeq ($(LLVM_VER_SHORT), 6.0)
$(eval $(call LLVM_PATCH,llvm-symver-jlprefix))
else
$(eval $(call LLVM_PATCH,llvm7-symver-jlprefix))
endif
endif

# declare that all patches must be applied before running ./configure
$(LLVM_BUILDDIR_withtype)/build-configured: | $(LLVM_PATCH_PREV)
Expand Down
13 changes: 0 additions & 13 deletions deps/patches/llvm-6.0-D44650.patch

This file was deleted.

36 changes: 0 additions & 36 deletions deps/patches/llvm-6.0-D63688-wasm-isLocal.patch

This file was deleted.

69 changes: 0 additions & 69 deletions deps/patches/llvm-6.0-D64032-cmake-cross.patch

This file was deleted.

37 changes: 0 additions & 37 deletions deps/patches/llvm-6.0-D64225-cmake-cross2.patch

This file was deleted.

79 changes: 0 additions & 79 deletions deps/patches/llvm-6.0-r327540.patch

This file was deleted.

Loading

0 comments on commit 6d86384

Please sign in to comment.