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

diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt
index 3b31785e09a07ff0345b72f14b6c121cce68a3f1..83baf60d040c2d223ff9df8e36428551b2eea554 100644 (file)
--- 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 4a2185d589e51df2d2393d4517d98809d1e57308..d68e500ca5f457fe9244215bcc607cc0a6849979 100644 (file)
--- 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 c2a4ee3aae14a745960c8b18efb87bd5d34dccab..6c309679740fa0c900a757a3da173b36b1cc62af 100644 (file)
--- 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 8b9865152e2425f5ee05b5855c6e29b99e8b11fa..2b9b0f258cfacd579d9e5f4a31196f8e18571b18 100644 (file)
--- 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