diff --git a/examples/PrintFunctionNames/CMakeLists.txt b/examples/PrintFunctionNames/CMakeLists.txt
index edfbcb5ce17cd8c97a7172f4bc190b79b9567ea2..d442ff9c6b3e41d8fb9e91d4d9bedb5f6c5bed57 100644
--- a/examples/PrintFunctionNames/CMakeLists.txt
+++ b/examples/PrintFunctionNames/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(MODULE TRUE)
 
-set(LLVM_NO_RTTI 1)
-
 set( LLVM_USED_LIBS
   clangFrontendTool
   clangFrontend
diff --git a/examples/clang-interpreter/CMakeLists.txt b/examples/clang-interpreter/CMakeLists.txt
index 21c5afdc816ae9426e1793eb134cdfae97a6d571..c8e907eeaa4e179606c7aafafd2698a5e9b35eb9 100644
--- a/examples/clang-interpreter/CMakeLists.txt
+++ b/examples/clang-interpreter/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS
     clangFrontend
     clangSerialization
diff --git a/examples/wpa/CMakeLists.txt b/examples/wpa/CMakeLists.txt
index e3aaf1d919d5c1da805fe611b9af1c2fe6997a06..c997c69453f45c984fb19e26099d26c142f82210 100644
--- a/examples/wpa/CMakeLists.txt
+++ b/examples/wpa/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS
   clangIndex
   clangFrontend
diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
index b49b89ed8861dca75bf1ce391494268a1bd600b0..e767ebcb3a9e291e77c16864a1c60b7ba70a72d8 100644
--- a/lib/AST/CMakeLists.txt
+++ b/lib/AST/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS clangBasic)
 
 add_clang_library(clangAST
diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt
index a7bd8c193fc74fca29d64564990a1b17edab07fa..0912f3c87448e50fcde0de4f07db67beac3b75ae 100644
--- a/lib/Analysis/CMakeLists.txt
+++ b/lib/Analysis/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS clangBasic clangAST clangIndex)
 
 add_clang_library(clangAnalysis
diff --git a/lib/Basic/CMakeLists.txt b/lib/Basic/CMakeLists.txt
index 12bc7d43ca750fa2e0a37941dab17f94a8f08578..0a28fbc37794324544951b443caf99345866ec0a 100644
--- a/lib/Basic/CMakeLists.txt
+++ b/lib/Basic/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 add_clang_library(clangBasic
   Builtins.cpp
   ConvertUTF.c
diff --git a/lib/CodeGen/CMakeLists.txt b/lib/CodeGen/CMakeLists.txt
index 4da6368ca158a2e226da1575783e16b41bfe8ce6..7aa6b15781acfb2c71243b6c3ce5eb03489acceb 100644
--- a/lib/CodeGen/CMakeLists.txt
+++ b/lib/CodeGen/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS clangBasic clangAST clangFrontend)
 
 add_clang_library(clangCodeGen
diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt
index 9d41b55981b586ac174b0e509afa077a1661757a..ee7ded94d4dbdf8825554d274148cc0c0e1428d9 100644
--- a/lib/Driver/CMakeLists.txt
+++ b/lib/Driver/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS clangBasic clangAST clangParse)
 
 add_clang_library(clangDriver
diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
index ceb9fcd36154530c0f8534e32caddc9cb98deb40..9a53ad6e53df290880d848873d4bdd436f6c644a 100644
--- a/lib/Frontend/CMakeLists.txt
+++ b/lib/Frontend/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set( LLVM_USED_LIBS
   clangDriver
   clangParse
diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt
index 31983df365256663dc2ed7cce6f985c553f343d4..c367695d572cc9d0f535d5b476c55b84e3462457 100644
--- a/lib/FrontendTool/CMakeLists.txt
+++ b/lib/FrontendTool/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS clangDriver clangFrontend clangRewrite clangCodeGen 
     clangStaticAnalyzerCheckers clangStaticAnalyzerCore)
 
diff --git a/lib/Index/CMakeLists.txt b/lib/Index/CMakeLists.txt
index 4dd4f469c61b6bb383be43172676309641969169..0a3f7cb14d852243b54d4c52d36390d9a2bc4fd1 100644
--- a/lib/Index/CMakeLists.txt
+++ b/lib/Index/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS clangBasic clangAST)
 
 add_clang_library(clangIndex
diff --git a/lib/Lex/CMakeLists.txt b/lib/Lex/CMakeLists.txt
index aa2c93af8ba7ee88409bd0c15cd6c48fe18a9811..417ad968402e11fd71fdd51e9e217227f8c072e7 100644
--- a/lib/Lex/CMakeLists.txt
+++ b/lib/Lex/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 # TODO: Add -maltivec when ARCH is PowerPC.
 
 set(LLVM_USED_LIBS clangBasic)
diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt
index 5b75a668a4c5b0defc2cfd0cbd3b9621a4a0cff0..6bf5e64cc6f89d91000b46ef905203ee724d1f45 100644
--- a/lib/Parse/CMakeLists.txt
+++ b/lib/Parse/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS clangBasic clangAST clangLex clangSema)
 
 add_clang_library(clangParse
diff --git a/lib/Rewrite/CMakeLists.txt b/lib/Rewrite/CMakeLists.txt
index 853a9c0b1229e98922fdc49d819dc34c6a2c5747..ee4cba21e0f9f0b2f42481b64a6e1007f8a6b60b 100644
--- a/lib/Rewrite/CMakeLists.txt
+++ b/lib/Rewrite/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS clangBasic clangAST clangParse clangFrontend)
 
 add_clang_library(clangRewrite
diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt
index af9c2f4c4536c2db6efc51c9ae2a7694f4bc5079..0d66e259d4848eb60be7998a679d29f1175a187f 100644
--- a/lib/Sema/CMakeLists.txt
+++ b/lib/Sema/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS clangBasic clangAST clangLex clangAnalysis)
 
 add_clang_library(clangSema
diff --git a/lib/Serialization/CMakeLists.txt b/lib/Serialization/CMakeLists.txt
index a3782180b324f7657a03c28e71d90f6230783ec0..f8c67989a4015c2a82c318cf18e306156d713408 100644
--- a/lib/Serialization/CMakeLists.txt
+++ b/lib/Serialization/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS clangFrontend)
 
 add_clang_library(clangSerialization
diff --git a/lib/StaticAnalyzer/Checkers/CMakeLists.txt b/lib/StaticAnalyzer/Checkers/CMakeLists.txt
index 9a6ad7fbf812c97d34a19bb160ec9d3799113b12..48e5b6334174b22043431119223088a7e50a63b7 100644
--- a/lib/StaticAnalyzer/Checkers/CMakeLists.txt
+++ b/lib/StaticAnalyzer/Checkers/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS clangBasic clangAST)
 
 add_clang_library(clangStaticAnalyzerCheckers
diff --git a/lib/StaticAnalyzer/Core/CMakeLists.txt b/lib/StaticAnalyzer/Core/CMakeLists.txt
index 5fc72fb29622294fb055ad733157741d4ebb2c03..828613003c5af6283f88e0a4d6ab67d443bf50a7 100644
--- a/lib/StaticAnalyzer/Core/CMakeLists.txt
+++ b/lib/StaticAnalyzer/Core/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite)
 
 add_clang_library(clangStaticAnalyzerCore
diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt
index 0cda6c4a31b8ac426cd0ee0c5e86bcb2023c81b2..9169fc7422a0d1806efa4223f2aadedfcc95ee9d 100644
--- a/tools/c-index-test/CMakeLists.txt
+++ b/tools/c-index-test/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS libclang)
 
 set( LLVM_LINK_COMPONENTS
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index 083b8c0d4ee283b2b0391a83cd4c7fb0282c1c1c..e38bb3768aa94a343f21914ba40e2cb26bfdf648 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(LLVM_NO_RTTI 1)
-
 set( LLVM_USED_LIBS
   clangFrontendTool
   clangFrontend
diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt
index e90162131718631494d70ba8a094601f431dd5c8..661fddd822e0c98564edfc2c7958a6b6fdc01f41 100644
--- a/tools/libclang/CMakeLists.txt
+++ b/tools/libclang/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(SHARED_LIBRARY TRUE)
 
-set(LLVM_NO_RTTI 1)
-
 set(LLVM_USED_LIBS
   clangFrontend
   clangDriver