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 | 5b0d0a649542308a8d3af58540e0c2e982d3fd57 (patch) | |
| tree | d0927964549760317aee7a9adaf56df59fe57f1c /runtime | |
| parent | 3d23e02ac6aa31efbaed83db5f16efe423d1a65f (diff) | |
Re-apply r267784, r267824 and r267830.
I have updated the compiler-rt tests.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@267903 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | runtime/vtables_blacklist.txt | 8 |
2 files changed, 0 insertions, 21 deletions
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 6d10e71d72..e72847cb53 100644 --- a/runtime/CMakeLists.txt +++ b/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/runtime/vtables_blacklist.txt b/runtime/vtables_blacklist.txt deleted file mode 100644 index f2016428d8..0000000000 --- a/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 |