diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-04-05 02:57:22 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-04-05 02:57:22 +0000 |
| commit | 46af06799732192ec7c8d0cc76ea151874b51129 (patch) | |
| tree | 4f79db230f6ef4538aad0c4da27ca355e5085250 | |
| parent | a3b62eb417c580894eb6cef842ff5fe512b97fdf (diff) | |
Move obj2yaml to tools to sort out make's dependencies.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@178835 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/obj2yaml/CMakeLists.txt (renamed from utils/obj2yaml/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | tools/obj2yaml/Makefile (renamed from utils/obj2yaml/Makefile) | 2 | ||||
| -rw-r--r-- | tools/obj2yaml/coff2yaml.cpp (renamed from utils/obj2yaml/coff2yaml.cpp) | 0 | ||||
| -rw-r--r-- | tools/obj2yaml/obj2yaml.cpp (renamed from utils/obj2yaml/obj2yaml.cpp) | 0 | ||||
| -rw-r--r-- | tools/obj2yaml/obj2yaml.h (renamed from utils/obj2yaml/obj2yaml.h) | 0 | ||||
| -rw-r--r-- | utils/Makefile | 2 |
9 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 95ea3115d30..6871e654fb1 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/obj2yaml) add_subdirectory(utils/yaml2obj) add_subdirectory(projects) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 5e9560491e9..9b80ee5a23a 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -43,6 +43,8 @@ add_subdirectory(llvm-mcmarkup) add_subdirectory(llvm-symbolizer) +add_subdirectory(obj2yaml) + if( NOT WIN32 ) add_subdirectory(lto) endif() diff --git a/tools/Makefile b/tools/Makefile index c405868cead..b8f21d2ce19 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 + llvm-symbolizer obj2yaml # If Intel JIT Events support is configured, build an extra tool to test it. ifeq ($(USE_INTEL_JITEVENTS), 1) diff --git a/utils/obj2yaml/CMakeLists.txt b/tools/obj2yaml/CMakeLists.txt index d64bf1bad86..d64bf1bad86 100644 --- a/utils/obj2yaml/CMakeLists.txt +++ b/tools/obj2yaml/CMakeLists.txt diff --git a/utils/obj2yaml/Makefile b/tools/obj2yaml/Makefile index 5b96bdd5b9d..95f393ddd6f 100644 --- a/utils/obj2yaml/Makefile +++ b/tools/obj2yaml/Makefile @@ -9,7 +9,7 @@ LEVEL = ../.. TOOLNAME = obj2yaml -USEDLIBS = LLVMObject.a LLVMSupport.a +LINK_COMPONENTS := object # This tool has no plugins, optimize startup time. TOOL_NO_EXPORTS = 1 diff --git a/utils/obj2yaml/coff2yaml.cpp b/tools/obj2yaml/coff2yaml.cpp index f0241d931e6..f0241d931e6 100644 --- a/utils/obj2yaml/coff2yaml.cpp +++ b/tools/obj2yaml/coff2yaml.cpp diff --git a/utils/obj2yaml/obj2yaml.cpp b/tools/obj2yaml/obj2yaml.cpp index bdc461a9471..bdc461a9471 100644 --- a/utils/obj2yaml/obj2yaml.cpp +++ b/tools/obj2yaml/obj2yaml.cpp diff --git a/utils/obj2yaml/obj2yaml.h b/tools/obj2yaml/obj2yaml.h index 0bc376a6db8..0bc376a6db8 100644 --- a/utils/obj2yaml/obj2yaml.h +++ b/tools/obj2yaml/obj2yaml.h diff --git a/utils/Makefile b/utils/Makefile index b6c66573cfc..7a3c17d0325 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 obj2yaml + count fpcmp llvm-lit not unittest yaml2obj EXTRA_DIST := check-each-file codegen-diff countloc.sh \ DSAclean.py DSAextract.py emacs findsym.pl GenLibDeps.pl \ |