Merge pull request #35270 from JuliaLang/vc/llvm10

add patch list for LLVM 10
JuliaLang · Mar 29, 2020 · ac22a6d · ac22a6d · nanosoldier · Mar 29, 2020
2 parents f371270 + 614f644
commit ac22a6d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/deps/checksums/llvm-10.0.0.src.tar.xz/md5 b/deps/checksums/llvm-10.0.0.src.tar.xz/md5
@@ -0,0 +1 @@
+693cefdc49d618f828144486a18b473f
diff --git a/deps/checksums/llvm-10.0.0.src.tar.xz/sha512 b/deps/checksums/llvm-10.0.0.src.tar.xz/sha512
@@ -0,0 +1 @@
+7dc961aacee3a01ecc002ff2b688a2ef50661856d2abd5ecc90566ffcad7566e4976736cd339ea96592e452cd5a17aaceba9712b2effec805661cca8ff020ee7
diff --git a/deps/llvm.mk b/deps/llvm.mk
@@ -182,13 +182,7 @@ endif
 
 ifneq ($(LLVM_VER),svn)
 ifeq (,$(findstring rc,$(LLVM_VER)))
-ifeq ($(shell [ x"$(LLVM_VER)" = x"8.0.1" ]; echo $$?),0)
 LLVM_SRC_URL := https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VER)
-else ifeq ($(shell [ x"$(LLVM_VER)" = x"9.0.1" ]; echo $$?),0)
-LLVM_SRC_URL := https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VER)
-else
-LLVM_SRC_URL := http:https://releases.llvm.org/$(LLVM_VER)
-endif
 else
 LLVM_VER_SPLIT := $(subst rc, ,$(LLVM_VER))
 LLVM_SRC_URL := https://prereleases.llvm.org/$(word 1,$(LLVM_VER_SPLIT))/rc$(word 2,$(LLVM_VER_SPLIT))
@@ -417,6 +411,18 @@ $(eval $(call LLVM_PATCH,llvm-D75072-SCEV-add-type))
 $(eval $(call LLVM_PATCH,llvm-9.0-D65174-limit-merge-stores)) # remove for 10.0
 endif # LLVM_VER 9.0
 
+ifeq ($(LLVM_VER_SHORT),10.0)
+$(eval $(call LLVM_PATCH,llvm-D27629-AArch64-large_model_6.0.1))
+$(eval $(call LLVM_PATCH,llvm8-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,llvm9-D50010-VNCoercion-ni))
+$(eval $(call LLVM_PATCH,llvm8-WASM-addrspaces)) # WebAssembly
+$(eval $(call LLVM_PATCH,llvm-exegesis-mingw)) # mingw build
+$(eval $(call LLVM_PATCH,llvm-test-plugin-mingw)) # mingw build
+$(eval $(call LLVM_PATCH,llvm7-revert-D44485))
+$(eval $(call LLVM_PATCH,llvm-D75072-SCEV-add-type))
+endif # LLVM_VER 10.0
 
 # Add a JL prefix to the version map. DO NOT REMOVE
 ifneq ($(LLVM_VER), svn)

diff --git a/src/aotcompile.cpp b/src/aotcompile.cpp
@@ -848,7 +848,7 @@ addPassesToGenerateCode(LLVMTargetMachine *TM, PassManagerBase &PM) {
  TargetPassConfig *PassConfig = TM->createPassConfig(PM);
  PassConfig->setDisableVerify(false);
  PM.add(PassConfig);
-#if JL_LLVM_VERSION >= 110000
+#if JL_LLVM_VERSION >= 100000
  MachineModuleInfoWrapperPass *MMIWP =
  new MachineModuleInfoWrapperPass(TM);
  PM.add(MMIWP);
@@ -860,7 +860,7 @@ addPassesToGenerateCode(LLVMTargetMachine *TM, PassManagerBase &PM) {
  return NULL;
  PassConfig->addMachinePasses();
  PassConfig->setInitialized();
-#if JL_LLVM_VERSION >= 110000
+#if JL_LLVM_VERSION >= 100000
  return &MMIWP->getMMI().getContext();
 #else
  return &MMI->getContext();
@@ -905,7 +905,7 @@ jl_value_t *jl_dump_llvm_asm(void *F, const char* asm_variant, const char *debug
  std::unique_ptr<MCAsmBackend> MAB(TM->getTarget().createMCAsmBackend(
  STI, MRI, TM->Options.MCOptions));
  std::unique_ptr<MCCodeEmitter> MCE;
-#if JL_LLVM_VERSION >= 110000
+#if JL_LLVM_VERSION >= 100000
  auto FOut = std::make_unique<formatted_raw_ostream>(asmfile);
 #else
  auto FOut = llvm::make_unique<formatted_raw_ostream>(asmfile);