@@ -3,20 +3,22 @@ use strict;

 use warnings;

 my $path = $ARGV[0];

-`(cd $path/tools/llvm-config; make ENABLE_OPTIMIZED=0 llvm-config-perobjincl)`;

+#`(cd $path/tools/llvm-config; make ENABLE_OPTIMIZED=0 llvm-config-perobjincl)`;

 my %compdeps;

 my @codegencomponents = ('x86codegen','powerpccodegen','armcodegen');

-my @allnonsys = ('support','jit',@codegencomponents);

+my @allnonsys = ('support','jit','fullcodegen',@codegencomponents);

 my @allcomponents= ('system',@allnonsys);

-my $allJIT="jit core target lib/Support/FoldingSet.o lib/Support/PrettyStackTrace.o";

+my $allJIT="jit core lib/Support/SourceMgr.o";

 for my $component (@allcomponents) {

     $/ = " ";

-    if ($component =~ "jit") {

+    $component =~ s/^fullcodegen/codegen interpreter jit target/;

+    if ($component =~ "^jit") {

 	open DEPS, "$path/tools/llvm-config/llvm-config-perobjincl --libnames $allJIT|";

     } else {

 	open DEPS, "$path/tools/llvm-config/llvm-config-perobjincl --libnames $component|";

     }

+    $component =~ s/^codegen.+/fullcodegen/;

     while (<DEPS>) {

 	chomp;

 	s/[\n\r]//;

@@ -73,6 +75,12 @@ foreach my $codegen (@codegencomponents) {

 @allcomponents=(@allcomponents,'codegen');

 $compdeps{'codegen'}=\%intersection;

+foreach my $comp (keys %{$compdeps{'codegen'}}) {

+    delete $compdeps{'fullcodegen'}{$comp};

+}

+foreach my $comp (keys %{$compdeps{'jit'}}) {

+    delete $compdeps{'fullcodegen'}{$comp};

+}

 foreach my $comp (@allcomponents) {

     print "libllvm$comp"."_la_SOURCES=";

@@ -81,3 +89,4 @@ foreach my $comp (@allcomponents) {

     }

     print "\n\n";

 }

+

@@ -39,8 +39,8 @@ endif

 noinst_LTLIBRARIES = libclamavcxx.la libllvmsupport.la libllvmsystem.la\

 		     libllvmcodegen.la libllvmjit.la

-

-libclamavcxx_la_LIBADD=libllvmjit.la libllvmcodegen.la libllvmsystem.la

+lli_LDADD=libllvmbitreader.la libllvmfullcodegen.la libllvmjit.la

+libclamavcxx_la_LIBADD=libllvmjit.la

 libclamavcxx_la_DEPENDENCIES=libllvmjit.la libllvmcodegen.la libllvmsystem.la

 libclamavcxx_la_LDFLAGS=-no-undefined

 libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS)

@@ -48,21 +48,25 @@ libclamavcxx_la_SOURCES = bytecode2llvm.cpp

 if BUILD_X86

 libclamavcxx_la_LIBADD+=libllvmx86codegen.la

 libclamavcxx_la_DEPENDENCIES+=libllvmx86codegen.la

+lli_LDADD+=libllvmx86codegen.la

 noinst_LTLIBRARIES+=libllvmx86codegen.la

 endif

 if BUILD_PPC

 libclamavcxx_la_LIBADD+=libllvmpowerpccodegen.la

 libclamavcxx_la_DEPENDENCIES+=libllvmpowerpccodegen.la

+lli_LDADD+=libllvmpowerpccodegen.la

 noinst_LTLIBRARIES+=libllvmpowerpccodegen.la

 endif

 if BUILD_ARM

 libclamavcxx_la_LIBADD+=libllvmarmcodegen.la

 libclamavcxx_la_DEPENDENCIES+=libllvmarmcodegen.la

+lli_LDADD+=libllvmarmcodegen.la

 noinst_LTLIBRARIES+=libllvmarmcodegen.la

 endif

+libclamavcxx_la_LIBADD+=libllvmcodegen.la libllvmsystem.la

-LLVM_CXXFLAGS=-Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings

+LLVM_CXXFLAGS=-Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -Wno-missing-field-initializers -Wno-variadic-macros

 EXTRA_DIST=$(top_srcdir)/llvm llvmdejagnu.sh

@@ -215,16 +219,9 @@ BUILT_SOURCES+=X86GenRegisterInfo.h.inc X86GenRegisterNames.inc X86GenRegisterIn

 libllvmx86codegen_la_SOURCES=\

 	llvm/lib/CodeGen/DeadMachineInstructionElim.cpp\

-	llvm/lib/CodeGen/MachineDominators.cpp\

-	llvm/lib/CodeGen/MachineLoopInfo.cpp\

 	llvm/lib/CodeGen/MachineModuleInfoImpls.cpp\

-	llvm/lib/CodeGen/SelectionDAG/FastISel.cpp\

 	llvm/lib/MC/MCAsmInfoCOFF.cpp\

 	llvm/lib/MC/MCCodeEmitter.cpp\

-	llvm/lib/MC/MCContext.cpp\

-	llvm/lib/MC/MCExpr.cpp\

-	llvm/lib/MC/MCInst.cpp\

-	llvm/lib/Target/TargetELFWriterInfo.cpp\

 	llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp\

 	llvm/lib/Target/X86/X86COFFMachineModuleInfo.cpp\

 	llvm/lib/Target/X86/X86CodeEmitter.cpp\

@@ -284,7 +281,6 @@ BUILT_SOURCES += PPCGenInstrNames.inc PPCGenRegisterNames.inc PPCGenAsmWriter.in

     PPCGenInstrInfo.inc PPCGenDAGISel.inc PPCGenCallingConv.inc PPCGenSubtarget.inc

 libllvmpowerpccodegen_la_SOURCES=\

-	llvm/lib/CodeGen/ScheduleDAG.cpp\

 	llvm/lib/Target/PowerPC/PPCBranchSelector.cpp\

 	llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp\

 	llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp\

@@ -298,8 +294,7 @@ libllvmpowerpccodegen_la_SOURCES=\

 	llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp\

 	llvm/lib/Target/PowerPC/PPCSubtarget.cpp\

 	llvm/lib/Target/PowerPC/PPCTargetMachine.cpp\

-	llvm/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp\

-	llvm/lib/Target/TargetMachOWriterInfo.cpp

+	llvm/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp

 endif

@@ -371,10 +366,24 @@ endif

 # End of Targets

 libllvmjit_la_SOURCES=\

+	llvm/lib/Analysis/AliasAnalysis.cpp\

+	llvm/lib/Analysis/BasicAliasAnalysis.cpp\

+	llvm/lib/Analysis/CaptureTracking.cpp\

+	llvm/lib/Analysis/DebugInfo.cpp\

+	llvm/lib/Analysis/MemoryBuiltins.cpp\

+	llvm/lib/Analysis/ValueTracking.cpp\

+	llvm/lib/CodeGen/ELFCodeEmitter.cpp\

 	llvm/lib/CodeGen/ELFWriter.cpp\

+	llvm/lib/CodeGen/MachineBasicBlock.cpp\

 	llvm/lib/CodeGen/MachineFunction.cpp\

+	llvm/lib/CodeGen/MachineFunctionAnalysis.cpp\

+	llvm/lib/CodeGen/MachineFunctionPass.cpp\

 	llvm/lib/CodeGen/MachineInstr.cpp\

 	llvm/lib/CodeGen/MachineModuleInfo.cpp\

+	llvm/lib/CodeGen/MachineRegisterInfo.cpp\

+	llvm/lib/CodeGen/ObjectCodeEmitter.cpp\

+	llvm/lib/CodeGen/PseudoSourceValue.cpp\

+	llvm/lib/CodeGen/TargetInstrInfoImpl.cpp\

 	llvm/lib/ExecutionEngine/ExecutionEngine.cpp\

 	llvm/lib/ExecutionEngine/JIT/Intercept.cpp\

 	llvm/lib/ExecutionEngine/JIT/JIT.cpp\

@@ -385,6 +394,12 @@ libllvmjit_la_SOURCES=\

 	llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp\

 	llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp\

 	llvm/lib/MC/MCAsmInfo.cpp\

+	llvm/lib/MC/MCContext.cpp\

+	llvm/lib/MC/MCExpr.cpp\

+	llvm/lib/MC/MCSection.cpp\

+	llvm/lib/MC/MCSectionELF.cpp\

+	llvm/lib/MC/MCSectionMachO.cpp\

+	llvm/lib/MC/MCSymbol.cpp\

 	llvm/lib/Support/APFloat.cpp\

 	llvm/lib/Support/APInt.cpp\

 	llvm/lib/Support/Allocator.cpp\

@@ -395,14 +410,17 @@ libllvmjit_la_SOURCES=\

 	llvm/lib/Support/ErrorHandling.cpp\

 	llvm/lib/Support/FoldingSet.cpp\

 	llvm/lib/Support/FormattedStream.cpp\

+	llvm/lib/Support/GraphWriter.cpp\

 	llvm/lib/Support/ManagedStatic.cpp\

 	llvm/lib/Support/MemoryBuffer.cpp\

 	llvm/lib/Support/PrettyStackTrace.cpp\

 	llvm/lib/Support/SmallPtrSet.cpp\

+	llvm/lib/Support/SourceMgr.cpp\

 	llvm/lib/Support/Statistic.cpp\

 	llvm/lib/Support/StringExtras.cpp\

 	llvm/lib/Support/StringMap.cpp\

 	llvm/lib/Support/StringPool.cpp\

+	llvm/lib/Support/StringRef.cpp\

 	llvm/lib/Support/TargetRegistry.cpp\

 	llvm/lib/Support/Timer.cpp\

 	llvm/lib/Support/Triple.cpp\

@@ -410,7 +428,10 @@ libllvmjit_la_SOURCES=\

 	llvm/lib/Support/raw_ostream.cpp\

 	llvm/lib/Target/SubtargetFeature.cpp\

 	llvm/lib/Target/TargetData.cpp\

+	llvm/lib/Target/TargetInstrInfo.cpp\

+	llvm/lib/Target/TargetLoweringObjectFile.cpp\

 	llvm/lib/Target/TargetMachine.cpp\

+	llvm/lib/Target/TargetRegisterInfo.cpp\

 	llvm/lib/VMCore/AsmWriter.cpp\

 	llvm/lib/VMCore/Attributes.cpp\

 	llvm/lib/VMCore/AutoUpgrade.cpp\

@@ -443,31 +464,119 @@ libllvmjit_la_SOURCES=\

 	llvm/lib/VMCore/Verifier.cpp

 libllvmcodegen_la_SOURCES=\

+	llvm/lib/Analysis/AliasSetTracker.cpp\

+	llvm/lib/Analysis/ConstantFolding.cpp\

+	llvm/lib/Analysis/IVUsers.cpp\

+	llvm/lib/Analysis/InstructionSimplify.cpp\

+	llvm/lib/Analysis/LoopInfo.cpp\

+	llvm/lib/Analysis/LoopPass.cpp\

+	llvm/lib/Analysis/MemoryDependenceAnalysis.cpp\

+	llvm/lib/Analysis/PHITransAddr.cpp\

+	llvm/lib/Analysis/ProfileInfo.cpp\

+	llvm/lib/Analysis/ScalarEvolution.cpp\

+	llvm/lib/Analysis/ScalarEvolutionExpander.cpp\

+	llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp\

+	llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp\

+	llvm/lib/CodeGen/AsmPrinter/DIE.cpp\

+	llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp\

+	llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp\

+	llvm/lib/CodeGen/AsmPrinter/DwarfLabel.cpp\

+	llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp\

+	llvm/lib/CodeGen/AsmPrinter/DwarfWriter.cpp\

+	llvm/lib/CodeGen/BranchFolding.cpp\

+	llvm/lib/CodeGen/CalcSpillWeights.cpp\

+	llvm/lib/CodeGen/CodePlacementOpt.cpp\

+	llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp\

+	llvm/lib/CodeGen/DwarfEHPrepare.cpp\

+	llvm/lib/CodeGen/ExactHazardRecognizer.cpp\

+	llvm/lib/CodeGen/GCMetadata.cpp\

+	llvm/lib/CodeGen/GCStrategy.cpp\

 	llvm/lib/CodeGen/LLVMTargetMachine.cpp\

+	llvm/lib/CodeGen/LatencyPriorityQueue.cpp\

+	llvm/lib/CodeGen/LiveInterval.cpp\

+	llvm/lib/CodeGen/LiveIntervalAnalysis.cpp\

+	llvm/lib/CodeGen/LiveStackAnalysis.cpp\

 	llvm/lib/CodeGen/LiveVariables.cpp\

-	llvm/lib/CodeGen/MachineBasicBlock.cpp\

-	llvm/lib/CodeGen/MachineFunctionPass.cpp\

-	llvm/lib/CodeGen/MachineRegisterInfo.cpp\

+	llvm/lib/CodeGen/LowerSubregs.cpp\

+	llvm/lib/CodeGen/MachineDominators.cpp\

+	llvm/lib/CodeGen/MachineLICM.cpp\

+	llvm/lib/CodeGen/MachineLoopInfo.cpp\

+	llvm/lib/CodeGen/MachinePassRegistry.cpp\

+	llvm/lib/CodeGen/MachineSSAUpdater.cpp\

+	llvm/lib/CodeGen/MachineSink.cpp\

+	llvm/lib/CodeGen/MachineVerifier.cpp\

 	llvm/lib/CodeGen/MaxStackAlignment.cpp\

-	llvm/lib/CodeGen/ObjectCodeEmitter.cpp\

-	llvm/lib/CodeGen/PseudoSourceValue.cpp\

+	llvm/lib/CodeGen/PHIElimination.cpp\

+	llvm/lib/CodeGen/Passes.cpp\

+	llvm/lib/CodeGen/PostRASchedulerList.cpp\

+	llvm/lib/CodeGen/PreAllocSplitting.cpp\

+	llvm/lib/CodeGen/ProcessImplicitDefs.cpp\

+	llvm/lib/CodeGen/PrologEpilogInserter.cpp\

+	llvm/lib/CodeGen/RegAllocLinearScan.cpp\

+	llvm/lib/CodeGen/RegisterCoalescer.cpp\

 	llvm/lib/CodeGen/RegisterScavenging.cpp\

+	llvm/lib/CodeGen/ScheduleDAG.cpp\

+	llvm/lib/CodeGen/ScheduleDAGEmit.cpp\

+	llvm/lib/CodeGen/ScheduleDAGInstrs.cpp\

+	llvm/lib/CodeGen/ScheduleDAGPrinter.cpp\

 	llvm/lib/CodeGen/SelectionDAG/CallingConvLower.cpp\

 	llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp\

+	llvm/lib/CodeGen/SelectionDAG/FastISel.cpp\

+	llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp\

+	llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp\

+	llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp\

+	llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp\

+	llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp\

+	llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp\

+	llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp\

+	llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp\

+	llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp\

+	llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp\

+	llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp\

+	llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp\

+	llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp\

 	llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp\

 	llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp\

 	llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp\

+	llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp\

 	llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp\

-	llvm/lib/CodeGen/TargetInstrInfoImpl.cpp\

+	llvm/lib/CodeGen/ShrinkWrapping.cpp\

+	llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp\

+	llvm/lib/CodeGen/SjLjEHPrepare.cpp\

+	llvm/lib/CodeGen/SlotIndexes.cpp\

+	llvm/lib/CodeGen/Spiller.cpp\

+	llvm/lib/CodeGen/StackProtector.cpp\

+	llvm/lib/CodeGen/StackSlotColoring.cpp\

+	llvm/lib/CodeGen/StrongPHIElimination.cpp\

+	llvm/lib/CodeGen/TailDuplication.cpp\

+	llvm/lib/CodeGen/TwoAddressInstructionPass.cpp\

+	llvm/lib/CodeGen/UnreachableBlockElim.cpp\

+	llvm/lib/CodeGen/VirtRegMap.cpp\

+	llvm/lib/CodeGen/VirtRegRewriter.cpp\

 	llvm/lib/MC/MCAsmInfoDarwin.cpp\

-	llvm/lib/Support/StringRef.cpp\

+	llvm/lib/MC/MCAsmStreamer.cpp\

+	llvm/lib/MC/MCInst.cpp\

+	llvm/lib/MC/MCStreamer.cpp\

 	llvm/lib/Target/TargetFrameInfo.cpp\

-	llvm/lib/Target/TargetInstrInfo.cpp\

-	llvm/lib/Target/TargetLoweringObjectFile.cpp\

-	llvm/lib/Target/TargetRegisterInfo.cpp\

-	llvm/lib/Target/TargetSubtarget.cpp

-

-

+	llvm/lib/Target/TargetSubtarget.cpp\

+	llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp\

+	llvm/lib/Transforms/Scalar/GEPSplitter.cpp\

+	llvm/lib/Transforms/Scalar/GVN.cpp\

+	llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp\

+	llvm/lib/Transforms/Utils/AddrModeMatcher.cpp\

+	llvm/lib/Transforms/Utils/BasicBlockUtils.cpp\

+	llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp\

+	llvm/lib/Transforms/Utils/DemoteRegToStack.cpp\

+	llvm/lib/Transforms/Utils/LCSSA.cpp\

+	llvm/lib/Transforms/Utils/Local.cpp\

+	llvm/lib/Transforms/Utils/LoopSimplify.cpp\

+	llvm/lib/Transforms/Utils/LowerInvoke.cpp\

+	llvm/lib/Transforms/Utils/LowerSwitch.cpp\

+	llvm/lib/Transforms/Utils/Mem2Reg.cpp\

+	llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp\

+	llvm/lib/Transforms/Utils/SSAUpdater.cpp\

+	llvm/lib/Transforms/Utils/SimplifyCFG.cpp\

+	llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp

 # Used only by make check

@@ -492,13 +601,12 @@ libllvmasmparser_la_SOURCES=\

  llvm/lib/AsmParser/LLParser.cpp\

  llvm/lib/AsmParser/Parser.cpp

-#TODO: configure check -Wno-missing-field-initializers -Wno-variadic-macros

 libllvminterpreter_la_SOURCES=\

     llvm/lib/ExecutionEngine/Interpreter/Execution.cpp\

     llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp\

     llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp

-# -Wno-missing-field-initializers -Wno-variadic-macros

+libgoogletest_la_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include

 libgoogletest_la_SOURCES=\

     llvm/utils/unittest/googletest/gtest-death-test.cc\

     llvm/utils/unittest/googletest/gtest-filepath.cc\

@@ -509,7 +617,8 @@ libgoogletest_la_SOURCES=\

     llvm/utils/unittest/UnitTestMain/TestMain.cpp

 #-Wno-variadic-macros

-llvmunittest_ADT_LDADD=libgoogletest.la libllvmcore.la libllvmsupport.la libllvmsystem.la

+llvmunittest_ADT_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include

+llvmunittest_ADT_LDADD=libgoogletest.la libllvmjit.la libllvmsupport.la libllvmsystem.la

 llvmunittest_ADT_SOURCES=\

     llvm/unittests/ADT/APFloatTest.cpp\

     llvm/unittests/ADT/APIntTest.cpp\

@@ -526,7 +635,7 @@ llvmunittest_ADT_SOURCES=\

 llvmunittest_Support_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include

 #-Wno-variadic-macros

-llvmunittest_Support_LDADD=libgoogletest.la libllvmcore.la libllvmsupport.la libllvmsystem.la

+llvmunittest_Support_LDADD=libgoogletest.la libllvmjit.la libllvmsupport.la libllvmsystem.la

 llvmunittest_Support_SOURCES=\

     llvm/unittests/Support/AllocatorTest.cpp\

     llvm/unittests/Support/ConstantRangeTest.cpp\

@@ -538,16 +647,19 @@ llvmunittest_Support_SOURCES=\

 llvmunittest_VMCore_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include

 #-Wno-variadic-macros

-llvmunittest_VMCore_LDADD=libgoogletest.la libllvmtarget.la libllvmipa.la libllvmcore.la libllvmsupport.la libllvmsystem.la

+llvmunittest_VMCore_LDADD=libgoogletest.la libllvmjit.la libllvmsupport.la libllvmsystem.la

 llvmunittest_VMCore_SOURCES=\

+    llvm/lib/Analysis/IPA/CallGraph.cpp\

     llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp\

+    llvm/lib/Analysis/LoopInfo.cpp\

+    llvm/lib/Analysis/LoopPass.cpp\

     llvm/unittests/VMCore/ConstantsTest.cpp\

     llvm/unittests/VMCore/MetadataTest.cpp\

     llvm/unittests/VMCore/PassManagerTest.cpp

 llvmunittest_JIT_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include

 #-Wno-variadic-macros

-llvmunittest_JIT_LDADD=libgoogletest.la libllvmasmparser.la $(libclamavcxx_la_LIBADD)

+llvmunittest_JIT_LDADD=libgoogletest.la libllvmasmparser.la $(lli_LDADD)

 llvmunittest_JIT_SOURCES=\

     llvm/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp\

     llvm/unittests/ExecutionEngine/JIT/JITMemoryManagerTest.cpp\

@@ -555,8 +667,9 @@ llvmunittest_JIT_SOURCES=\

 llvmunittest_ExecutionEngine_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include

 #-Wno-variadic-macros

-llvmunittest_ExecutionEngine_LDADD=libgoogletest.la libllvminterpreter.la $(libclamavcxx_la_LIBADD)

+llvmunittest_ExecutionEngine_LDADD=libgoogletest.la libllvminterpreter.la $(libclamavcxx_la_LIBADD) libllvmsupport.la libllvmsystem.la

 llvmunittest_ExecutionEngine_SOURCES=\

+    llvm/lib/CodeGen/IntrinsicLowering.cpp\

     llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp

 count_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS)

@@ -572,7 +685,7 @@ FileCheck_CXXFLAGS=$(LLVM_CXXFLAGS)

 FileCheck_LDADD=libllvmsupport.la libllvmsystem.la 

 FileCheck_SOURCES=llvm/utils/FileCheck/FileCheck.cpp

-check_LTLIBRARIES=libllvmbitreader.la libllvmasmprinter.la libllvmbitwriter.la libllvmasmparser.la libgoogletest.la libllvminterpreter.la

+check_LTLIBRARIES=libllvmbitreader.la libllvmfullcodegen.la libllvmasmprinter.la libllvmbitwriter.la libllvmasmparser.la libgoogletest.la libllvminterpreter.la

 check_PROGRAMS=count not lli llc llvm-as llvm-dis llvmunittest_ADT llvmunittest_Support llvmunittest_VMCore llvmunittest_ExecutionEngine llvmunittest_JIT FileCheck

 check_SCRIPTS=llvmdejagnu.sh

 TESTS_ENVIRONMENT=export GMAKE=@GMAKE@;

@@ -611,29 +724,46 @@ libllvmasmprinter_la_SOURCES+= llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp

     llvm/lib/Target/ARM/AsmPrinter/ARMMCInstLower.cpp

 endif

-lli_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS)

-lli_CXXFLAGS=$(LLVM_CXXFLAGS)

-lli_LDADD=libllvmbitreader.la libllvminterpreter.la $(libclamavcxx_la_LIBADD)

+libllvmfullcodegen_la_SOURCES=\

+	llvm/lib/CodeGen/DeadMachineInstructionElim.cpp\

+	llvm/lib/CodeGen/GCMetadataPrinter.cpp\

+	llvm/lib/CodeGen/IfConversion.cpp\

+	llvm/lib/CodeGen/IntrinsicLowering.cpp\

+	llvm/lib/CodeGen/MachOCodeEmitter.cpp\

+	llvm/lib/CodeGen/MachOWriter.cpp\

+	llvm/lib/CodeGen/MachineModuleInfoImpls.cpp\

+	llvm/lib/CodeGen/OcamlGC.cpp\

+	llvm/lib/CodeGen/RegAllocLocal.cpp\

+	llvm/lib/CodeGen/RegAllocPBQP.cpp\

+	llvm/lib/CodeGen/ShadowStackGC.cpp\

+	llvm/lib/ExecutionEngine/Interpreter/Execution.cpp\

+	llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp\

+	llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp\

+	llvm/lib/Target/Target.cpp\

+	llvm/lib/Target/TargetELFWriterInfo.cpp\

+	llvm/lib/Target/TargetIntrinsicInfo.cpp\

+	llvm/lib/Target/TargetMachOWriterInfo.cpp

+

+lli_LDADD+=libllvmfullcodegen.la libllvmcodegen.la libllvmjit.la libllvmsupport.la libllvmsystem.la

 lli_SOURCES=\

-    llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp\

     llvm/tools/lli/lli.cpp

 llc_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS)

 llc_CXXFLAGS=$(LLVM_CXXFLAGS)

