release/20.x: Fixes for flang/mlir dependencies #125837
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
mlir
flang
|
@llvm/pr-subscribers-flang-fir-hlfir @llvm/pr-subscribers-mlir Author: Nikita Popov (nikic) ChangesBackport a few fixes for flang/MLIR library dependencies related to MLIR_LINK_MLIR_DYLIB changes. Full diff: https://github.com/llvm/llvm-project/pull/125837.diff 3 Files Affected:
diff --git a/flang/lib/Optimizer/Analysis/CMakeLists.txt b/flang/lib/Optimizer/Analysis/CMakeLists.txt
index 6fe9c70f83765f1..c4dae898f8e5722 100644
--- a/flang/lib/Optimizer/Analysis/CMakeLists.txt
+++ b/flang/lib/Optimizer/Analysis/CMakeLists.txt
@@ -12,6 +12,7 @@ add_flang_library(FIRAnalysis
LINK_LIBS
FIRBuilder
FIRDialect
+ FIRSupport
HLFIRDialect
MLIR_LIBS
@@ -19,5 +20,4 @@ add_flang_library(FIRAnalysis
MLIRLLVMDialect
MLIRMathTransforms
MLIROpenMPDialect
- FIRSupport
)
diff --git a/flang/tools/bbc/CMakeLists.txt b/flang/tools/bbc/CMakeLists.txt
index 85aeb85e0c53093..97462be83ea4389 100644
--- a/flang/tools/bbc/CMakeLists.txt
+++ b/flang/tools/bbc/CMakeLists.txt
@@ -29,6 +29,11 @@ target_link_libraries(bbc PRIVATE
flangFrontend
flangPasses
FlangOpenMPTransforms
+ FortranCommon
+ FortranParser
+ FortranEvaluate
+ FortranSemantics
+ FortranLower
)
mlir_target_link_libraries(bbc PRIVATE
@@ -36,9 +41,4 @@ mlir_target_link_libraries(bbc PRIVATE
${extension_libs}
MLIRAffineToStandard
MLIRSCFToControlFlow
- FortranCommon
- FortranParser
- FortranEvaluate
- FortranSemantics
- FortranLower
)
diff --git a/mlir/test/lib/IR/CMakeLists.txt b/mlir/test/lib/IR/CMakeLists.txt
index e5416da70d50080..71a96c7f92c0c7d 100644
--- a/mlir/test/lib/IR/CMakeLists.txt
+++ b/mlir/test/lib/IR/CMakeLists.txt
@@ -27,13 +27,15 @@ add_mlir_library(MLIRTestIR
TestVisitorsGeneric.cpp
EXCLUDE_FROM_LIBMLIR
+
+ LINK_LIBS PUBLIC
+ MLIRTestDialect
)
mlir_target_link_libraries(MLIRTestIR PUBLIC
MLIRPass
MLIRBytecodeReader
MLIRBytecodeWriter
MLIRFunctionInterfaces
- MLIRTestDialect
)
target_include_directories(MLIRTestIR
|
mgorny
approved these changes
Feb 5, 2025
This is a test library which is not part of libMLIR, so it should use normal LINK_LIBS instead of mlir_target_link_libraries. This fixes an issue introduced in llvm#123910 and follows up on the fix in llvm#125004, which added the library to DEPENDS, which is not sufficient.
This library is provided by flang, not MLIR, so it should not be part of MLIR_LIBS. Fixes an issue introduced in llvm#120966. (cherry picked from commit ee76bda)
The Fortran libraries are not part of MLIR, so they should use target_link_libraries() rather than mlir_target_link_libraries(). This fixes an issue introduced in llvm#120966. (cherry picked from commit f9af5c1)
nikic
force-pushed
the
flang-libs-backports
branch
from
29f3a87 to
4c4ed5e
Compare
|
@nikic (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport a few fixes for flang/MLIR library dependencies related to MLIR_LINK_MLIR_DYLIB changes.