Skip to content

Commit 3b91a15

Browse files
authored
Merge pull request JuliaLang#40263 from JuliaLang/vc/llvm12_patches
[LLVM] patch list for LLVM 12
2 parents 659bc12 + d47565e commit 3b91a15

File tree

3 files changed

+604
-1
lines changed

3 files changed

+604
-1
lines changed

deps/llvm.mk

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ $(eval $(call LLVM_PATCH,llvm-11-ppc-half-ctr)) # remove for LLVM 12
561561
$(eval $(call LLVM_PATCH,llvm-11-ppc-sp-from-bp)) # remove for LLVM 12
562562
$(eval $(call LLVM_PATCH,llvm-rGb498303066a6-gcc11-header-fix)) # remove for LLVM 12
563563
$(eval $(call LLVM_PATCH,llvm-11-D94813-mergeicmps))
564-
$(eval $(call LLVM_PATCH,llvm-11-D94980-CTR-half))
564+
$(eval $(call LLVM_PATCH,llvm-11-D94980-CTR-half)) # remove for LLVM 12
565565
$(eval $(call LLVM_PATCH,llvm-11-D94058-sext-atomic-ops)) # remove for LLVM 12
566566
$(eval $(call LLVM_PATCH,llvm-11-D96283-dagcombine-half)) # remove for LLVM 12
567567
$(eval $(call LLVM_PROJ_PATCH,llvm-11-AArch64-FastIsel-bug))
@@ -570,6 +570,20 @@ $(eval $(call LLVM_PROJ_PATCH,llvm-11-D97571-AArch64-loh)) # remove for LLVM 13
570570
$(eval $(call LLVM_PROJ_PATCH,llvm-11-aarch64-addrspace)) # remove for LLVM 13
571571
endif # LLVM_VER 11.0
572572

573+
ifeq ($(LLVM_VER_SHORT),12.0)
574+
$(eval $(call LLVM_PATCH,llvm7-revert-D44485)) # Needs upstreaming
575+
$(eval $(call LLVM_PATCH,llvm-12-D75072-SCEV-add-type))
576+
$(eval $(call LLVM_PATCH,llvm-julia-tsan-custom-as))
577+
ifeq ($(BUILD_LLVM_CLANG),1)
578+
$(eval $(call LLVM_PATCH,llvm-D88630-clang-cmake))
579+
endif
580+
$(eval $(call LLVM_PATCH,llvm-11-D93154-globalisel-as))
581+
$(eval $(call LLVM_PATCH,llvm-11-D94813-mergeicmps))
582+
$(eval $(call LLVM_PROJ_PATCH,llvm-11-AArch64-FastIsel-bug))
583+
$(eval $(call LLVM_PATCH,llvm-12-D97435-AArch64-movaddrreg))
584+
$(eval $(call LLVM_PROJ_PATCH,llvm-11-D97571-AArch64-loh)) # remove for LLVM 13
585+
$(eval $(call LLVM_PROJ_PATCH,llvm-11-aarch64-addrspace)) # remove for LLVM 13
586+
endif # LLVM_VER 12.0
573587

574588
# Add a JL prefix to the version map. DO NOT REMOVE
575589
ifneq ($(LLVM_VER), svn)

0 commit comments

Comments
 (0)