-llc_LDADD=libllvmbitreader.la libllvmasmparser.la libllvmasmprinter.la $(libclamavcxx_la_LIBADD)

+llc_LDADD=libllvmbitreader.la libllvmasmprinter.la libllvmasmparser.la $(lli_LDADD)

 llc_SOURCES=\

     llvm/lib/MC/MCInstPrinter.cpp\

     llvm/tools/llc/llc.cpp

 llvm_as_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS)

 llvm_as_CXXFLAGS=$(LLVM_CXXFLAGS)

-llvm_as_LDADD=libllvmasmparser.la libllvmbitwriter.la libllvmcore.la libllvmsupport.la libllvmsystem.la

+llvm_as_LDADD=libllvmasmparser.la libllvmbitwriter.la libllvmjit.la libllvmsupport.la libllvmsystem.la

 llvm_as_SOURCES=\

     llvm/tools/llvm-as/llvm-as.cpp

 llvm_dis_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS)

 llvm_dis_CXXFLAGS=$(LLVM_CXXFLAGS)

-llvm_dis_LDADD=libllvmasmparser.la libllvmbitreader.la libllvmcore.la libllvmsupport.la libllvmsystem.la

+llvm_dis_LDADD=libllvmasmparser.la libllvmbitreader.la libllvmjit.la libllvmsupport.la libllvmsystem.la

 llvm_dis_SOURCES=\

     llvm/tools/llvm-dis/llvm-dis.cpp

