[llvm] r342336 - Revert r342148 (and follow-on fix attempts r342154, r342180, r342182, r342193)
Nico Weber via llvm-commits
llvm-commits at lists.llvm.org
Sat Sep 15 12:04:27 PDT 2018
Author: nico
Date: Sat Sep 15 12:04:27 2018
New Revision: 342336
URL: http://llvm.org/viewvc/llvm-project?rev=342336&view=rev
Log:
Revert r342148 (and follow-on fix attempts r342154, r342180, r342182, r342193)
Many bots buildling with make have been broken for several days, e.g.
http://lab.llvm.org:8011/builders/lld-x86_64-darwin13
Modified:
llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt
llvm/trunk/tools/llvm-exegesis/CMakeLists.txt
llvm/trunk/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt
llvm/trunk/tools/llvm-exegesis/lib/X86/CMakeLists.txt
llvm/trunk/tools/llvm-mca/lib/CMakeLists.txt
llvm/trunk/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt
llvm/trunk/unittests/tools/llvm-exegesis/X86/CMakeLists.txt
Modified: llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt?rev=342336&r1=342335&r2=342336&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt Sat Sep 15 12:04:27 2018
@@ -1,12 +1,13 @@
-add_llvm_library(LLVMCFIVerify
+add_library(LLVMCFIVerify
+ STATIC
FileAnalysis.cpp
FileAnalysis.h
GraphBuilder.cpp
GraphBuilder.h
+ )
- STATIC
-
- LINK_COMPONENTS
+llvm_update_compile_flags(LLVMCFIVerify)
+llvm_map_components_to_libnames(libs
DebugInfoDWARF
MC
MCParser
@@ -14,3 +15,5 @@ add_llvm_library(LLVMCFIVerify
Support
Symbolize
)
+target_link_libraries(LLVMCFIVerify ${libs})
+set_target_properties(LLVMCFIVerify PROPERTIES FOLDER "Libraries")
Modified: llvm/trunk/tools/llvm-exegesis/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/CMakeLists.txt?rev=342336&r1=342335&r2=342336&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-exegesis/CMakeLists.txt Sat Sep 15 12:04:27 2018
@@ -1,15 +1,11 @@
set(LLVM_LINK_COMPONENTS
- MC
Support
native
)
add_llvm_tool(llvm-exegesis
llvm-exegesis.cpp
-
- DEPENDS
- intrinsics_gen
)
add_subdirectory(lib)
Modified: llvm/trunk/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt?rev=342336&r1=342335&r2=342336&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt Sat Sep 15 12:04:27 2018
@@ -3,15 +3,16 @@ include_directories(
${LLVM_BINARY_DIR}/lib/Target/AArch64
)
-add_llvm_library(LLVMExegesisAArch64
- Target.cpp
-
+add_library(LLVMExegesisAArch64
STATIC
+ Target.cpp
+ )
- DEPENDS
- intrinsics_gen
-
- LINK_COMPONENTS
+llvm_update_compile_flags(LLVMExegesisAArch64)
+llvm_map_components_to_libnames(libs
AArch64
Exegesis
)
+
+target_link_libraries(LLVMExegesisAArch64 ${libs})
+set_target_properties(LLVMExegesisAArch64 PROPERTIES FOLDER "Libraries")
Modified: llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt?rev=342336&r1=342335&r2=342336&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt Sat Sep 15 12:04:27 2018
@@ -7,12 +7,8 @@ if (LLVM_TARGETS_TO_BUILD MATCHES "AArch
set(LLVM_EXEGESIS_TARGETS "${LLVM_EXEGESIS_TARGETS} AArch64" PARENT_SCOPE)
endif()
-set(libs)
-if(LLVM_ENABLE_LIBPFM AND HAVE_LIBPFM)
- list(APPEND libs pfm)
-endif()
-
-add_llvm_library(LLVMExegesis
+add_library(LLVMExegesis
+ STATIC
Analysis.cpp
Assembler.cpp
BenchmarkResult.cpp
@@ -26,13 +22,10 @@ add_llvm_library(LLVMExegesis
SnippetGenerator.cpp
Target.cpp
Uops.cpp
+ )
- STATIC
-
- DEPENDS
- intrinsics_gen
-
- LINK_COMPONENTS
+llvm_update_compile_flags(LLVMExegesis)
+llvm_map_components_to_libnames(libs
Analysis
CodeGen
Core
@@ -44,6 +37,11 @@ add_llvm_library(LLVMExegesis
Object
ObjectYAML
Support
-
- LINK_LIBS ${libs}
)
+
+if(LLVM_ENABLE_LIBPFM AND HAVE_LIBPFM)
+ list(APPEND libs pfm)
+endif()
+
+target_link_libraries(LLVMExegesis ${libs})
+set_target_properties(LLVMExegesis PROPERTIES FOLDER "Libraries")
Modified: llvm/trunk/tools/llvm-exegesis/lib/X86/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/X86/CMakeLists.txt?rev=342336&r1=342335&r2=342336&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/X86/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/X86/CMakeLists.txt Sat Sep 15 12:04:27 2018
@@ -3,15 +3,16 @@ include_directories(
${LLVM_BINARY_DIR}/lib/Target/X86
)
-add_llvm_library(LLVMExegesisX86
- Target.cpp
-
+add_library(LLVMExegesisX86
STATIC
+ Target.cpp
+ )
- DEPENDS
- intrinsics_gen
-
- LINK_COMPONENTS
+llvm_update_compile_flags(LLVMExegesisX86)
+llvm_map_components_to_libnames(libs
X86
Exegesis
)
+
+target_link_libraries(LLVMExegesisX86 ${libs})
+set_target_properties(LLVMExegesisX86 PROPERTIES FOLDER "Libraries")
Modified: llvm/trunk/tools/llvm-mca/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/lib/CMakeLists.txt?rev=342336&r1=342335&r2=342336&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mca/lib/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-mca/lib/CMakeLists.txt Sat Sep 15 12:04:27 2018
@@ -1,6 +1,7 @@
include_directories(${LLVM_MCA_SOURCE_DIR}/include)
-add_llvm_library(LLVMMCA
+add_library(LLVMMCA
+ STATIC
Context.cpp
HWEventListener.cpp
HardwareUnits/HardwareUnit.cpp
@@ -19,11 +20,14 @@ add_llvm_library(LLVMMCA
Stages/RetireStage.cpp
Stages/Stage.cpp
Support.cpp
+ )
- STATIC
-
- LINK_COMPONENTS
+llvm_update_compile_flags(LLVMMCA)
+llvm_map_components_to_libnames(libs
CodeGen
MC
Support
)
+
+target_link_libraries(LLVMMCA ${libs})
+set_target_properties(LLVMMCA PROPERTIES FOLDER "Libraries")
Modified: llvm/trunk/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt?rev=342336&r1=342335&r2=342336&view=diff
==============================================================================
--- llvm/trunk/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt (original)
+++ llvm/trunk/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt Sat Sep 15 12:04:27 2018
@@ -11,7 +11,6 @@ set(LLVM_LINK_COMPONENTS
Support
Symbolize
ARM
- Core
)
add_llvm_unittest(LLVMExegesisARMTests
Modified: llvm/trunk/unittests/tools/llvm-exegesis/X86/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/tools/llvm-exegesis/X86/CMakeLists.txt?rev=342336&r1=342335&r2=342336&view=diff
==============================================================================
--- llvm/trunk/unittests/tools/llvm-exegesis/X86/CMakeLists.txt (original)
+++ llvm/trunk/unittests/tools/llvm-exegesis/X86/CMakeLists.txt Sat Sep 15 12:04:27 2018
@@ -5,7 +5,6 @@ include_directories(
)
set(LLVM_LINK_COMPONENTS
- Core
MC
MCParser
Object
More information about the llvm-commits
mailing list