X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FLinkAllVMCore.h;h=6959cb6d1efc1be432890a467ea3eb18eb8b970a;hb=9a376a8003c486054ea4d7c2465cb90b501c9893;hp=5cf7ad6a96007a475952f2333e866fe5370bd8d5;hpb=7ed47a13356daed2a34cd2209a31f92552e3bdd8;p=oota-llvm.git

diff --git a/include/llvm/LinkAllVMCore.h b/include/llvm/LinkAllVMCore.h
index 5cf7ad6a960..6959cb6d1ef 100644
--- a/include/llvm/LinkAllVMCore.h
+++ b/include/llvm/LinkAllVMCore.h
@@ -16,8 +16,7 @@
 #ifndef LLVM_LINKALLVMCORE_H
 #define LLVM_LINKALLVMCORE_H
 
-#include "llvm/System/IncludeFile.h"
-
+#include "llvm/LLVMContext.h"
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
 #include "llvm/IntrinsicInst.h"
@@ -25,7 +24,6 @@
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/System/Alarm.h"
 #include "llvm/System/DynamicLibrary.h"
-#include "llvm/System/MappedFile.h"
 #include "llvm/System/Memory.h"
 #include "llvm/System/Mutex.h"
 #include "llvm/System/Path.h"
@@ -34,9 +32,8 @@
 #include "llvm/System/Signals.h"
 #include "llvm/System/TimeValue.h"
 #include "llvm/Support/Dwarf.h"
-#include "llvm/Support/Mangler.h"
 #include "llvm/Support/MathExtras.h"
-#include "llvm/Support/SlowOperationInformer.h"
+#include <cstdlib>
 
 namespace {
   struct ForceVMCoreLinking {
@@ -47,8 +44,8 @@ namespace {
       // to know that getenv() never returns -1, this will do the job.
       if (std::getenv("bar") != (char*) -1)
         return;
-      (void)new llvm::Module("");
-      (void)new llvm::UnreachableInst();
+      (void)new llvm::Module("", llvm::getGlobalContext());
+      (void)new llvm::UnreachableInst(llvm::getGlobalContext());
       (void)    llvm::createVerifierPass(); 
     }
   } ForceVMCoreLinking;