@@ -54,20 +54,23 @@ target_triplet = @target@

 @BUILD_X86_TRUE@am__append_1 = libllvmx86codegen.la

 @BUILD_X86_TRUE@am__append_2 = libllvmx86codegen.la

 @BUILD_X86_TRUE@am__append_3 = libllvmx86codegen.la

-@BUILD_PPC_TRUE@am__append_4 = libllvmpowerpccodegen.la

+@BUILD_X86_TRUE@am__append_4 = libllvmx86codegen.la

 @BUILD_PPC_TRUE@am__append_5 = libllvmpowerpccodegen.la

 @BUILD_PPC_TRUE@am__append_6 = libllvmpowerpccodegen.la

-@BUILD_ARM_TRUE@am__append_7 = libllvmarmcodegen.la

-@BUILD_ARM_TRUE@am__append_8 = libllvmarmcodegen.la

+@BUILD_PPC_TRUE@am__append_7 = libllvmpowerpccodegen.la

+@BUILD_PPC_TRUE@am__append_8 = libllvmpowerpccodegen.la

 @BUILD_ARM_TRUE@am__append_9 = libllvmarmcodegen.la

-@BUILD_X86_TRUE@am__append_10 = X86GenRegisterInfo.h.inc X86GenRegisterNames.inc X86GenRegisterInfo.inc X86GenInstrNames.inc X86GenInstrInfo.inc\

