diff options
author | Peter Collingbourne <peter@pcc.me.uk> | 2016-04-28 17:09:37 +0000 |
---|---|---|
committer | Peter Collingbourne <peter@pcc.me.uk> | 2016-04-28 17:09:37 +0000 |
commit | 3afb26688656fbdc37d43fc938d89fe936bb579c (patch) | |
tree | e5b515efb2ff87896a2df297607e79d39dea08e6 /clang/runtime | |
parent | f730de619f90706e4bb9dccbc109559ba7585207 (diff) | |
download | llvm-3afb26688656fbdc37d43fc938d89fe936bb579c.zip llvm-3afb26688656fbdc37d43fc938d89fe936bb579c.tar.gz llvm-3afb26688656fbdc37d43fc938d89fe936bb579c.tar.bz2 |
Re-apply r267784, r267824 and r267830.
I have updated the compiler-rt tests.
llvm-svn: 267903
Diffstat (limited to 'clang/runtime')
-rw-r--r-- | clang/runtime/CMakeLists.txt | 13 | ||||
-rw-r--r-- | clang/runtime/vtables_blacklist.txt | 8 |
2 files changed, 0 insertions, 21 deletions
diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt index 6d10e71..e72847c 100644 --- a/clang/runtime/CMakeLists.txt +++ b/clang/runtime/CMakeLists.txt @@ -148,16 +148,3 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) VERBATIM) endif() endif() - -set(src "${CMAKE_CURRENT_SOURCE_DIR}/vtables_blacklist.txt") -set(dst "${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/vtables_blacklist.txt") -add_custom_command(OUTPUT ${dst} - DEPENDS ${src} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst} - COMMENT "Copying vtables blacklist") -add_custom_target(vtables_blacklist DEPENDS ${dst}) -set_target_properties(vtables_blacklist PROPERTIES FOLDER "Misc") -if(TARGET clang) - add_dependencies(clang vtables_blacklist) -endif() -install(FILES ${src} DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}) diff --git a/clang/runtime/vtables_blacklist.txt b/clang/runtime/vtables_blacklist.txt deleted file mode 100644 index f201642..0000000 --- a/clang/runtime/vtables_blacklist.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Standard library types. -type:std::* - -# The stdext namespace contains Microsoft standard library extensions. -type:stdext::* - -# Types with a uuid attribute, i.e. COM types. -type:attr:uuid |