From d2139c4e7aaeb03358638b14a589c0dc25521435 Mon Sep 17 00:00:00 2001
From: Sean Silva <silvas@purdue.edu>
Date: Wed, 10 Oct 2012 20:50:36 +0000
Subject: [PATCH] Revert r165652: "Remove unnecessary RTTI from the build."

... Apparently the RTTI is still necessary for some reason.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165654 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Support/CMakeLists.txt | 2 ++
 lib/Support/Makefile       | 3 +++
 lib/VMCore/CMakeLists.txt  | 2 ++
 lib/VMCore/Makefile        | 1 +
 4 files changed, 8 insertions(+)

diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt
index 3b31785e09a..83baf60d040 100644
--- a/lib/Support/CMakeLists.txt
+++ b/lib/Support/CMakeLists.txt
@@ -1,3 +1,5 @@
+## FIXME: This only requires RTTI because tblgen uses it.  Fix that.
+set(LLVM_REQUIRES_RTTI 1)
 if( MINGW )
   set(LLVM_REQUIRES_EH 1)
 endif()
diff --git a/lib/Support/Makefile b/lib/Support/Makefile
index 4a2185d589e..d68e500ca5f 100644
--- a/lib/Support/Makefile
+++ b/lib/Support/Makefile
@@ -11,6 +11,9 @@ LEVEL = ../..
 LIBRARYNAME = LLVMSupport
 BUILD_ARCHIVE = 1
 
+## FIXME: This only requires RTTI because tblgen uses it.  Fix that.
+REQUIRES_RTTI = 1
+
 EXTRA_DIST = Unix Win32 README.txt
 
 include $(LEVEL)/Makefile.common
diff --git a/lib/VMCore/CMakeLists.txt b/lib/VMCore/CMakeLists.txt
index c2a4ee3aae1..6c309679740 100644
--- a/lib/VMCore/CMakeLists.txt
+++ b/lib/VMCore/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(LLVM_REQUIRES_RTTI 1)
+
 add_llvm_library(LLVMCore
   AsmWriter.cpp
   Attributes.cpp
diff --git a/lib/VMCore/Makefile b/lib/VMCore/Makefile
index 8b9865152e2..2b9b0f258cf 100644
--- a/lib/VMCore/Makefile
+++ b/lib/VMCore/Makefile
@@ -9,6 +9,7 @@
 LEVEL = ../..
 LIBRARYNAME = LLVMCore
 BUILD_ARCHIVE = 1
+REQUIRES_RTTI = 1
 
 BUILT_SOURCES = $(PROJ_OBJ_ROOT)/include/llvm/Intrinsics.gen