+@BUILD_ARM_TRUE@am__append_10 = libllvmarmcodegen.la

+@BUILD_ARM_TRUE@am__append_11 = libllvmarmcodegen.la

+@BUILD_ARM_TRUE@am__append_12 = libllvmarmcodegen.la

+@BUILD_X86_TRUE@am__append_13 = X86GenRegisterInfo.h.inc X86GenRegisterNames.inc X86GenRegisterInfo.inc X86GenInstrNames.inc X86GenInstrInfo.inc\

 @BUILD_X86_TRUE@	      X86GenAsmWriter.inc X86GenAsmWriter1.inc X86GenAsmMatcher.inc X86GenDAGISel.inc X86GenFastISel.inc X86GenCallingConv.inc\

 @BUILD_X86_TRUE@	      X86GenSubtarget.inc

-@BUILD_PPC_TRUE@am__append_11 = PPCGenInstrNames.inc PPCGenRegisterNames.inc PPCGenAsmWriter.inc PPCGenCodeEmitter.inc PPCGenRegisterInfo.h.inc PPCGenRegisterInfo.inc\

+@BUILD_PPC_TRUE@am__append_14 = PPCGenInstrNames.inc PPCGenRegisterNames.inc PPCGenAsmWriter.inc PPCGenCodeEmitter.inc PPCGenRegisterInfo.h.inc PPCGenRegisterInfo.inc\

 @BUILD_PPC_TRUE@    PPCGenInstrInfo.inc PPCGenDAGISel.inc PPCGenCallingConv.inc PPCGenSubtarget.inc

-@BUILD_ARM_TRUE@am__append_12 = ARMGenRegisterInfo.h.inc ARMGenRegisterNames.inc ARMGenRegisterInfo.inc ARMGenInstrNames.inc ARMGenInstrInfo.inc ARMGenCodeEmitter.inc\

+@BUILD_ARM_TRUE@am__append_15 = ARMGenRegisterInfo.h.inc ARMGenRegisterNames.inc ARMGenRegisterInfo.inc ARMGenInstrNames.inc ARMGenInstrInfo.inc ARMGenCodeEmitter.inc\

 @BUILD_ARM_TRUE@    ARMGenAsmWriter.inc ARMGenDAGISel.inc ARMGenCallingConv.inc ARMGenSubtarget.inc

 check_PROGRAMS = count$(EXEEXT) not$(EXEEXT) lli$(EXEEXT) llc$(EXEEXT) \

@@ -79,15 +82,15 @@ TESTS = llvmunittest_ADT$(EXEEXT) llvmunittest_Support$(EXEEXT) \

 	llvmunittest_VMCore$(EXEEXT) \

 	llvmunittest_ExecutionEngine$(EXEEXT) \

 	llvmunittest_JIT$(EXEEXT)

-@BUILD_X86_TRUE@am__append_13 = llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp\

+@BUILD_X86_TRUE@am__append_16 = llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp\

 @BUILD_X86_TRUE@    llvm/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp\

 @BUILD_X86_TRUE@    llvm/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp\

 @BUILD_X86_TRUE@    llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp\

 @BUILD_X86_TRUE@    llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp\

 @BUILD_X86_TRUE@    llvm/lib/Target/X86/X86COFFMachineModuleInfo.cpp

-@BUILD_PPC_TRUE@am__append_14 = llvm/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp

-@BUILD_ARM_TRUE@am__append_15 = llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp \

+@BUILD_PPC_TRUE@am__append_17 = llvm/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp

+@BUILD_ARM_TRUE@am__append_18 = llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp \

 @BUILD_ARM_TRUE@    llvm/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp\

 @BUILD_ARM_TRUE@    llvm/lib/Target/ARM/AsmPrinter/ARMMCInstLower.cpp

@@ -122,9 +125,12 @@ libclamavcxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \

 	$(libclamavcxx_la_CXXFLAGS) $(CXXFLAGS) \

 	$(libclamavcxx_la_LDFLAGS) $(LDFLAGS) -o $@

 libgoogletest_la_LIBADD =

-am_libgoogletest_la_OBJECTS = gtest-death-test.lo gtest-filepath.lo \

-	gtest-port.lo gtest-test-part.lo gtest-typed-test.lo gtest.lo \

-	TestMain.lo

