diff options
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | tools/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tools/Makefile | 2 | ||||
-rw-r--r-- | tools/yaml2obj/CMakeLists.txt (renamed from utils/yaml2obj/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tools/yaml2obj/Makefile (renamed from utils/yaml2obj/Makefile) | 2 | ||||
-rw-r--r-- | tools/yaml2obj/yaml2obj.cpp (renamed from utils/yaml2obj/yaml2obj.cpp) | 0 | ||||
-rw-r--r-- | utils/Makefile | 2 |
7 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6871e654fb..1d216924b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -419,7 +419,6 @@ add_subdirectory(utils/count) add_subdirectory(utils/not) add_subdirectory(utils/llvm-lit) add_subdirectory(utils/yaml-bench) -add_subdirectory(utils/yaml2obj) add_subdirectory(projects) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 9b80ee5a23..6b7c884516 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -44,6 +44,7 @@ add_subdirectory(llvm-mcmarkup) add_subdirectory(llvm-symbolizer) add_subdirectory(obj2yaml) +add_subdirectory(yaml2obj) if( NOT WIN32 ) add_subdirectory(lto) diff --git a/tools/Makefile b/tools/Makefile index b8f21d2ce1..eaf9ed3577 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -35,7 +35,7 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \ llvm-diff macho-dump llvm-objdump llvm-readobj \ llvm-rtdyld llvm-dwarfdump llvm-cov \ llvm-size llvm-stress llvm-mcmarkup \ - llvm-symbolizer obj2yaml + llvm-symbolizer obj2yaml yaml2obj # If Intel JIT Events support is configured, build an extra tool to test it. ifeq ($(USE_INTEL_JITEVENTS), 1) diff --git a/utils/yaml2obj/CMakeLists.txt b/tools/yaml2obj/CMakeLists.txt index f8b1197524..f8b1197524 100644 --- a/utils/yaml2obj/CMakeLists.txt +++ b/tools/yaml2obj/CMakeLists.txt diff --git a/utils/yaml2obj/Makefile b/tools/yaml2obj/Makefile index e746d85190..cb6f47724b 100644 --- a/utils/yaml2obj/Makefile +++ b/tools/yaml2obj/Makefile @@ -9,7 +9,7 @@ LEVEL = ../.. TOOLNAME = yaml2obj -USEDLIBS = LLVMSupport.a +LINK_COMPONENTS := support # This tool has no plugins, optimize startup time. TOOL_NO_EXPORTS = 1 diff --git a/utils/yaml2obj/yaml2obj.cpp b/tools/yaml2obj/yaml2obj.cpp index 191c49fb59..191c49fb59 100644 --- a/utils/yaml2obj/yaml2obj.cpp +++ b/tools/yaml2obj/yaml2obj.cpp diff --git a/utils/Makefile b/utils/Makefile index 7a3c17d032..ecb30bed7c 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -9,7 +9,7 @@ LEVEL = .. PARALLEL_DIRS := FileCheck FileUpdate TableGen PerfectShuffle \ - count fpcmp llvm-lit not unittest yaml2obj + count fpcmp llvm-lit not unittest EXTRA_DIST := check-each-file codegen-diff countloc.sh \ DSAclean.py DSAextract.py emacs findsym.pl GenLibDeps.pl \ |