SFG545
4f914253b7
- Introduced BSD tooling compatibility patch for Linux kernel, modifying header dependency handling and export checks in KVM. - Updated MLIR project to ensure generated headers are correctly located and dependencies are managed for various tools. - Enhanced ncurses configuration to support wide-character handling, ensuring proper header generation and compatibility. - Modified GNU parallel to use POSIX compliant shell, ensuring broader compatibility across different environments. - Fixed capability name handling in procps-ng by replacing echo with printf for better formatting. - Adjusted util-linux build system to support byacc alongside bison, improving parser generation and flexibility.
97 lines
4.2 KiB
Diff
97 lines
4.2 KiB
Diff
diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt
|
|
index 47349f0..bdbc960 100644
|
|
--- a/mlir/cmake/modules/CMakeLists.txt
|
|
+++ b/mlir/cmake/modules/CMakeLists.txt
|
|
@@ -101,6 +101,7 @@ find_prefix_from_config(MLIR_CONFIG_CODE MLIR_INSTALL_PREFIX "${MLIR_INSTALL_PAC
|
|
# variable 'MLIR_INSTALL_PREFIX'.
|
|
extend_path(MLIR_CONFIG_CMAKE_DIR "\${MLIR_INSTALL_PREFIX}" "${MLIR_INSTALL_PACKAGE_DIR}")
|
|
extend_path(MLIR_CONFIG_LLVM_CMAKE_DIR "\${MLIR_INSTALL_PREFIX}" "${LLVM_INSTALL_PACKAGE_DIR}")
|
|
+extend_path(MLIR_CONFIG_TOOLS_DIR "\${MLIR_INSTALL_PREFIX}" "${MLIR_TOOLS_INSTALL_DIR}")
|
|
get_config_exports_includes(MLIR MLIR_CONFIG_INCLUDE_EXPORTS)
|
|
extend_path(base_includedir "\${MLIR_INSTALL_PREFIX}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
|
set(MLIR_CONFIG_INCLUDE_DIRS
|
|
@@ -108,11 +109,11 @@ set(MLIR_CONFIG_INCLUDE_DIRS
|
|
)
|
|
# Ensure that we are using the installed mlir-tblgen. This might not be MLIR_TABLEGEN_EXE
|
|
# if we're building with a host-optimized mlir-tblgen (with LLVM_OPTIMIZED_TABLEGEN).
|
|
-set(MLIR_CONFIG_TABLEGEN_EXE mlir-tblgen)
|
|
-set(MLIR_CONFIG_PDLL_TABLEGEN_EXE mlir-pdll)
|
|
-set(MLIR_CONFIG_SRC_SHARDER_TABLEGEN_EXE mlir-src-sharder)
|
|
+set(MLIR_CONFIG_TABLEGEN_EXE "${MLIR_CONFIG_TOOLS_DIR}/mlir-tblgen")
|
|
+set(MLIR_CONFIG_PDLL_TABLEGEN_EXE "${MLIR_CONFIG_TOOLS_DIR}/mlir-pdll")
|
|
+set(MLIR_CONFIG_SRC_SHARDER_TABLEGEN_EXE "${MLIR_CONFIG_TOOLS_DIR}/mlir-src-sharder")
|
|
|
|
-set(MLIR_CONFIG_IRDL_TO_CPP_EXE mlir-irdl-to-cpp)
|
|
+set(MLIR_CONFIG_IRDL_TO_CPP_EXE "${MLIR_CONFIG_TOOLS_DIR}/mlir-irdl-to-cpp")
|
|
|
|
configure_file(
|
|
${CMAKE_CURRENT_SOURCE_DIR}/MLIRConfig.cmake.in
|
|
@@ -125,6 +126,7 @@ configure_file(
|
|
set(MLIR_CONFIG_CODE)
|
|
set(MLIR_CONFIG_CMAKE_DIR)
|
|
set(MLIR_CONFIG_LLVM_CMAKE_DIR)
|
|
+set(MLIR_CONFIG_TOOLS_DIR)
|
|
set(MLIR_CONFIG_INCLUDE_DIRS)
|
|
|
|
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
|
|
diff --git a/mlir/tools/mlir-irdl-to-cpp/CMakeLists.txt b/mlir/tools/mlir-irdl-to-cpp/CMakeLists.txt
|
|
index 27a7e22..216b88f 100644
|
|
--- a/mlir/tools/mlir-irdl-to-cpp/CMakeLists.txt
|
|
+++ b/mlir/tools/mlir-irdl-to-cpp/CMakeLists.txt
|
|
@@ -1,6 +1,7 @@
|
|
add_llvm_executable(mlir-irdl-to-cpp
|
|
mlir-irdl-to-cpp.cpp
|
|
)
|
|
+add_dependencies(mlir-irdl-to-cpp mlir-generic-headers)
|
|
mlir_target_link_libraries(mlir-irdl-to-cpp
|
|
PRIVATE
|
|
MLIRTargetIRDLToCpp
|
|
diff --git a/mlir/tools/mlir-linalg-ods-gen/CMakeLists.txt b/mlir/tools/mlir-linalg-ods-gen/CMakeLists.txt
|
|
index ef5ce88..2bca6f6 100644
|
|
--- a/mlir/tools/mlir-linalg-ods-gen/CMakeLists.txt
|
|
+++ b/mlir/tools/mlir-linalg-ods-gen/CMakeLists.txt
|
|
@@ -7,6 +7,7 @@ set(LLVM_LINK_COMPONENTS
|
|
add_mlir_tool(mlir-linalg-ods-yaml-gen
|
|
mlir-linalg-ods-yaml-gen.cpp
|
|
)
|
|
+add_dependencies(mlir-linalg-ods-yaml-gen mlir-generic-headers)
|
|
llvm_update_compile_flags(mlir-linalg-ods-yaml-gen)
|
|
target_link_libraries(mlir-linalg-ods-yaml-gen PRIVATE
|
|
MLIRIR
|
|
diff --git a/mlir/tools/mlir-parser-fuzzer/bytecode/CMakeLists.txt b/mlir/tools/mlir-parser-fuzzer/bytecode/CMakeLists.txt
|
|
index e17b158..5723bdc 100644
|
|
--- a/mlir/tools/mlir-parser-fuzzer/bytecode/CMakeLists.txt
|
|
+++ b/mlir/tools/mlir-parser-fuzzer/bytecode/CMakeLists.txt
|
|
@@ -6,6 +6,7 @@ add_llvm_fuzzer(mlir-bytecode-parser-fuzzer
|
|
mlir-bytecode-parser-fuzzer.cpp
|
|
DUMMY_MAIN DummyParserFuzzer.cpp
|
|
)
|
|
+add_dependencies(mlir-bytecode-parser-fuzzer mlir-generic-headers)
|
|
mlir_target_link_libraries(mlir-bytecode-parser-fuzzer
|
|
PUBLIC
|
|
MLIRIR
|
|
diff --git a/mlir/tools/mlir-parser-fuzzer/text/CMakeLists.txt b/mlir/tools/mlir-parser-fuzzer/text/CMakeLists.txt
|
|
index b4a2bac..6ba670f 100644
|
|
--- a/mlir/tools/mlir-parser-fuzzer/text/CMakeLists.txt
|
|
+++ b/mlir/tools/mlir-parser-fuzzer/text/CMakeLists.txt
|
|
@@ -6,6 +6,7 @@ add_llvm_fuzzer(mlir-text-parser-fuzzer
|
|
mlir-text-parser-fuzzer.cpp
|
|
DUMMY_MAIN DummyParserFuzzer.cpp
|
|
)
|
|
+add_dependencies(mlir-text-parser-fuzzer mlir-generic-headers)
|
|
mlir_target_link_libraries(mlir-text-parser-fuzzer
|
|
PUBLIC
|
|
MLIRIR
|
|
diff --git a/mlir/tools/mlir-pdll/CMakeLists.txt b/mlir/tools/mlir-pdll/CMakeLists.txt
|
|
index 35b8870..a1dcd02 100644
|
|
--- a/mlir/tools/mlir-pdll/CMakeLists.txt
|
|
+++ b/mlir/tools/mlir-pdll/CMakeLists.txt
|
|
@@ -21,6 +21,7 @@ add_tablegen(mlir-pdll MLIR_PDLL
|
|
${LIBS}
|
|
)
|
|
|
|
+add_dependencies(mlir-pdll mlir-generic-headers)
|
|
target_link_libraries(mlir-pdll PRIVATE ${LIBS})
|
|
|
|
mlir_check_all_link_libraries(mlir-pdll)
|