+am_libgoogletest_la_OBJECTS = libgoogletest_la-gtest-death-test.lo \

+	libgoogletest_la-gtest-filepath.lo \

+	libgoogletest_la-gtest-port.lo \

+	libgoogletest_la-gtest-test-part.lo \

+	libgoogletest_la-gtest-typed-test.lo libgoogletest_la-gtest.lo \

+	libgoogletest_la-TestMain.lo

 libgoogletest_la_OBJECTS = $(am_libgoogletest_la_OBJECTS)

 libllvmarmcodegen_la_LIBADD =

 am__libllvmarmcodegen_la_SOURCES_DIST =  \

@@ -228,45 +234,91 @@ am_libllvmbitwriter_la_OBJECTS = BitWriter.lo BitcodeWriter.lo \

 	SerializeAPInt.lo ValueEnumerator.lo

 libllvmbitwriter_la_OBJECTS = $(am_libllvmbitwriter_la_OBJECTS)

 libllvmcodegen_la_LIBADD =

-am_libllvmcodegen_la_OBJECTS = LLVMTargetMachine.lo LiveVariables.lo \

-	MachineBasicBlock.lo MachineFunctionPass.lo \

-	MachineRegisterInfo.lo MaxStackAlignment.lo \

-	ObjectCodeEmitter.lo PseudoSourceValue.lo \

-	RegisterScavenging.lo CallingConvLower.lo DAGCombiner.lo \

-	SelectionDAG.lo SelectionDAGBuilder.lo SelectionDAGISel.lo \

-	TargetLowering.lo TargetInstrInfoImpl.lo MCAsmInfoDarwin.lo \

-	StringRef.lo TargetFrameInfo.lo TargetInstrInfo.lo \

-	TargetLoweringObjectFile.lo TargetRegisterInfo.lo \

-	TargetSubtarget.lo

+am_libllvmcodegen_la_OBJECTS = AliasSetTracker.lo ConstantFolding.lo \

+	IVUsers.lo InstructionSimplify.lo LoopInfo.lo LoopPass.lo \

+	MemoryDependenceAnalysis.lo PHITransAddr.lo ProfileInfo.lo \

+	ScalarEvolution.lo ScalarEvolutionExpander.lo \

+	AggressiveAntiDepBreaker.lo AsmPrinter.lo DIE.lo DwarfDebug.lo \

+	DwarfException.lo DwarfLabel.lo DwarfPrinter.lo DwarfWriter.lo \

+	BranchFolding.lo CalcSpillWeights.lo CodePlacementOpt.lo \

+	CriticalAntiDepBreaker.lo DwarfEHPrepare.lo \

+	ExactHazardRecognizer.lo GCMetadata.lo GCStrategy.lo \

+	LLVMTargetMachine.lo LatencyPriorityQueue.lo LiveInterval.lo \

+	LiveIntervalAnalysis.lo LiveStackAnalysis.lo LiveVariables.lo \

+	LowerSubregs.lo MachineDominators.lo MachineLICM.lo \

+	MachineLoopInfo.lo MachinePassRegistry.lo MachineSSAUpdater.lo \

+	MachineSink.lo MachineVerifier.lo MaxStackAlignment.lo \

+	PHIElimination.lo Passes.lo PostRASchedulerList.lo \

+	PreAllocSplitting.lo ProcessImplicitDefs.lo \

+	PrologEpilogInserter.lo RegAllocLinearScan.lo \

+	RegisterCoalescer.lo RegisterScavenging.lo ScheduleDAG.lo \

+	ScheduleDAGEmit.lo ScheduleDAGInstrs.lo ScheduleDAGPrinter.lo \

+	CallingConvLower.lo DAGCombiner.lo FastISel.lo \

+	FunctionLoweringInfo.lo InstrEmitter.lo LegalizeDAG.lo \

+	LegalizeFloatTypes.lo LegalizeIntegerTypes.lo LegalizeTypes.lo \

+	LegalizeTypesGeneric.lo LegalizeVectorOps.lo \

+	LegalizeVectorTypes.lo ScheduleDAGFast.lo ScheduleDAGList.lo \

+	ScheduleDAGRRList.lo ScheduleDAGSDNodes.lo SelectionDAG.lo \

+	SelectionDAGBuilder.lo SelectionDAGISel.lo \

+	SelectionDAGPrinter.lo TargetLowering.lo ShrinkWrapping.lo \

+	SimpleRegisterCoalescing.lo SjLjEHPrepare.lo SlotIndexes.lo \

+	Spiller.lo StackProtector.lo StackSlotColoring.lo \

+	StrongPHIElimination.lo TailDuplication.lo \

+	TwoAddressInstructionPass.lo UnreachableBlockElim.lo \

+	VirtRegMap.lo VirtRegRewriter.lo MCAsmInfoDarwin.lo \

+	MCAsmStreamer.lo MCInst.lo MCStreamer.lo TargetFrameInfo.lo \

+	TargetSubtarget.lo CodeGenPrepare.lo GEPSplitter.lo GVN.lo \

+	LoopStrengthReduce.lo AddrModeMatcher.lo BasicBlockUtils.lo \

+	BreakCriticalEdges.lo DemoteRegToStack.lo LCSSA.lo Local.lo \

+	LoopSimplify.lo LowerInvoke.lo LowerSwitch.lo Mem2Reg.lo \

+	PromoteMemoryToRegister.lo SSAUpdater.lo SimplifyCFG.lo \

+	UnifyFunctionExitNodes.lo

 libllvmcodegen_la_OBJECTS = $(am_libllvmcodegen_la_OBJECTS)

+libllvmfullcodegen_la_LIBADD =

+am_libllvmfullcodegen_la_OBJECTS = DeadMachineInstructionElim.lo \

+	GCMetadataPrinter.lo IfConversion.lo IntrinsicLowering.lo \

+	MachOCodeEmitter.lo MachOWriter.lo MachineModuleInfoImpls.lo \

+	OcamlGC.lo RegAllocLocal.lo RegAllocPBQP.lo ShadowStackGC.lo \

+	Execution.lo ExternalFunctions.lo Interpreter.lo Target.lo \

+	TargetELFWriterInfo.lo TargetIntrinsicInfo.lo \

+	TargetMachOWriterInfo.lo

+libllvmfullcodegen_la_OBJECTS = $(am_libllvmfullcodegen_la_OBJECTS)

 libllvminterpreter_la_LIBADD =

 am_libllvminterpreter_la_OBJECTS = Execution.lo ExternalFunctions.lo \

 	Interpreter.lo

 libllvminterpreter_la_OBJECTS = $(am_libllvminterpreter_la_OBJECTS)

 libllvmjit_la_LIBADD =

-am_libllvmjit_la_OBJECTS = ELFWriter.lo MachineFunction.lo \

-	MachineInstr.lo MachineModuleInfo.lo ExecutionEngine.lo \

-	Intercept.lo JIT.lo JITDebugRegisterer.lo JITDwarfEmitter.lo \

-	JITEmitter.lo JITMemoryManager.lo OProfileJITEventListener.lo \

-	TargetSelect.lo MCAsmInfo.lo APFloat.lo APInt.lo Allocator.lo \

-	CommandLine.lo ConstantRange.lo Debug.lo Dwarf.lo \

-	ErrorHandling.lo FoldingSet.lo FormattedStream.lo \

+am_libllvmjit_la_OBJECTS = AliasAnalysis.lo BasicAliasAnalysis.lo \

+	CaptureTracking.lo DebugInfo.lo MemoryBuiltins.lo \

+	ValueTracking.lo ELFCodeEmitter.lo ELFWriter.lo \

+	MachineBasicBlock.lo MachineFunction.lo \

+	MachineFunctionAnalysis.lo MachineFunctionPass.lo \

+	MachineInstr.lo MachineModuleInfo.lo MachineRegisterInfo.lo \

+	ObjectCodeEmitter.lo PseudoSourceValue.lo \

+	TargetInstrInfoImpl.lo ExecutionEngine.lo Intercept.lo JIT.lo \

+	JITDebugRegisterer.lo JITDwarfEmitter.lo JITEmitter.lo \

