Revert r165652: "Remove unnecessary RTTI from the build."

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

llvm-svn: 165654

diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
index 3b31785..83baf60 100644 (file)
--- a/llvm/lib/Support/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Support/Makefile b/llvm/lib/Support/Makefile
index 4a2185d..d68e500 100644 (file)
--- a/llvm/lib/Support/Makefile
+++ b/llvm/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/llvm/lib/VMCore/CMakeLists.txt b/llvm/lib/VMCore/CMakeLists.txt
index c2a4ee3..6c30967 100644 (file)
--- a/llvm/lib/VMCore/CMakeLists.txt
+++ b/llvm/lib/VMCore/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(LLVM_REQUIRES_RTTI 1)
+
 add_llvm_library(LLVMCore
   AsmWriter.cpp
   Attributes.cpp

diff --git a/llvm/lib/VMCore/Makefile b/llvm/lib/VMCore/Makefile
index 8b98651..2b9b0f2 100644 (file)
--- a/llvm/lib/VMCore/Makefile
+++ b/llvm/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