From 8b107ad67a36fe65c5952b5e23f39054d7de24db Mon Sep 17 00:00:00 2001
From: Vsevolod Livinskiy <vsevolod.livinskij@frtk.ru>
Date: Wed, 9 Jul 2014 23:19:27 +0400
Subject: [PATCH] Fix for trunk 212388+

---
 module.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/module.cpp b/module.cpp
index b532c4ac..b5fd860c 100644
--- a/module.cpp
+++ b/module.cpp
@@ -2004,19 +2004,33 @@ Module::execPreprocessor(const char *infilename, llvm::raw_string_ostream *ostre
 #endif
     inst.setDiagnostics(diagEngine);
 
+#if defined(LLVM_3_1) || defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4)
     clang::TargetOptions &options = inst.getTargetOpts();
+#else // LLVM 3.5+
+    const std::shared_ptr< clang::TargetOptions > &options = 
+          std::make_shared< clang::TargetOptions >(inst.getTargetOpts());
+#endif
+
     llvm::Triple triple(module->getTargetTriple());
     if (triple.getTriple().empty()) {
         triple.setTriple(llvm::sys::getDefaultTargetTriple());
     }
+
+#if defined(LLVM_3_1) || defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4)
     options.Triple = triple.getTriple();
+#else // LLVM 3.5+
+   options->Triple = triple.getTriple();
+#endif
 
 #if defined(LLVM_3_1) || defined(LLVM_3_2)
     clang::TargetInfo *target =
         clang::TargetInfo::CreateTargetInfo(inst.getDiagnostics(), options);
-#else // LLVM 3.3+
+#elif defined(LLVM_3_3) || defined(LLVM_3_4)
     clang::TargetInfo *target =
         clang::TargetInfo::CreateTargetInfo(inst.getDiagnostics(), &options);
+#else // LLVM 3.5+
+    clang::TargetInfo *target =
+        clang::TargetInfo::CreateTargetInfo(inst.getDiagnostics(), options);
 #endif
 
     inst.setTarget(target);