[llvm-commits] [compiler-rt] r163138 - in /compiler-rt/trunk: CMakeLists.txt utils/CMakeLists.txt utils/llvm-symbolizer/CMakeLists.txt utils/llvm-symbolizer/llvm-symbolizer.cpp

[Alexey Samsonov]

Author: samsonov
Date: Tue Sep  4 09:52:21 2012
New Revision: 163138

URL: http://llvm.org/viewvc/llvm-project?rev=163138&view=rev
Log:
[compiler-rt] Recurse into 'utils' directory in CMake build of compiler-rt, enable build of llvm-symbolizer binary (currently for one target only)

Added:
    compiler-rt/trunk/utils/CMakeLists.txt
    compiler-rt/trunk/utils/llvm-symbolizer/CMakeLists.txt
Modified:
    compiler-rt/trunk/CMakeLists.txt
    compiler-rt/trunk/utils/llvm-symbolizer/llvm-symbolizer.cpp

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=163138&r1=163137&r2=163138&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Tue Sep  4 09:52:21 2012
@@ -103,6 +103,9 @@
 # Add the public header's directory to the includes for all of compiler-rt.
 include_directories(include)
 
+# Build utils before building compiler-rt library.
+add_subdirectory(utils)
+
 add_subdirectory(lib)
 
 if(LLVM_INCLUDE_TESTS)

Added: compiler-rt/trunk/utils/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/utils/CMakeLists.txt?rev=163138&view=auto
==============================================================================
--- compiler-rt/trunk/utils/CMakeLists.txt (added)
+++ compiler-rt/trunk/utils/CMakeLists.txt Tue Sep  4 09:52:21 2012
@@ -0,0 +1 @@
+add_subdirectory(llvm-symbolizer)

Added: compiler-rt/trunk/utils/llvm-symbolizer/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/utils/llvm-symbolizer/CMakeLists.txt?rev=163138&view=auto
==============================================================================
--- compiler-rt/trunk/utils/llvm-symbolizer/CMakeLists.txt (added)
+++ compiler-rt/trunk/utils/llvm-symbolizer/CMakeLists.txt Tue Sep  4 09:52:21 2012
@@ -0,0 +1,17 @@
+# FIXME: As we plan to execute llvm-symbolizer binary from Sanitizer
+# runtime, it has to be compiled for all supported targets (x86_64, i386 etc).
+# This means that we need LLVM libraries to be compiled for these
+# targets as well. Currently, there is no support for such a build strategy.
+
+set(LLVM_LINK_COMPONENTS
+  DebugInfo
+  Object
+  )
+
+add_llvm_tool(llvm-symbolizer
+  llvm-symbolizer.cpp
+  )
+
+# FIXME: Set sane output directory for llvm-symbolizer
+set_target_properties(llvm-symbolizer PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

Modified: compiler-rt/trunk/utils/llvm-symbolizer/llvm-symbolizer.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/utils/llvm-symbolizer/llvm-symbolizer.cpp?rev=163138&r1=163137&r2=163138&view=diff
==============================================================================
--- compiler-rt/trunk/utils/llvm-symbolizer/llvm-symbolizer.cpp (original)
+++ compiler-rt/trunk/utils/llvm-symbolizer/llvm-symbolizer.cpp Tue Sep  4 09:52:21 2012
@@ -47,7 +47,7 @@
                         "information for a given address"));
 
 static cl::opt<bool>
-PrintInlining("inlining", cl::init(false),
+PrintInlining("inlining", cl::init(true),
               cl::desc("Print all inlined frames for a given address"));
 
 static StringRef ToolInvocationPath;