diff --git a/clang/CodeGen/CodeGenFunction.cpp b/clang/CodeGen/CodeGenFunction.cpp
index ec1aad8b71f3..73553da0b1b7 100644
--- a/clang/CodeGen/CodeGenFunction.cpp
+++ b/clang/CodeGen/CodeGenFunction.cpp
@@ -18,6 +18,7 @@
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Function.h"
+#include "llvm/Analysis/Verifier.h"
 using namespace llvm;
 using namespace clang;
 using namespace CodeGen;
@@ -125,6 +126,13 @@ void CodeGenFunction::GenerateCode(const FunctionDecl *FD) {
   Builder.SetInsertPoint(EntryBB);
   
   EmitStmt(FD->getBody());
+  
+  // Emit a simple return for now.
+  Builder.CreateRetVoid();
+  
+  
+  // Verify that the function is well formed.
+  assert(!verifyFunction(*CurFn));
 }
 
 
diff --git a/clang/Driver/Makefile b/clang/Driver/Makefile
index 6e60f8a720a1..4c9db0dc2d51 100644
--- a/clang/Driver/Makefile
+++ b/clang/Driver/Makefile
@@ -3,6 +3,6 @@ CPPFLAGS += -I$(PROJ_SRC_DIR)/../include
 CXXFLAGS = -fno-rtti
 
 TOOLNAME = clang
-USEDLIBS = LLVMCore.a clangCodeGen.a clangSEMA.a clangAST.a clangParse.a clangLex.a clangBasic.a LLVMSupport.a LLVMSystem.a
+USEDLIBS = clangCodeGen.a clangSEMA.a clangAST.a clangParse.a clangLex.a clangBasic.a LLVMCore.a LLVMSupport.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common