diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2011-04-29 02:12:06 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2011-04-29 02:12:06 +0000 |
| commit | bcffb1fbb85a88cb99f7c2115a5f78e860d7fc46 (patch) | |
| tree | a7e400febef581e1c8ce058f0cc40e33c6a39993 /runtime | |
| parent | 6344a5f1464dade7735ac440d7a3d24bf009f298 (diff) | |
| download | llvm-bcffb1fbb85a88cb99f7c2115a5f78e860d7fc46.tar.gz llvm-bcffb1fbb85a88cb99f7c2115a5f78e860d7fc46.tar.bz2 llvm-bcffb1fbb85a88cb99f7c2115a5f78e860d7fc46.tar.xz | |
Rename profile_rt.so to libprofile_rt.so under configure+make (it already was
under cmake).
Add libprofile_rt.a so that we can tell clang to link against it in --coverage
mode. Also turn it on by default in cmake builds.
Oscar, this touches a change you made for EXCLUDE_FROM_ALL support -- I think
I've done the right thing, but please let me know (or fix and commit) if not!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@130470 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/libprofile/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | runtime/libprofile/Makefile | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/runtime/libprofile/CMakeLists.txt b/runtime/libprofile/CMakeLists.txt index 92182d7f8f..414ad00b4a 100644 --- a/runtime/libprofile/CMakeLists.txt +++ b/runtime/libprofile/CMakeLists.txt @@ -1,4 +1,4 @@ -add_llvm_loadable_module( profile_rt +set(SOURCES BasicBlockTracing.c CommonProfiling.c GCDAProfiling.c @@ -7,3 +7,13 @@ add_llvm_loadable_module( profile_rt OptimalEdgeProfiling.c Profiling.h ) + +add_llvm_library( profile_rt-static ${SOURCES} ) +set_target_properties( profile_rt-static + PROPERTIES + OUTPUT_NAME "profile_rt" ) + +add_llvm_loadable_module( profile_rt-shared ${SOURCES} ) +set_target_properties( profile_rt-shared + PROPERTIES + OUTPUT_NAME "profile_rt" ) diff --git a/runtime/libprofile/Makefile b/runtime/libprofile/Makefile index 4125af60d2..eced5e5f8a 100644 --- a/runtime/libprofile/Makefile +++ b/runtime/libprofile/Makefile @@ -13,9 +13,9 @@ include $(LEVEL)/Makefile.config ifneq ($(strip $(LLVMCC)),) BYTECODE_LIBRARY = 1 endif -SHARED_LIBRARY = 1 -LOADABLE_MODULE = 1 LIBRARYNAME = profile_rt +LINK_LIBS_IN_SHARED = 1 +SHARED_LIBRARY = 1 EXTRA_DIST = libprofile.exports EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/libprofile.exports |