From d8c478c1147996984ade8e9b6d7c7f6d02d13afc Mon Sep 17 00:00:00 2001
From: Mark Doffman <mark.doffman@codethink.co.uk>
Date: Fri, 21 Nov 2014 16:15:34 +0000
Subject: Fix API Error in llvm update, compile with no RTTI.

---
 CMakeLists.txt                | 1 +
 lib/CodeGen/CodeGenAction.cpp | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e81f2aaa9..da37c83b5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,6 +216,7 @@ macro(add_flang_library name)
     set(libkind)
   endif()
   add_library( ${name} ${libkind} ${srcs} )
+  llvm_update_compile_flags(${name} ${srcs})
   if( LLVM_COMMON_DEPENDS )
     add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} )
   endif( LLVM_COMMON_DEPENDS )
diff --git a/lib/CodeGen/CodeGenAction.cpp b/lib/CodeGen/CodeGenAction.cpp
index 53ee5aafd3..4398b6c7e4 100644
--- a/lib/CodeGen/CodeGenAction.cpp
+++ b/lib/CodeGen/CodeGenAction.cpp
@@ -120,8 +120,7 @@ namespace flang {
       // Link LinkModule into this module if present, preserving its validity.
       if (LinkModule) {
         std::string ErrorMsg;
-        if (Linker::LinkModules(M, LinkModule.get(), Linker::PreserveSource,
-                                &ErrorMsg)) {
+        if (Linker::LinkModules(M, LinkModule.get())) {
           Diags.Report(diag::err_fe_cannot_link_module)
             << LinkModule->getModuleIdentifier() << ErrorMsg;
           return;
-- 
cgit v1.2.1