<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">I suggest to revert "r342150 - [cmake] Fix a unittest when `LLVM_LINK_LLVM_DYLIB` is requested.” as well. It causes "LLVM-Unit :: Passes/./PluginsTests/PluginsTests.LoadPlugin” to fail with<div class=""><br class=""></div><div class=""><blockquote type="cite" class="">Assertion failed: (count_if(RegisteredOptionCategories, [cat](const OptionCategory *Category) { return cat->getName() == Category->getName(); }) == 0 && "Duplicate option categories"), function registerCategory, file llvm-project/llvm/lib/Support/CommandLine.cpp, line 282.</blockquote><div class=""><br class=""></div>Thanks,</div><div class="">Volodymyr<br class=""><div><br class=""><blockquote type="cite" class=""><div class="">On Sep 13, 2018, at 09:39, Sanjay Patel via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class=""><div class="">I think this should be reverted because it's breaking all the bots with errors like this:</div><div class=""><pre class=""><span class="gmail-stderr">/Users/buildslave/as-bldslv9/lld-x86_64-darwin13/llvm.src/include/llvm/IR/Attributes.h:74:14: fatal error: 'llvm/IR/Attributes.inc' file not found
#include "llvm/IR/Attributes.inc"
</span></pre><br class=""></div></div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Thu, Sep 13, 2018 at 10:33 AM, Roman Lebedev via llvm-commits <span dir="ltr" class=""><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank" class="">llvm-commits@lists.llvm.org</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">It is a good idea to actually supply a commit message.<br class="">
Why is this change needed? There is no reasoning/explanation at all.<br class="">
<div class="HOEnZb"><div class="h5"><br class="">
On Thu, Sep 13, 2018 at 7:15 PM, Richard Diamond via llvm-commits<br class="">
<<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:<br class="">
> Author: diamond<br class="">
> Date: Thu Sep 13 09:15:03 2018<br class="">
> New Revision: 342148<br class="">
><br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=342148&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-<wbr class="">project?rev=342148&view=rev</a><br class="">
> Log:<br class="">
> Renovate CMake files in the `llvm-(cfi-verify|exegesis|<wbr class="">mca)` tools.<br class="">
><br class="">
> Modified:<br class="">
> llvm/trunk/tools/llvm-cfi-<wbr class="">verify/lib/CMakeLists.txt<br class="">
> llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/AArch64/<wbr class="">CMakeLists.txt<br class="">
> llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/CMakeLists.txt<br class="">
> llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/X86/CMakeLists.<wbr class="">txt<br class="">
> llvm/trunk/tools/llvm-mca/lib/<wbr class="">CMakeLists.txt<br class="">
><br class="">
> Modified: llvm/trunk/tools/llvm-cfi-<wbr class="">verify/lib/CMakeLists.txt<br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-<wbr class="">project/llvm/trunk/tools/llvm-<wbr class="">cfi-verify/lib/CMakeLists.txt?<wbr class="">rev=342148&r1=342147&r2=<wbr class="">342148&view=diff</a><br class="">
> ==============================<wbr class="">==============================<wbr class="">==================<br class="">
> --- llvm/trunk/tools/llvm-cfi-<wbr class="">verify/lib/CMakeLists.txt (original)<br class="">
> +++ llvm/trunk/tools/llvm-cfi-<wbr class="">verify/lib/CMakeLists.txt Thu Sep 13 09:15:03 2018<br class="">
> @@ -1,13 +1,12 @@<br class="">
> -add_library(LLVMCFIVerify<br class="">
> - STATIC<br class="">
> +add_llvm_library(<wbr class="">LLVMCFIVerify<br class="">
> FileAnalysis.cpp<br class="">
> FileAnalysis.h<br class="">
> GraphBuilder.cpp<br class="">
> GraphBuilder.h<br class="">
> - )<br class="">
><br class="">
> -llvm_update_compile_flags(<wbr class="">LLVMCFIVerify)<br class="">
> -llvm_map_components_to_<wbr class="">libnames(libs<br class="">
> + STATIC<br class="">
> +<br class="">
> + LINK_COMPONENTS<br class="">
> DebugInfoDWARF<br class="">
> MC<br class="">
> MCParser<br class="">
> @@ -15,5 +14,3 @@ llvm_map_components_to_<wbr class="">libnames(libs<br class="">
> Support<br class="">
> Symbolize<br class="">
> )<br class="">
> -target_link_libraries(<wbr class="">LLVMCFIVerify ${libs})<br class="">
> -set_target_properties(<wbr class="">LLVMCFIVerify PROPERTIES FOLDER "Libraries")<br class="">
><br class="">
> Modified: llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/AArch64/<wbr class="">CMakeLists.txt<br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-<wbr class="">project/llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/AArch64/<wbr class="">CMakeLists.txt?rev=342148&r1=<wbr class="">342147&r2=342148&view=diff</a><br class="">
> ==============================<wbr class="">==============================<wbr class="">==================<br class="">
> --- llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/AArch64/<wbr class="">CMakeLists.txt (original)<br class="">
> +++ llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/AArch64/<wbr class="">CMakeLists.txt Thu Sep 13 09:15:03 2018<br class="">
> @@ -3,16 +3,12 @@ include_directories(<br class="">
> ${LLVM_BINARY_DIR}/lib/Target/<wbr class="">AArch64<br class="">
> )<br class="">
><br class="">
> -add_library(<wbr class="">LLVMExegesisAArch64<br class="">
> - STATIC<br class="">
> +add_llvm_library(<wbr class="">LLVMExegesisAArch64<br class="">
> Target.cpp<br class="">
> - )<br class="">
><br class="">
> -llvm_update_compile_flags(<wbr class="">LLVMExegesisAArch64)<br class="">
> -llvm_map_components_to_<wbr class="">libnames(libs<br class="">
> + STATIC<br class="">
> +<br class="">
> + LINK_COMPONENTS<br class="">
> AArch64<br class="">
> Exegesis<br class="">
> )<br class="">
> -<br class="">
> -target_link_libraries(<wbr class="">LLVMExegesisAArch64 ${libs})<br class="">
> -set_target_properties(<wbr class="">LLVMExegesisAArch64 PROPERTIES FOLDER "Libraries")<br class="">
><br class="">
> Modified: llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/CMakeLists.txt<br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-<wbr class="">project/llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/CMakeLists.txt?<wbr class="">rev=342148&r1=342147&r2=<wbr class="">342148&view=diff</a><br class="">
> ==============================<wbr class="">==============================<wbr class="">==================<br class="">
> --- llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/CMakeLists.txt (original)<br class="">
> +++ llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/CMakeLists.txt Thu Sep 13 09:15:03 2018<br class="">
> @@ -7,8 +7,12 @@ if (LLVM_TARGETS_TO_BUILD MATCHES "AArch<br class="">
> set(LLVM_EXEGESIS_TARGETS "${LLVM_EXEGESIS_TARGETS} AArch64" PARENT_SCOPE)<br class="">
> endif()<br class="">
><br class="">
> -add_library(LLVMExegesis<br class="">
> - STATIC<br class="">
> +set(libs)<br class="">
> +if(LLVM_ENABLE_LIBPFM AND HAVE_LIBPFM)<br class="">
> + list(APPEND libs pfm)<br class="">
> +endif()<br class="">
> +<br class="">
> +add_llvm_library(LLVMExegesis<br class="">
> Analysis.cpp<br class="">
> Assembler.cpp<br class="">
> BenchmarkResult.cpp<br class="">
> @@ -22,10 +26,10 @@ add_library(LLVMExegesis<br class="">
> SnippetGenerator.cpp<br class="">
> Target.cpp<br class="">
> Uops.cpp<br class="">
> - )<br class="">
><br class="">
> -llvm_update_compile_flags(<wbr class="">LLVMExegesis)<br class="">
> -llvm_map_components_to_<wbr class="">libnames(libs<br class="">
> + STATIC<br class="">
> +<br class="">
> + LINK_COMPONENTS<br class="">
> Analysis<br class="">
> CodeGen<br class="">
> Core<br class="">
> @@ -37,11 +41,6 @@ llvm_map_components_to_<wbr class="">libnames(libs<br class="">
> Object<br class="">
> ObjectYAML<br class="">
> Support<br class="">
> - )<br class="">
><br class="">
> -if(LLVM_ENABLE_LIBPFM AND HAVE_LIBPFM)<br class="">
> - list(APPEND libs pfm)<br class="">
> -endif()<br class="">
> -<br class="">
> -target_link_libraries(<wbr class="">LLVMExegesis ${libs})<br class="">
> -set_target_properties(<wbr class="">LLVMExegesis PROPERTIES FOLDER "Libraries")<br class="">
> + LINK_LIBS ${libs}<br class="">
> + )<br class="">
><br class="">
> Modified: llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/X86/CMakeLists.<wbr class="">txt<br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/X86/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-<wbr class="">project/llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/X86/CMakeLists.<wbr class="">txt?rev=342148&r1=342147&r2=<wbr class="">342148&view=diff</a><br class="">
> ==============================<wbr class="">==============================<wbr class="">==================<br class="">
> --- llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/X86/CMakeLists.<wbr class="">txt (original)<br class="">
> +++ llvm/trunk/tools/llvm-<wbr class="">exegesis/lib/X86/CMakeLists.<wbr class="">txt Thu Sep 13 09:15:03 2018<br class="">
> @@ -3,16 +3,12 @@ include_directories(<br class="">
> ${LLVM_BINARY_DIR}/lib/Target/<wbr class="">X86<br class="">
> )<br class="">
><br class="">
> -add_library(LLVMExegesisX86<br class="">
> - STATIC<br class="">
> +add_llvm_library(<wbr class="">LLVMExegesisX86<br class="">
> Target.cpp<br class="">
> - )<br class="">
><br class="">
> -llvm_update_compile_flags(<wbr class="">LLVMExegesisX86)<br class="">
> -llvm_map_components_to_<wbr class="">libnames(libs<br class="">
> + STATIC<br class="">
> +<br class="">
> + LINK_COMPONENTS<br class="">
> X86<br class="">
> Exegesis<br class="">
> )<br class="">
> -<br class="">
> -target_link_libraries(<wbr class="">LLVMExegesisX86 ${libs})<br class="">
> -set_target_properties(<wbr class="">LLVMExegesisX86 PROPERTIES FOLDER "Libraries")<br class="">
><br class="">
> Modified: llvm/trunk/tools/llvm-mca/lib/<wbr class="">CMakeLists.txt<br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/lib/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-<wbr class="">project/llvm/trunk/tools/llvm-<wbr class="">mca/lib/CMakeLists.txt?rev=<wbr class="">342148&r1=342147&r2=342148&<wbr class="">view=diff</a><br class="">
> ==============================<wbr class="">==============================<wbr class="">==================<br class="">
> --- llvm/trunk/tools/llvm-mca/lib/<wbr class="">CMakeLists.txt (original)<br class="">
> +++ llvm/trunk/tools/llvm-mca/lib/<wbr class="">CMakeLists.txt Thu Sep 13 09:15:03 2018<br class="">
> @@ -1,7 +1,6 @@<br class="">
> include_directories(${LLVM_<wbr class="">MCA_SOURCE_DIR}/include)<br class="">
><br class="">
> -add_library(LLVMMCA<br class="">
> - STATIC<br class="">
> +add_llvm_library(LLVMMCA<br class="">
> Context.cpp<br class="">
> HWEventListener.cpp<br class="">
> HardwareUnits/HardwareUnit.cpp<br class="">
> @@ -20,14 +19,11 @@ add_library(LLVMMCA<br class="">
> Stages/RetireStage.cpp<br class="">
> Stages/Stage.cpp<br class="">
> Support.cpp<br class="">
> - )<br class="">
><br class="">
> -llvm_update_compile_flags(<wbr class="">LLVMMCA)<br class="">
> -llvm_map_components_to_<wbr class="">libnames(libs<br class="">
> + STATIC<br class="">
> +<br class="">
> + LINK_COMPONENTS<br class="">
> CodeGen<br class="">
> MC<br class="">
> Support<br class="">
> )<br class="">
> -<br class="">
> -target_link_libraries(LLVMMCA ${libs})<br class="">
> -set_target_properties(LLVMMCA PROPERTIES FOLDER "Libraries")<br class="">
><br class="">
><br class="">
> ______________________________<wbr class="">_________________<br class="">
> llvm-commits mailing list<br class="">
> <a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a><br class="">
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/<wbr class="">mailman/listinfo/llvm-commits</a><br class="">
______________________________<wbr class="">_________________<br class="">
llvm-commits mailing list<br class="">
<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/<wbr class="">mailman/listinfo/llvm-commits</a><br class="">
</div></div></blockquote></div><br class=""></div>
_______________________________________________<br class="">llvm-commits mailing list<br class=""><a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a><br class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits<br class=""></div></blockquote></div><br class=""></div></body></html>