From fc727781e8ac44e849a6ad273b50f04b4c621896 Mon Sep 17 00:00:00 2001 From: Carl Ritson Date: Thu, 1 May 2025 09:29:35 +0900 Subject: [PATCH 1/2] [cmake] Pass LLVM_TABLEGEN_FLAGS to cross compile targets If ValueTypes.td contains conditional directives enabled by defs in LLVM_TABLEGEN_FLAGS then native build tblgen and min-tblgen must be built with matching flags. This ensures the embedded types in TableGen are consistent with those used for building tables. --- llvm/cmake/modules/CrossCompile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake index 3b31d3e218a37..8691e4c47e5b3 100644 --- a/llvm/cmake/modules/CrossCompile.cmake +++ b/llvm/cmake/modules/CrossCompile.cmake @@ -100,6 +100,7 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype) -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN="${LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN}" -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_TESTS=OFF + -DLLVM_TABLEGEN_FLAGS="{LLVM_TABLEGEN_FLAGS}" ${build_type_flags} ${linker_flag} ${external_clang_dir} ${libc_flags} ${ARGN} WORKING_DIRECTORY ${${project_name}_${target_name}_BUILD} From be1263da571229e248e106235fca6d62fb8bfd26 Mon Sep 17 00:00:00 2001 From: Carl Ritson Date: Thu, 1 May 2025 16:21:33 +0900 Subject: [PATCH 2/2] - Fix typo --- llvm/cmake/modules/CrossCompile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake index 8691e4c47e5b3..ea5195c9c574c 100644 --- a/llvm/cmake/modules/CrossCompile.cmake +++ b/llvm/cmake/modules/CrossCompile.cmake @@ -100,7 +100,7 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype) -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN="${LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN}" -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_TESTS=OFF - -DLLVM_TABLEGEN_FLAGS="{LLVM_TABLEGEN_FLAGS}" + -DLLVM_TABLEGEN_FLAGS="${LLVM_TABLEGEN_FLAGS}" ${build_type_flags} ${linker_flag} ${external_clang_dir} ${libc_flags} ${ARGN} WORKING_DIRECTORY ${${project_name}_${target_name}_BUILD}