diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp
index 468a042..2a4d033 100644
--- a/lib/CodeGen/BackendUtil.cpp
+++ b/lib/CodeGen/BackendUtil.cpp
@@ -417,11 +417,11 @@ bool EmitAssemblyHelper::AddEmitPasses(BackendAction Action,
 
   // Normal mode, emit a .s or .o file by running the code generator. Note,
   // this also adds codegenerator level optimization passes.
-  TargetMachine::CodeGenFileType CGFT = TargetMachine::CGFT_AssemblyFile;
+  CodeGenFileType CGFT = CGFT_AssemblyFile;
   if (Action == Backend_EmitObj)
-    CGFT = TargetMachine::CGFT_ObjectFile;
+    CGFT = CGFT_ObjectFile;
   else if (Action == Backend_EmitMCNull)
-    CGFT = TargetMachine::CGFT_Null;
+    CGFT = CGFT_Null;
   else
     assert(Action == Backend_EmitAssembly && "Invalid action!");
 
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp
index 584b96a..0615381 100644
--- a/lib/CodeGen/CGDecl.cpp
+++ b/lib/CodeGen/CGDecl.cpp
@@ -151,7 +151,7 @@ CodeGenFunction::EmitEquivalenceSet(const EquivalenceSet *S) {
       new llvm::AllocaInst(
           CGM.Int8Ty, DL.getAllocaAddrSpace(),
           llvm::ConstantInt::get(CGM.SizeTy, HighestBound - LowestBound),
-          CGM.getDataLayout().getTypeStoreSize(CGM.DoubleTy)),
+          llvm::MaybeAlign(CGM.getDataLayout().getTypeStoreSize(CGM.DoubleTy))),
       "equivalence-set");
 #if 0
   AllocaInst(Type *Ty, unsigned AddrSpace,
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index efc14aa..ce824f6 100644
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -19,6 +19,6 @@ except KeyError:
 
 # Let the main config do the real work.
 config.test_dir = "@FORT_SOURCE_DIR@/test"
-config.file_check = "@LLVM_BINARY_DIR@/bin/FileCheck"
+config.file_check = "@FORT_BINARY_DIR@/bin/FileCheck"
 lit_config.load_config(config, "@FORT_SOURCE_DIR@/test/lit.cfg")
 
diff --git a/tools/driver/Main.cpp b/tools/driver/Main.cpp
index 37b92c6..c422a7b 100644
--- a/tools/driver/Main.cpp
+++ b/tools/driver/Main.cpp
@@ -120,13 +120,12 @@ static bool EmitFile(llvm::raw_pwrite_stream &Out, llvm::Module *Module,
   if (Action == Backend_EmitObj || Action == Backend_EmitAssembly) {
     llvm::Module &Mod = *Module;
 
-    llvm::TargetMachine::CodeGenFileType CGFT =
-        llvm::TargetMachine::CGFT_AssemblyFile;
+    CodeGenFileType CGFT = CGFT_AssemblyFile;
 
     if (Action == Backend_EmitObj)
-      CGFT = llvm::TargetMachine::CGFT_ObjectFile;
+      CGFT = CGFT_ObjectFile;
     else if (Action == Backend_EmitMCNull)
-      CGFT = llvm::TargetMachine::CGFT_Null;
+      CGFT = CGFT_Null;
     else
       assert(Action == Backend_EmitAssembly && "Invalid action!");