Skip to content

Commit 2f326f7

Browse files
authored
Merge pull request #35896 from JuliaLang/tb/llvm_abi_checks
Disable LLVM ABI checks for all builds, and sync patch list with Yggdrasil.
2 parents 43d8a28 + c0dacdc commit 2f326f7

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

deps/llvm.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ ifeq ($(fPIC),)
156156
LLVM_CMAKE += -DLLVM_ENABLE_PIC=OFF
157157
endif
158158

159+
# disable ABI breaking checks: by default only enabled for asserts build, in which case
160+
# it is then impossible to call non-asserts LLVM libraries (like out-of-tree backends)
161+
LLVM_CMAKE += -DLLVM_ABI_BREAKING_CHECKS=FORCE_OFF
162+
159163
ifeq ($(BUILD_CUSTOM_LIBCXX),1)
160164
LLVM_LDFLAGS += -Wl,-rpath,$(build_libdir)
161165
LLVM_CPPFLAGS += -I$(build_includedir)
@@ -400,6 +404,7 @@ ifeq ($(LLVM_VER_SHORT),9.0)
400404
$(eval $(call LLVM_PATCH,llvm-D27629-AArch64-large_model_6.0.1))
401405
$(eval $(call LLVM_PATCH,llvm8-D34078-vectorize-fdiv))
402406
$(eval $(call LLVM_PATCH,llvm-7.0-D44650)) # mingw32 build fix
407+
$(eval $(call LLVM_PATCH,llvm-6.0-DISABLE_ABI_CHECKS))
403408
$(eval $(call LLVM_PATCH,llvm9-D50010-VNCoercion-ni))
404409
$(eval $(call LLVM_PATCH,llvm-exegesis-mingw)) # mingw build
405410
$(eval $(call LLVM_PATCH,llvm-test-plugin-mingw)) # mingw build
@@ -416,6 +421,7 @@ ifeq ($(LLVM_VER_SHORT),10.0)
416421
$(eval $(call LLVM_PATCH,llvm-D27629-AArch64-large_model_6.0.1))
417422
$(eval $(call LLVM_PATCH,llvm8-D34078-vectorize-fdiv))
418423
$(eval $(call LLVM_PATCH,llvm-7.0-D44650)) # mingw32 build fix
424+
$(eval $(call LLVM_PATCH,llvm-6.0-DISABLE_ABI_CHECKS))
419425
$(eval $(call LLVM_PATCH,llvm9-D50010-VNCoercion-ni))
420426
$(eval $(call LLVM_PATCH,llvm-exegesis-mingw)) # mingw build
421427
$(eval $(call LLVM_PATCH,llvm-test-plugin-mingw)) # mingw build

0 commit comments

Comments
 (0)