+	JITMemoryManager.lo OProfileJITEventListener.lo \

+	TargetSelect.lo MCAsmInfo.lo MCContext.lo MCExpr.lo \

+	MCSection.lo MCSectionELF.lo MCSectionMachO.lo MCSymbol.lo \

+	APFloat.lo APInt.lo Allocator.lo CommandLine.lo \

+	ConstantRange.lo Debug.lo Dwarf.lo ErrorHandling.lo \

+	FoldingSet.lo FormattedStream.lo GraphWriter.lo \

 	ManagedStatic.lo MemoryBuffer.lo PrettyStackTrace.lo \

-	SmallPtrSet.lo Statistic.lo StringExtras.lo StringMap.lo \

-	StringPool.lo TargetRegistry.lo Timer.lo Triple.lo Twine.lo \

-	raw_ostream.lo SubtargetFeature.lo TargetData.lo \

-	TargetMachine.lo AsmWriter.lo Attributes.lo AutoUpgrade.lo \

-	BasicBlock.lo ConstantFold.lo Constants.lo Core.lo \

-	Dominators.lo Function.lo Globals.lo InlineAsm.lo \

-	Instruction.lo Instructions.lo IntrinsicInst.lo LLVMContext.lo \

-	LeakDetector.lo Mangler.lo Metadata.lo Module.lo \

-	ModuleProvider.lo Pass.lo PassManager.lo PrintModulePass.lo \

-	Type.lo TypeSymbolTable.lo Use.lo Value.lo ValueSymbolTable.lo \

-	ValueTypes.lo Verifier.lo

+	SmallPtrSet.lo SourceMgr.lo Statistic.lo StringExtras.lo \

+	StringMap.lo StringPool.lo StringRef.lo TargetRegistry.lo \

+	Timer.lo Triple.lo Twine.lo raw_ostream.lo SubtargetFeature.lo \

+	TargetData.lo TargetInstrInfo.lo TargetLoweringObjectFile.lo \

+	TargetMachine.lo TargetRegisterInfo.lo AsmWriter.lo \

+	Attributes.lo AutoUpgrade.lo BasicBlock.lo ConstantFold.lo \

+	Constants.lo Core.lo Dominators.lo Function.lo Globals.lo \

+	InlineAsm.lo Instruction.lo Instructions.lo IntrinsicInst.lo \

+	LLVMContext.lo LeakDetector.lo Mangler.lo Metadata.lo \

+	Module.lo ModuleProvider.lo Pass.lo PassManager.lo \

+	PrintModulePass.lo Type.lo TypeSymbolTable.lo Use.lo Value.lo \

+	ValueSymbolTable.lo ValueTypes.lo Verifier.lo

 libllvmjit_la_OBJECTS = $(am_libllvmjit_la_OBJECTS)

 libllvmpowerpccodegen_la_LIBADD =

 am__libllvmpowerpccodegen_la_SOURCES_DIST =  \

-	llvm/lib/CodeGen/ScheduleDAG.cpp \

 	llvm/lib/Target/PowerPC/PPCBranchSelector.cpp \

 	llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp \

 	llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp \

@@ -280,10 +332,8 @@ am__libllvmpowerpccodegen_la_SOURCES_DIST =  \

 	llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp \

 	llvm/lib/Target/PowerPC/PPCSubtarget.cpp \

 	llvm/lib/Target/PowerPC/PPCTargetMachine.cpp \

-	llvm/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp \

-	llvm/lib/Target/TargetMachOWriterInfo.cpp

+	llvm/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp

 @BUILD_PPC_TRUE@am_libllvmpowerpccodegen_la_OBJECTS =  \

-@BUILD_PPC_TRUE@	libllvmpowerpccodegen_la-ScheduleDAG.lo \

 @BUILD_PPC_TRUE@	libllvmpowerpccodegen_la-PPCBranchSelector.lo \

 @BUILD_PPC_TRUE@	libllvmpowerpccodegen_la-PPCCodeEmitter.lo \

 @BUILD_PPC_TRUE@	libllvmpowerpccodegen_la-PPCHazardRecognizers.lo \

@@ -297,8 +347,7 @@ am__libllvmpowerpccodegen_la_SOURCES_DIST =  \

 @BUILD_PPC_TRUE@	libllvmpowerpccodegen_la-PPCRegisterInfo.lo \

 @BUILD_PPC_TRUE@	libllvmpowerpccodegen_la-PPCSubtarget.lo \

 @BUILD_PPC_TRUE@	libllvmpowerpccodegen_la-PPCTargetMachine.lo \

-@BUILD_PPC_TRUE@	libllvmpowerpccodegen_la-PowerPCTargetInfo.lo \

-@BUILD_PPC_TRUE@	libllvmpowerpccodegen_la-TargetMachOWriterInfo.lo

+@BUILD_PPC_TRUE@	libllvmpowerpccodegen_la-PowerPCTargetInfo.lo

 libllvmpowerpccodegen_la_OBJECTS =  \

 	$(am_libllvmpowerpccodegen_la_OBJECTS)

 @BUILD_PPC_TRUE@am_libllvmpowerpccodegen_la_rpath =

@@ -328,13 +377,8 @@ libllvmsystem_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \

 libllvmx86codegen_la_LIBADD =

 am__libllvmx86codegen_la_SOURCES_DIST =  \

 	llvm/lib/CodeGen/DeadMachineInstructionElim.cpp \

-	llvm/lib/CodeGen/MachineDominators.cpp \

-	llvm/lib/CodeGen/MachineLoopInfo.cpp \

 	llvm/lib/CodeGen/MachineModuleInfoImpls.cpp \

-	llvm/lib/CodeGen/SelectionDAG/FastISel.cpp \

 	llvm/lib/MC/MCAsmInfoCOFF.cpp llvm/lib/MC/MCCodeEmitter.cpp \

-	llvm/lib/MC/MCContext.cpp llvm/lib/MC/MCExpr.cpp \

-	llvm/lib/MC/MCInst.cpp llvm/lib/Target/TargetELFWriterInfo.cpp \

 	llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp \

 	llvm/lib/Target/X86/X86COFFMachineModuleInfo.cpp \

 	llvm/lib/Target/X86/X86CodeEmitter.cpp \

@@ -352,16 +396,9 @@ am__libllvmx86codegen_la_SOURCES_DIST =  \

 	llvm/lib/Target/X86/X86TargetMachine.cpp \

 	llvm/lib/Target/X86/X86TargetObjectFile.cpp

 @BUILD_X86_TRUE@am_libllvmx86codegen_la_OBJECTS = libllvmx86codegen_la-DeadMachineInstructionElim.lo \

-@BUILD_X86_TRUE@	libllvmx86codegen_la-MachineDominators.lo \

-@BUILD_X86_TRUE@	libllvmx86codegen_la-MachineLoopInfo.lo \

 @BUILD_X86_TRUE@	libllvmx86codegen_la-MachineModuleInfoImpls.lo \

-@BUILD_X86_TRUE@	libllvmx86codegen_la-FastISel.lo \

 @BUILD_X86_TRUE@	libllvmx86codegen_la-MCAsmInfoCOFF.lo \

 @BUILD_X86_TRUE@	libllvmx86codegen_la-MCCodeEmitter.lo \

-@BUILD_X86_TRUE@	libllvmx86codegen_la-MCContext.lo \

-@BUILD_X86_TRUE@	libllvmx86codegen_la-MCExpr.lo \

-@BUILD_X86_TRUE@	libllvmx86codegen_la-MCInst.lo \

-@BUILD_X86_TRUE@	libllvmx86codegen_la-TargetELFWriterInfo.lo \

 @BUILD_X86_TRUE@	libllvmx86codegen_la-X86TargetInfo.lo \

 @BUILD_X86_TRUE@	libllvmx86codegen_la-X86COFFMachineModuleInfo.lo \

 @BUILD_X86_TRUE@	libllvmx86codegen_la-X86CodeEmitter.lo \

