@@ -515,6 +515,7 @@ libllvmcodegen_la_SOURCES=\

 	llvm/lib/CodeGen/ProcessImplicitDefs.cpp\

 	llvm/lib/CodeGen/PrologEpilogInserter.cpp\

 	llvm/lib/CodeGen/RegAllocLinearScan.cpp\

+	llvm/lib/CodeGen/RegAllocLocal.cpp\

 	llvm/lib/CodeGen/RegisterCoalescer.cpp\

 	llvm/lib/CodeGen/RegisterScavenging.cpp\

 	llvm/lib/CodeGen/ScheduleDAG.cpp\

@@ -241,7 +241,7 @@ am_libllvmcodegen_la_OBJECTS = AliasSetTracker.lo ConstantFolding.lo \

 	MachineSink.lo MachineVerifier.lo MaxStackAlignment.lo \

 	PHIElimination.lo Passes.lo PostRASchedulerList.lo \

 	PreAllocSplitting.lo ProcessImplicitDefs.lo \

-	PrologEpilogInserter.lo RegAllocLinearScan.lo \

+	PrologEpilogInserter.lo RegAllocLinearScan.lo RegAllocLocal.lo \

 	RegisterCoalescer.lo RegisterScavenging.lo ScheduleDAG.lo \

 	ScheduleDAGEmit.lo ScheduleDAGInstrs.lo ScheduleDAGPrinter.lo \

 	CallingConvLower.lo DAGCombiner.lo FastISel.lo \

@@ -1155,6 +1155,7 @@ libllvmcodegen_la_SOURCES = \

 	llvm/lib/CodeGen/ProcessImplicitDefs.cpp\

 	llvm/lib/CodeGen/PrologEpilogInserter.cpp\

 	llvm/lib/CodeGen/RegAllocLinearScan.cpp\

+	llvm/lib/CodeGen/RegAllocLocal.cpp\

 	llvm/lib/CodeGen/RegisterCoalescer.cpp\

 	llvm/lib/CodeGen/RegisterScavenging.cpp\

 	llvm/lib/CodeGen/ScheduleDAG.cpp\

@@ -2968,6 +2969,14 @@ RegAllocLinearScan.lo: llvm/lib/CodeGen/RegAllocLinearScan.cpp

 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RegAllocLinearScan.lo `test -f 'llvm/lib/CodeGen/RegAllocLinearScan.cpp' || echo '$(srcdir)/'`llvm/lib/CodeGen/RegAllocLinearScan.cpp

+RegAllocLocal.lo: llvm/lib/CodeGen/RegAllocLocal.cpp

+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RegAllocLocal.lo -MD -MP -MF $(DEPDIR)/RegAllocLocal.Tpo -c -o RegAllocLocal.lo `test -f 'llvm/lib/CodeGen/RegAllocLocal.cpp' || echo '$(srcdir)/'`llvm/lib/CodeGen/RegAllocLocal.cpp

+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/RegAllocLocal.Tpo $(DEPDIR)/RegAllocLocal.Plo

+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@

+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='llvm/lib/CodeGen/RegAllocLocal.cpp' object='RegAllocLocal.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RegAllocLocal.lo `test -f 'llvm/lib/CodeGen/RegAllocLocal.cpp' || echo '$(srcdir)/'`llvm/lib/CodeGen/RegAllocLocal.cpp

+

 RegisterCoalescer.lo: llvm/lib/CodeGen/RegisterCoalescer.cpp

 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RegisterCoalescer.lo -MD -MP -MF $(DEPDIR)/RegisterCoalescer.Tpo -c -o RegisterCoalescer.lo `test -f 'llvm/lib/CodeGen/RegisterCoalescer.cpp' || echo '$(srcdir)/'`llvm/lib/CodeGen/RegisterCoalescer.cpp

 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/RegisterCoalescer.Tpo $(DEPDIR)/RegisterCoalescer.Plo

@@ -3544,14 +3553,6 @@ OcamlGC.lo: llvm/lib/CodeGen/OcamlGC.cpp

 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o OcamlGC.lo `test -f 'llvm/lib/CodeGen/OcamlGC.cpp' || echo '$(srcdir)/'`llvm/lib/CodeGen/OcamlGC.cpp

-RegAllocLocal.lo: llvm/lib/CodeGen/RegAllocLocal.cpp

-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RegAllocLocal.lo -MD -MP -MF $(DEPDIR)/RegAllocLocal.Tpo -c -o RegAllocLocal.lo `test -f 'llvm/lib/CodeGen/RegAllocLocal.cpp' || echo '$(srcdir)/'`llvm/lib/CodeGen/RegAllocLocal.cpp

-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/RegAllocLocal.Tpo $(DEPDIR)/RegAllocLocal.Plo

-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@

-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='llvm/lib/CodeGen/RegAllocLocal.cpp' object='RegAllocLocal.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RegAllocLocal.lo `test -f 'llvm/lib/CodeGen/RegAllocLocal.cpp' || echo '$(srcdir)/'`llvm/lib/CodeGen/RegAllocLocal.cpp

-

 RegAllocPBQP.lo: llvm/lib/CodeGen/RegAllocPBQP.cpp

 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RegAllocPBQP.lo -MD -MP -MF $(DEPDIR)/RegAllocPBQP.Tpo -c -o RegAllocPBQP.lo `test -f 'llvm/lib/CodeGen/RegAllocPBQP.cpp' || echo '$(srcdir)/'`llvm/lib/CodeGen/RegAllocPBQP.cpp

 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/RegAllocPBQP.Tpo $(DEPDIR)/RegAllocPBQP.Plo

@@ -512,7 +512,7 @@ public:

 	}

 	FunctionType *FTy = FunctionType::get(Type::getVoidTy(Context),

 						    false);

-	Function *FHandler = Function::Create(FTy, Function::InternalLinkage,

+	Function *FHandler = Function::Create(FTy, Function::ExternalLinkage,

 					      "clamjit.fail", M);

 	FHandler->setDoesNotReturn();

 	FHandler->setDoesNotThrow();

@@ -596,7 +596,6 @@ public:

 				    C, "glob"+Twine(i));

 	    globals.push_back(GV);

 	}

-

 	Function **Functions = new Function*[bc->num_func];

 	for (unsigned j=0;j<bc->num_func;j++) {

 	    PrettyStackTraceString CrashInfo("Generate LLVM IR functions");

@@ -1068,8 +1067,10 @@ public:

 		ReturnInst::Create(Context, CI, BB);

 		if (verifyFunction(*F, PrintMessageAction) == 0) {

+			DEBUG(errs() << "Generating code\n");

 			// Codegen current function as executable machine code.

 			void *code = EE->getPointerToFunction(F);

+			DEBUG(errs() << "Code generation finished\n");

 			compiledFunctions[func] = code;

 		}

@@ -1199,7 +1200,7 @@ int cli_bytecode_prepare_jit(struct cli_all_bc *bcs)

 	FunctionType *FTy = FunctionType::get(Type::getVoidTy(M->getContext()),

 						    false);

 	GlobalVariable *Guard = new GlobalVariable(*M, PointerType::getUnqual(Type::getInt8Ty(M->getContext())),

-						    true, GlobalValue::InternalLinkage, 0, "__stack_chk_guard"); 

+						    true, GlobalValue::ExternalLinkage, 0, "__stack_chk_guard"); 

 	unsigned plus = 0;

 	if (2*sizeof(void*) <= 16 && cli_rndnum(2)==2) {

 	    plus = sizeof(void*);