diff --git a/include/llvm/Analysis/CallGraph.h b/include/llvm/Analysis/CallGraph.h
index 5602cec26ec..e51a3c7fb18 100644
--- a/include/llvm/Analysis/CallGraph.h
+++ b/include/llvm/Analysis/CallGraph.h
@@ -291,8 +291,8 @@ template<> struct GraphTraits<const CallGraph*> :
 static IncludeFile
 CALLGRAPH_INCLUDE_FILE(&CallGraph::stub);
 
-extern void BasicCallGraphStub();
-static IncludeFile HDR_INCLUDE_CALLGRAPH_CPP((void*)&BasicCallGraphStub);
+extern int BasicCallGraphStub;
+static IncludeFile HDR_INCLUDE_CALLGRAPH_CPP(&BasicCallGraphStub);
 
 } // End llvm namespace
 
diff --git a/lib/Analysis/IPA/CallGraph.cpp b/lib/Analysis/IPA/CallGraph.cpp
index 71b303beca9..f8846d390a5 100644
--- a/lib/Analysis/IPA/CallGraph.cpp
+++ b/lib/Analysis/IPA/CallGraph.cpp
@@ -19,7 +19,7 @@
 #include <iostream>
 using namespace llvm;
 
-void llvm::BasicCallGraphStub() {}
+int llvm::BasicCallGraphStub;
 
 static bool isOnlyADirectCall(Function *F, CallSite CS) {
   if (!CS.getInstruction()) return false;