Revert "Make TableGenGlobalISel an object library"

preames · preames · commit e8d8754c063c · 2021-03-31T13:27:00.000-07:00
This reverts commit 2c3cf62. Causes build failures on x86_64, will respond to commit thread with link errors.
diff --git a/llvm/unittests/TableGen/CMakeLists.txt b/llvm/unittests/TableGen/CMakeLists.txt
@@ -12,7 +12,6 @@ add_public_tablegen_target(AutomataTestTableGen)
 add_llvm_unittest(TableGenTests
   CodeExpanderTest.cpp
   AutomataTest.cpp
-  $<TARGET_OBJECTS:obj.LLVMTableGenGlobalISel>
   )
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../utils/TableGen)
-target_link_libraries(TableGenTests PRIVATE LLVMTableGen)
+target_link_libraries(TableGenTests PRIVATE LLVMTableGenGlobalISel LLVMTableGen)
diff --git a/llvm/utils/TableGen/CMakeLists.txt b/llvm/utils/TableGen/CMakeLists.txt
@@ -56,6 +56,6 @@ add_tablegen(llvm-tblgen LLVM
   X86RecognizableInstr.cpp
   WebAssemblyDisassemblerEmitter.cpp
   CTagsEmitter.cpp
-  $<TARGET_OBJECTS:obj.LLVMTableGenGlobalISel>
   )
+target_link_libraries(llvm-tblgen PRIVATE LLVMTableGenGlobalISel)
 set_target_properties(llvm-tblgen PROPERTIES FOLDER "Tablegenning")
diff --git a/llvm/utils/TableGen/GlobalISel/CMakeLists.txt b/llvm/utils/TableGen/GlobalISel/CMakeLists.txt
@@ -3,7 +3,7 @@ set(LLVM_LINK_COMPONENTS
   TableGen
   )
 
-add_llvm_library(LLVMTableGenGlobalISel OBJECT
+add_llvm_library(LLVMTableGenGlobalISel STATIC DISABLE_LLVM_LINK_LLVM_DYLIB
                  CodeExpander.cpp
                  GIMatchDag.cpp
                  GIMatchDagEdge.cpp

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ add_public_tablegen_target(AutomataTestTableGen)`
`12`	`12`	`add_llvm_unittest(TableGenTests`
`13`	`13`	`CodeExpanderTest.cpp`
`14`	`14`	`AutomataTest.cpp`
`15`		`- $<TARGET_OBJECTS:obj.LLVMTableGenGlobalISel>`
`16`	`15`	`)`
`17`	`16`	`include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../utils/TableGen)`
`18`		`-target_link_libraries(TableGenTests PRIVATE LLVMTableGen)`
	`17`	`+target_link_libraries(TableGenTests PRIVATE LLVMTableGenGlobalISel LLVMTableGen)`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,6 @@ add_tablegen(llvm-tblgen LLVM`
`56`	`56`	`X86RecognizableInstr.cpp`
`57`	`57`	`WebAssemblyDisassemblerEmitter.cpp`
`58`	`58`	`CTagsEmitter.cpp`
`59`		`- $<TARGET_OBJECTS:obj.LLVMTableGenGlobalISel>`
`60`	`59`	`)`
	`60`	`+target_link_libraries(llvm-tblgen PRIVATE LLVMTableGenGlobalISel)`
`61`	`61`	`set_target_properties(llvm-tblgen PROPERTIES FOLDER "Tablegenning")`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ set(LLVM_LINK_COMPONENTS`
`3`	`3`	`TableGen`
`4`	`4`	`)`
`5`	`5`
`6`		`-add_llvm_library(LLVMTableGenGlobalISel OBJECT`
	`6`	`+add_llvm_library(LLVMTableGenGlobalISel STATIC DISABLE_LLVM_LINK_LLVM_DYLIB`
`7`	`7`	`CodeExpander.cpp`
`8`	`8`	`GIMatchDag.cpp`
`9`	`9`	`GIMatchDagEdge.cpp`