@@ -392,56 +429,61 @@ count_OBJECTS = $(am_count_OBJECTS)

 count_DEPENDENCIES = libllvmsystem.la

 am_llc_OBJECTS = llc-MCInstPrinter.$(OBJEXT) llc-llc.$(OBJEXT)

 llc_OBJECTS = $(am_llc_OBJECTS)

-llc_DEPENDENCIES = libllvmbitreader.la libllvmasmparser.la \

-	libllvmasmprinter.la $(libclamavcxx_la_LIBADD)

+llc_DEPENDENCIES = libllvmbitreader.la libllvmasmprinter.la \

+	libllvmasmparser.la $(lli_LDADD)

 llc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \

 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(llc_CXXFLAGS) \

 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

-am_lli_OBJECTS = lli-OProfileJITEventListener.$(OBJEXT) \

-	lli-lli.$(OBJEXT)

+am_lli_OBJECTS = lli.$(OBJEXT)

 lli_OBJECTS = $(am_lli_OBJECTS)

-lli_DEPENDENCIES = libllvmbitreader.la libllvminterpreter.la \

-	$(libclamavcxx_la_LIBADD)

-lli_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \

-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(lli_CXXFLAGS) \

-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

+lli_DEPENDENCIES = libllvmbitreader.la libllvmfullcodegen.la \

+	libllvmjit.la $(am__append_3) $(am__append_7) $(am__append_11) \

+	libllvmfullcodegen.la libllvmcodegen.la libllvmjit.la \

+	libllvmsupport.la libllvmsystem.la

 am_llvm_as_OBJECTS = llvm_as-llvm-as.$(OBJEXT)

 llvm_as_OBJECTS = $(am_llvm_as_OBJECTS)

 llvm_as_DEPENDENCIES = libllvmasmparser.la libllvmbitwriter.la \

-	libllvmcore.la libllvmsupport.la libllvmsystem.la

+	libllvmjit.la libllvmsupport.la libllvmsystem.la

 llvm_as_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \

 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(llvm_as_CXXFLAGS) \

 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

 am_llvm_dis_OBJECTS = llvm_dis-llvm-dis.$(OBJEXT)

 llvm_dis_OBJECTS = $(am_llvm_dis_OBJECTS)

 llvm_dis_DEPENDENCIES = libllvmasmparser.la libllvmbitreader.la \

-	libllvmcore.la libllvmsupport.la libllvmsystem.la

+	libllvmjit.la libllvmsupport.la libllvmsystem.la

 llvm_dis_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \

 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(llvm_dis_CXXFLAGS) \

 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

-am_llvmunittest_ADT_OBJECTS = APFloatTest.$(OBJEXT) \

-	APIntTest.$(OBJEXT) DenseMapTest.$(OBJEXT) \

-	DenseSetTest.$(OBJEXT) ImmutableSetTest.$(OBJEXT) \

-	SmallStringTest.$(OBJEXT) SmallVectorTest.$(OBJEXT) \

-	SparseBitVectorTest.$(OBJEXT) StringMapTest.$(OBJEXT) \

-	StringRefTest.$(OBJEXT) TripleTest.$(OBJEXT) \

-	TwineTest.$(OBJEXT)

+am_llvmunittest_ADT_OBJECTS = llvmunittest_ADT-APFloatTest.$(OBJEXT) \

+	llvmunittest_ADT-APIntTest.$(OBJEXT) \

+	llvmunittest_ADT-DenseMapTest.$(OBJEXT) \

+	llvmunittest_ADT-DenseSetTest.$(OBJEXT) \

+	llvmunittest_ADT-ImmutableSetTest.$(OBJEXT) \

+	llvmunittest_ADT-SmallStringTest.$(OBJEXT) \

+	llvmunittest_ADT-SmallVectorTest.$(OBJEXT) \

+	llvmunittest_ADT-SparseBitVectorTest.$(OBJEXT) \

+	llvmunittest_ADT-StringMapTest.$(OBJEXT) \

+	llvmunittest_ADT-StringRefTest.$(OBJEXT) \

+	llvmunittest_ADT-TripleTest.$(OBJEXT) \

+	llvmunittest_ADT-TwineTest.$(OBJEXT)

 llvmunittest_ADT_OBJECTS = $(am_llvmunittest_ADT_OBJECTS)

-llvmunittest_ADT_DEPENDENCIES = libgoogletest.la libllvmcore.la \

+llvmunittest_ADT_DEPENDENCIES = libgoogletest.la libllvmjit.la \

 	libllvmsupport.la libllvmsystem.la

 am_llvmunittest_ExecutionEngine_OBJECTS =  \

+	llvmunittest_ExecutionEngine-IntrinsicLowering.$(OBJEXT) \

 	llvmunittest_ExecutionEngine-ExecutionEngineTest.$(OBJEXT)

 llvmunittest_ExecutionEngine_OBJECTS =  \

 	$(am_llvmunittest_ExecutionEngine_OBJECTS)

 llvmunittest_ExecutionEngine_DEPENDENCIES = libgoogletest.la \

-	libllvminterpreter.la $(libclamavcxx_la_LIBADD)

+	libllvminterpreter.la $(libclamavcxx_la_LIBADD) \

+	libllvmsupport.la libllvmsystem.la

 am_llvmunittest_JIT_OBJECTS =  \

 	llvmunittest_JIT-JITEventListenerTest.$(OBJEXT) \

 	llvmunittest_JIT-JITMemoryManagerTest.$(OBJEXT) \

 	llvmunittest_JIT-JITTest.$(OBJEXT)

 llvmunittest_JIT_OBJECTS = $(am_llvmunittest_JIT_OBJECTS)

 llvmunittest_JIT_DEPENDENCIES = libgoogletest.la libllvmasmparser.la \

-	$(libclamavcxx_la_LIBADD)

+	$(lli_LDADD)

 am_llvmunittest_Support_OBJECTS =  \

 	llvmunittest_Support-AllocatorTest.$(OBJEXT) \

 	llvmunittest_Support-ConstantRangeTest.$(OBJEXT) \

@@ -451,17 +493,19 @@ am_llvmunittest_Support_OBJECTS =  \

 	llvmunittest_Support-ValueHandleTest.$(OBJEXT) \

 	llvmunittest_Support-raw_ostream_test.$(OBJEXT)

 llvmunittest_Support_OBJECTS = $(am_llvmunittest_Support_OBJECTS)

-llvmunittest_Support_DEPENDENCIES = libgoogletest.la libllvmcore.la \

+llvmunittest_Support_DEPENDENCIES = libgoogletest.la libllvmjit.la \

 	libllvmsupport.la libllvmsystem.la

 am_llvmunittest_VMCore_OBJECTS =  \

+	llvmunittest_VMCore-CallGraph.$(OBJEXT) \

 	llvmunittest_VMCore-CallGraphSCCPass.$(OBJEXT) \

+	llvmunittest_VMCore-LoopInfo.$(OBJEXT) \

+	llvmunittest_VMCore-LoopPass.$(OBJEXT) \

 	llvmunittest_VMCore-ConstantsTest.$(OBJEXT) \

 	llvmunittest_VMCore-MetadataTest.$(OBJEXT) \

 	llvmunittest_VMCore-PassManagerTest.$(OBJEXT)

 llvmunittest_VMCore_OBJECTS = $(am_llvmunittest_VMCore_OBJECTS)

-llvmunittest_VMCore_DEPENDENCIES = libgoogletest.la libllvmtarget.la \

-	libllvmipa.la libllvmcore.la libllvmsupport.la \

-	libllvmsystem.la

+llvmunittest_VMCore_DEPENDENCIES = libgoogletest.la libllvmjit.la \

+	libllvmsupport.la libllvmsystem.la

 am_not_OBJECTS = not-not.$(OBJEXT)

 not_OBJECTS = $(am_not_OBJECTS)

 not_DEPENDENCIES = libllvmsystem.la

@@ -539,6 +583,7 @@ SOURCES = $(libclamavcxx_la_SOURCES) $(libgoogletest_la_SOURCES) \

 	$(libllvmarmcodegen_la_SOURCES) $(libllvmasmparser_la_SOURCES) \

 	$(libllvmasmprinter_la_SOURCES) $(libllvmbitreader_la_SOURCES) \

 	$(libllvmbitwriter_la_SOURCES) $(libllvmcodegen_la_SOURCES) \

