Skip to content

Commit 6d86384

Browse files
authored
Merge pull request #34489 from JuliaLang/vc/llvm8_only
Remove support for LLVM6 and LLVM7
2 parents c2abaee + 643c931 commit 6d86384

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+8
-12588
lines changed

deps/llvm.mk

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -375,74 +375,6 @@ $$(LLVM_BUILDDIR_withtype)/build-compiled: $$(LLVM_SRC_DIR)/$1.patch-applied
375375
LLVM_PATCH_PREV := $$(LLVM_SRC_DIR)/$1.patch-applied
376376
endef
377377

378-
ifeq ($(LLVM_VER_SHORT),6.0)
379-
ifeq ($(LLVM_VER_PATCH), 0)
380-
$(eval $(call LLVM_PATCH,llvm-D27629-AArch64-large_model_4.0))
381-
else
382-
$(eval $(call LLVM_PATCH,llvm-D27629-AArch64-large_model_6.0.1))
383-
endif
384-
$(eval $(call LLVM_PATCH,llvm-D34078-vectorize-fdiv))
385-
$(eval $(call LLVM_PATCH,llvm-6.0-NVPTX-addrspaces)) # NVPTX
386-
$(eval $(call LLVM_PATCH,llvm-D42262-jumpthreading-not-i1)) # remove for 7.0
387-
$(eval $(call LLVM_PATCH,llvm-PPC-addrspaces)) # remove for 7.0
388-
ifeq ($(LLVM_VER_PATCH), 0)
389-
$(eval $(call LLVM_PATCH,llvm-D42260)) # remove for 7.0
390-
$(eval $(call LLVM_PATCH,llvm-rL326843-missing-header)) # remove for 7.0
391-
$(eval $(call LLVM_PATCH,llvm-6.0-r327540)) # remove for 7.0
392-
endif
393-
$(eval $(call LLVM_PATCH,llvm-6.0.0_D27296-libssp)) # remove for 7.0
394-
$(eval $(call LLVM_PATCH,llvm-6.0-D44650)) # mingw32 build fix
395-
ifeq ($(LLVM_VER_PATCH), 0)
396-
$(eval $(call LLVM_PATCH,llvm-D45008)) # remove for 7.0
397-
$(eval $(call LLVM_PATCH,llvm-D45070)) # remove for 7.0
398-
$(eval $(call LLVM_PATCH,llvm-6.0.0-ifconv-D45819)) # remove for 7.0
399-
endif
400-
$(eval $(call LLVM_PATCH,llvm-D46460))
401-
ifeq ($(LLVM_VER_PATCH), 0)
402-
$(eval $(call LLVM_PATCH,llvm-rL332680)) # remove for 7.0
403-
$(eval $(call LLVM_PATCH,llvm-rL332682)) # remove for 7.0
404-
$(eval $(call LLVM_PATCH,llvm-rL332302)) # remove for 7.0
405-
$(eval $(call LLVM_PATCH,llvm-rL332694)) # remove for 7.0
406-
endif
407-
$(eval $(call LLVM_PATCH,llvm-rL327898)) # remove for 7.0
408-
$(eval $(call LLVM_PATCH,llvm-6.0-DISABLE_ABI_CHECKS))
409-
$(eval $(call LLVM_PATCH,llvm-OProfile-line-num))
410-
$(eval $(call LLVM_PATCH,llvm-D44892-Perf-integration))
411-
$(eval $(call LLVM_PATCH,llvm-D49832-SCEVPred)) # Remove for 7.0
412-
$(eval $(call LLVM_PATCH,llvm-rL323946-LSRTy)) # Remove for 7.0
413-
$(eval $(call LLVM_PATCH,llvm-D50010-VNCoercion-ni))
414-
$(eval $(call LLVM_PATCH,llvm-D50167-scev-umin))
415-
$(eval $(call LLVM_PATCH,llvm-rL326967-aligned-load)) # remove for 7.0
416-
ifeq ($(LLVM_VER_PATCH), 0)
417-
$(eval $(call LLVM_PATCH,llvm-windows-race))
418-
endif
419-
$(eval $(call LLVM_PATCH,llvm-D51842-win64-byval-cc))
420-
$(eval $(call LLVM_PATCH,llvm-D57118-powerpc))
421-
$(eval $(call LLVM_PATCH,llvm-r355582-avxminmax)) # remove for 8.0
422-
$(eval $(call LLVM_PATCH,llvm-rL349068-llvm-config)) # remove for 8.0
423-
$(eval $(call LLVM_PATCH,llvm-6.0-D63688-wasm-isLocal)) # remove for 9.0
424-
$(eval $(call LLVM_PATCH,llvm-6.0-D64032-cmake-cross)) # remove for 9.0
425-
$(eval $(call LLVM_PATCH,llvm-6.0-D64225-cmake-cross2)) # remove for 9.0
426-
$(eval $(call LLVM_PATCH,llvm6-WASM-addrspaces)) # WebAssembly
427-
endif # LLVM_VER 6.0
428-
429-
ifeq ($(LLVM_VER_SHORT),7.0)
430-
$(eval $(call LLVM_PATCH,llvm-D27629-AArch64-large_model_6.0.1))
431-
$(eval $(call LLVM_PATCH,llvm-D34078-vectorize-fdiv))
432-
$(eval $(call LLVM_PATCH,llvm-6.0-NVPTX-addrspaces)) # NVPTX -- warning: this fails check-llvm-codegen-nvptx
433-
$(eval $(call LLVM_PATCH,llvm-7.0-D44650)) # mingw32 build fix
434-
$(eval $(call LLVM_PATCH,llvm-D46460))
435-
$(eval $(call LLVM_PATCH,llvm-6.0-DISABLE_ABI_CHECKS))
436-
$(eval $(call LLVM_PATCH,llvm7-D50010-VNCoercion-ni))
437-
$(eval $(call LLVM_PATCH,llvm-7.0-D50167-scev-umin))
438-
$(eval $(call LLVM_PATCH,llvm7-windows-race))
439-
$(eval $(call LLVM_PATCH,llvm7-D51842-win64-byval-cc)) # remove for 8.0
440-
$(eval $(call LLVM_PATCH,llvm-D57118-powerpc))
441-
$(eval $(call LLVM_PATCH,llvm-rL349068-llvm-config)) # remove for 8.0
442-
$(eval $(call LLVM_PATCH,llvm7-WASM-addrspaces)) # WebAssembly
443-
$(eval $(call LLVM_PATCH,llvm7-revert-D44485))
444-
endif # LLVM_VER 7.0
445-
446378
ifeq ($(LLVM_VER_SHORT),8.0)
447379
$(eval $(call LLVM_PATCH,llvm-D27629-AArch64-large_model_6.0.1))
448380
$(eval $(call LLVM_PATCH,llvm8-D34078-vectorize-fdiv))
@@ -485,12 +417,8 @@ endif # LLVM_VER 9.0
485417

486418
# Add a JL prefix to the version map. DO NOT REMOVE
487419
ifneq ($(LLVM_VER), svn)
488-
ifeq ($(LLVM_VER_SHORT), 6.0)
489-
$(eval $(call LLVM_PATCH,llvm-symver-jlprefix))
490-
else
491420
$(eval $(call LLVM_PATCH,llvm7-symver-jlprefix))
492421
endif
493-
endif
494422

495423
# declare that all patches must be applied before running ./configure
496424
$(LLVM_BUILDDIR_withtype)/build-configured: | $(LLVM_PATCH_PREV)

deps/patches/llvm-6.0-D44650.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

deps/patches/llvm-6.0-D63688-wasm-isLocal.patch

Lines changed: 0 additions & 36 deletions
This file was deleted.

deps/patches/llvm-6.0-D64032-cmake-cross.patch

Lines changed: 0 additions & 69 deletions
This file was deleted.

deps/patches/llvm-6.0-D64225-cmake-cross2.patch

Lines changed: 0 additions & 37 deletions
This file was deleted.

deps/patches/llvm-6.0-r327540.patch

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)