Post-merge fixes

Meinersbur · Meinersbur · commit baa7cb19d7f7 · 2025-01-09T04:11:17.000+01:00
diff --git a/flang/lib/CMakeLists.txt b/flang/lib/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(Common)
 add_subdirectory(Support)
 add_subdirectory(Evaluate)
 add_subdirectory(Decimal)
diff --git a/flang/lib/Common/CMakeLists.txt b/flang/lib/Common/CMakeLists.txt
diff --git a/flang/lib/Evaluate/CMakeLists.txt b/flang/lib/Evaluate/CMakeLists.txt
@@ -60,7 +60,6 @@ add_flang_library(FortranEvaluate
   variable.cpp
 
   LINK_LIBS
-  FortranCommon
   FortranSupport
   FortranDecimal
   FortranParser
diff --git a/flang/lib/Frontend/CMakeLists.txt b/flang/lib/Frontend/CMakeLists.txt
@@ -27,7 +27,6 @@ add_flang_library(flangFrontend
   FortranParser
   FortranSemantics
   FortranEvaluate
-  FortranCommon
   FortranSupport
   FortranLower
   FIRDialect
diff --git a/flang/lib/Lower/CMakeLists.txt b/flang/lib/Lower/CMakeLists.txt
@@ -56,7 +56,6 @@ add_flang_library(FortranLower
   HLFIRDialect
   ${dialect_libs}
   ${extension_libs}
-  FortranCommon
   FortranSupport
   FortranParser
   FortranEvaluate
diff --git a/flang/lib/Optimizer/OpenMP/CMakeLists.txt b/flang/lib/Optimizer/OpenMP/CMakeLists.txt
@@ -21,7 +21,6 @@ add_flang_library(FlangOpenMPTransforms
   FIRDialect
   FIRDialectSupport
   FIRSupport
-  FortranCommon
   FortranSupport
   FortranEvaluate
   MLIRFuncDialect
diff --git a/flang/lib/Optimizer/Passes/CMakeLists.txt b/flang/lib/Optimizer/Passes/CMakeLists.txt
@@ -11,7 +11,6 @@ add_flang_library(flangPasses
   FlangOpenMPTransforms
   ${dialect_libs}
   ${extension_libs}
-  FortranCommon
   FortranSupport
   HLFIRTransforms
   MLIRPass
diff --git a/flang/lib/Optimizer/Transforms/CMakeLists.txt b/flang/lib/Optimizer/Transforms/CMakeLists.txt
@@ -46,7 +46,6 @@ add_flang_library(FIRTransforms
   FIRDialect
   FIRDialectSupport
   FIRSupport
-  FortranCommon
   FortranSupport
   HLFIRDialect
   MLIRAffineUtils
diff --git a/flang/lib/Parser/CMakeLists.txt b/flang/lib/Parser/CMakeLists.txt
@@ -25,7 +25,6 @@ add_flang_library(FortranParser
   user-state.cpp
 
   LINK_LIBS
-  FortranCommon
   FortranSupport
 
   LINK_COMPONENTS
diff --git a/flang/lib/Semantics/CMakeLists.txt b/flang/lib/Semantics/CMakeLists.txt
@@ -53,7 +53,6 @@ add_flang_library(FortranSemantics
   omp_gen
 
   LINK_LIBS
-  FortranCommon
   FortranSupport
   FortranParser
   FortranEvaluate
diff --git a/flang/tools/bbc/CMakeLists.txt b/flang/tools/bbc/CMakeLists.txt
@@ -32,7 +32,6 @@ target_link_libraries(bbc PRIVATE
   ${extension_libs}
   MLIRAffineToStandard
   MLIRSCFToControlFlow
-  FortranCommon
   FortranSupport
   FortranParser
   FortranEvaluate
diff --git a/flang/tools/f18-parse-demo/CMakeLists.txt b/flang/tools/f18-parse-demo/CMakeLists.txt
@@ -11,7 +11,6 @@ add_flang_tool(f18-parse-demo
 
 target_link_libraries(f18-parse-demo
   PRIVATE
-  FortranCommon
   FortranSupport
   FortranParser
   )
diff --git a/flang/tools/tco/CMakeLists.txt b/flang/tools/tco/CMakeLists.txt
@@ -19,7 +19,6 @@ target_link_libraries(tco PRIVATE
   HLFIRTransforms
   flangPasses
   FlangOpenMPTransforms
-  FortranCommon
   FortranSupport
   ${dialect_libs}
   ${extension_libs}
diff --git a/flang/unittests/Evaluate/CMakeLists.txt b/flang/unittests/Evaluate/CMakeLists.txt
@@ -26,7 +26,6 @@ add_flang_nongtest_unittest(uint128
 )
 
 add_flang_nongtest_unittest(expression
-  FortranCommon
   FortranSupport
   FortranEvaluateTesting
   FortranEvaluate
@@ -41,7 +40,6 @@ add_flang_nongtest_unittest(integer
 )
 
 add_flang_nongtest_unittest(intrinsics
-  FortranCommon
   FortranSupport
   FortranEvaluateTesting
   FortranEvaluate
@@ -67,7 +65,6 @@ add_flang_nongtest_unittest(real
   FortranEvaluateTesting
   FortranEvaluate
   FortranDecimal
-  FortranSupport
   FortranSemantics
 )
 llvm_update_compile_flags(real.test)
@@ -87,7 +84,6 @@ add_flang_nongtest_unittest(ISO-Fortran-binding
 )
 
 add_flang_nongtest_unittest(folding
-  FortranCommon
   FortranSupport
   FortranEvaluateTesting
   FortranEvaluate
diff --git a/flang/unittests/Frontend/CMakeLists.txt b/flang/unittests/Frontend/CMakeLists.txt
@@ -18,7 +18,6 @@ target_link_libraries(FlangFrontendTests
   FortranLower
   FortranParser
   FortranSemantics
-  FortranCommon
   FortranSupport
   FortranEvaluate
   MLIRIR

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-add_subdirectory(Common)`
`2`	`1`	`add_subdirectory(Support)`
`3`	`2`	`add_subdirectory(Evaluate)`
`4`	`3`	`add_subdirectory(Decimal)`