+	$(libllvmfullcodegen_la_SOURCES) \

 	$(libllvminterpreter_la_SOURCES) $(libllvmjit_la_SOURCES) \

 	$(libllvmpowerpccodegen_la_SOURCES) \

 	$(libllvmsupport_la_SOURCES) $(libllvmsystem_la_SOURCES) \

@@ -555,8 +600,8 @@ DIST_SOURCES = $(libclamavcxx_la_SOURCES) $(libgoogletest_la_SOURCES) \

 	$(libllvmasmparser_la_SOURCES) \

 	$(am__libllvmasmprinter_la_SOURCES_DIST) \

 	$(libllvmbitreader_la_SOURCES) $(libllvmbitwriter_la_SOURCES) \

-	$(libllvmcodegen_la_SOURCES) $(libllvminterpreter_la_SOURCES) \

-	$(libllvmjit_la_SOURCES) \

+	$(libllvmcodegen_la_SOURCES) $(libllvmfullcodegen_la_SOURCES) \

+	$(libllvminterpreter_la_SOURCES) $(libllvmjit_la_SOURCES) \

 	$(am__libllvmpowerpccodegen_la_SOURCES_DIST) \

 	$(libllvmsupport_la_SOURCES) $(libllvmsystem_la_SOURCES) \

 	$(am__libllvmx86codegen_la_SOURCES_DIST) $(FileCheck_SOURCES) \

@@ -742,17 +787,20 @@ ACLOCAL_AMFLAGS = -I m4

 #libclamavcxx_la_DEPENDENCIES = $(LLVM_DEPS)

 noinst_LTLIBRARIES = libclamavcxx.la libllvmsupport.la \

 	libllvmsystem.la libllvmcodegen.la libllvmjit.la \

-	$(am__append_3) $(am__append_6) $(am__append_9)

-libclamavcxx_la_LIBADD = libllvmjit.la libllvmcodegen.la \

-	libllvmsystem.la $(am__append_1) $(am__append_4) \

-	$(am__append_7)

+	$(am__append_4) $(am__append_8) $(am__append_12)

+lli_LDADD = libllvmbitreader.la libllvmfullcodegen.la libllvmjit.la \

+	$(am__append_3) $(am__append_7) $(am__append_11) \

+	libllvmfullcodegen.la libllvmcodegen.la libllvmjit.la \

+	libllvmsupport.la libllvmsystem.la

+libclamavcxx_la_LIBADD = libllvmjit.la $(am__append_1) $(am__append_5) \

+	$(am__append_9) libllvmcodegen.la libllvmsystem.la

 libclamavcxx_la_DEPENDENCIES = libllvmjit.la libllvmcodegen.la \

-	libllvmsystem.la $(am__append_2) $(am__append_5) \

-	$(am__append_8)

+	libllvmsystem.la $(am__append_2) $(am__append_6) \

+	$(am__append_10)

 libclamavcxx_la_LDFLAGS = -no-undefined

 libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS)

 libclamavcxx_la_SOURCES = bytecode2llvm.cpp

-LLVM_CXXFLAGS = -Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings

+LLVM_CXXFLAGS = -Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -Wno-missing-field-initializers -Wno-variadic-macros

 EXTRA_DIST = $(top_srcdir)/llvm llvmdejagnu.sh

 libllvmsystem_la_LDFLAGS = -pthread

 libllvmsystem_la_LIBADD = -ldl

@@ -852,24 +900,17 @@ tblgen_SOURCES = \

 TBLGEN = $(top_builddir)/tblgen

 TBLGEN_V = $(AM_V_GEN)$(TBLGEN)

 TBLGEN_FLAGS = -I$(top_srcdir)/llvm/include -I$(top_srcdir)/llvm/lib/Target

-BUILT_SOURCES = llvm/include/llvm/Intrinsics.gen $(am__append_10) \

-	$(am__append_11) $(am__append_12)

+BUILT_SOURCES = llvm/include/llvm/Intrinsics.gen $(am__append_13) \

+	$(am__append_14) $(am__append_15)

 # X86 Target

 @BUILD_X86_TRUE@TBLGEN_FLAGS_X86 = $(TBLGEN_FLAGS) -I$(top_srcdir)/llvm/lib/Target/X86

 @BUILD_X86_TRUE@libllvmx86codegen_la_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_builddir) -I$(top_srcdir)/llvm/lib/Target/X86

 @BUILD_X86_TRUE@libllvmx86codegen_la_SOURCES = \

 @BUILD_X86_TRUE@	llvm/lib/CodeGen/DeadMachineInstructionElim.cpp\

-@BUILD_X86_TRUE@	llvm/lib/CodeGen/MachineDominators.cpp\

-@BUILD_X86_TRUE@	llvm/lib/CodeGen/MachineLoopInfo.cpp\

 @BUILD_X86_TRUE@	llvm/lib/CodeGen/MachineModuleInfoImpls.cpp\

-@BUILD_X86_TRUE@	llvm/lib/CodeGen/SelectionDAG/FastISel.cpp\

 @BUILD_X86_TRUE@	llvm/lib/MC/MCAsmInfoCOFF.cpp\

 @BUILD_X86_TRUE@	llvm/lib/MC/MCCodeEmitter.cpp\

-@BUILD_X86_TRUE@	llvm/lib/MC/MCContext.cpp\

-@BUILD_X86_TRUE@	llvm/lib/MC/MCExpr.cpp\

-@BUILD_X86_TRUE@	llvm/lib/MC/MCInst.cpp\

-@BUILD_X86_TRUE@	llvm/lib/Target/TargetELFWriterInfo.cpp\

 @BUILD_X86_TRUE@	llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp\

 @BUILD_X86_TRUE@	llvm/lib/Target/X86/X86COFFMachineModuleInfo.cpp\

 @BUILD_X86_TRUE@	llvm/lib/Target/X86/X86CodeEmitter.cpp\

@@ -892,7 +933,6 @@ BUILT_SOURCES = llvm/include/llvm/Intrinsics.gen $(am__append_10) \

 @BUILD_PPC_TRUE@TBLGEN_FLAGS_PPC = $(TBLGEN_FLAGS) -I$(top_srcdir)/llvm/lib/Target/PowerPC

 @BUILD_PPC_TRUE@libllvmpowerpccodegen_la_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_builddir) -I$(top_srcdir)/llvm/lib/Target/PowerPC

 @BUILD_PPC_TRUE@libllvmpowerpccodegen_la_SOURCES = \

-@BUILD_PPC_TRUE@	llvm/lib/CodeGen/ScheduleDAG.cpp\

 @BUILD_PPC_TRUE@	llvm/lib/Target/PowerPC/PPCBranchSelector.cpp\

 @BUILD_PPC_TRUE@	llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp\

 @BUILD_PPC_TRUE@	llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp\

@@ -906,8 +946,7 @@ BUILT_SOURCES = llvm/include/llvm/Intrinsics.gen $(am__append_10) \

 @BUILD_PPC_TRUE@	llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp\

 @BUILD_PPC_TRUE@	llvm/lib/Target/PowerPC/PPCSubtarget.cpp\

 @BUILD_PPC_TRUE@	llvm/lib/Target/PowerPC/PPCTargetMachine.cpp\

-@BUILD_PPC_TRUE@	llvm/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp\

-@BUILD_PPC_TRUE@	llvm/lib/Target/TargetMachOWriterInfo.cpp

+@BUILD_PPC_TRUE@	llvm/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp

 # ARM Target

@@ -943,10 +982,24 @@ BUILT_SOURCES = llvm/include/llvm/Intrinsics.gen $(am__append_10) \

 # End of Targets

 libllvmjit_la_SOURCES = \

+	llvm/lib/Analysis/AliasAnalysis.cpp\

+	llvm/lib/Analysis/BasicAliasAnalysis.cpp\

+	llvm/lib/Analysis/CaptureTracking.cpp\

+	llvm/lib/Analysis/DebugInfo.cpp\