[llvm] e8d8754 - Revert "Make TableGenGlobalISel an object library"
Philip Reames via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 31 13:27:19 PDT 2021
Author: Philip Reames
Date: 2021-03-31T13:27:00-07:00
New Revision: e8d8754c063c2bd3861bf0570012c827ee58e747
URL: https://github.com/llvm/llvm-project/commit/e8d8754c063c2bd3861bf0570012c827ee58e747
DIFF: https://github.com/llvm/llvm-project/commit/e8d8754c063c2bd3861bf0570012c827ee58e747.diff
LOG: Revert "Make TableGenGlobalISel an object library"
This reverts commit 2c3cf62d4a26de85aab180bb43a579c913b17f3e.
Causes build failures on x86_64, will respond to commit thread with link errors.
Added:
Modified:
llvm/unittests/TableGen/CMakeLists.txt
llvm/utils/TableGen/CMakeLists.txt
llvm/utils/TableGen/GlobalISel/CMakeLists.txt
Removed:
################################################################################
diff --git a/llvm/unittests/TableGen/CMakeLists.txt b/llvm/unittests/TableGen/CMakeLists.txt
index c678f2b639d97..178018ba89674 100644
--- 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
index 8b01a40f3ad58..9e918852b1c0f 100644
--- 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
index 1cd741cd6be1a..c23ef6742f32e 100644
--- 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
More information about the llvm-commits
mailing list