Update build scripts after merge r127116
diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index 3b0f124..17e4b37 100644
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -11,8 +11,10 @@
CFGPrinter.cpp \
CaptureTracking.cpp \
ConstantFolding.cpp \
+ DIBuilder.cpp \
DbgInfoPrinter.cpp \
DebugInfo.cpp \
+ DominanceFrontier.cpp \
DomPrinter.cpp \
IVUsers.cpp \
InlineCost.cpp \
@@ -23,7 +25,6 @@
LazyValueInfo.cpp \
LibCallAliasAnalysis.cpp \
LibCallSemantics.cpp \
- LiveValues.cpp \
Loads.cpp \
NoAliasAnalysis.cpp \
MemDepPrinter.cpp \
@@ -33,6 +34,9 @@
LoopDependenceAnalysis.cpp \
LoopInfo.cpp \
LoopPass.cpp \
+ PathNumbering.cpp \
+ PathProfileInfo.cpp \
+ PathProfileVerifier.cpp \
PHITransAddr.cpp \
PostDominators.cpp \
ProfileEstimatorPass.cpp \
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index 8875792..16e0f88 100644
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -10,8 +10,10 @@
CriticalAntiDepBreaker.cpp \
DeadMachineInstructionElim.cpp \
DwarfEHPrepare.cpp \
+ EdgeBundles.cpp \
ELFCodeEmitter.cpp \
ELFWriter.cpp \
+ ExpandISelPseudos.cpp \
GCMetadata.cpp \
GCMetadataPrinter.cpp \
GCStrategy.cpp \
@@ -20,6 +22,7 @@
IntrinsicLowering.cpp \
LLVMTargetMachine.cpp \
LatencyPriorityQueue.cpp \
+ LiveDebugVariables.cpp \
LiveInterval.cpp \
LiveIntervalAnalysis.cpp \
LiveRangeEdit.cpp \
@@ -48,9 +51,9 @@
OcamlGC.cpp \
OptimizePHIs.cpp \
PHIElimination.cpp \
+ PHIEliminationUtils.cpp \
Passes.cpp \
PeepholeOptimizer.cpp \
- PostRAHazardRecognizer.cpp \
PostRASchedulerList.cpp \
PreAllocSplitting.cpp \
ProcessImplicitDefs.cpp \
@@ -66,6 +69,7 @@
ScheduleDAGEmit.cpp \
ScheduleDAGInstrs.cpp \
ScheduleDAGPrinter.cpp \
+ ScoreboardHazardRecognizer.cpp \
ShadowStackGC.cpp \
ShrinkWrapping.cpp \
SimpleRegisterCoalescing.cpp \
diff --git a/lib/CodeGen/AsmPrinter/Android.mk b/lib/CodeGen/AsmPrinter/Android.mk
index 28b5e44..bc609b3 100644
--- a/lib/CodeGen/AsmPrinter/Android.mk
+++ b/lib/CodeGen/AsmPrinter/Android.mk
@@ -11,9 +11,12 @@
AsmPrinter.cpp \
AsmPrinterDwarf.cpp \
AsmPrinterInlineAsm.cpp \
+ ARMException.cpp \
DIE.cpp \
+ DwarfCFIException.cpp \
DwarfDebug.cpp \
DwarfException.cpp \
+ DwarfTableException.cpp \
OcamlGCPrinter.cpp
LOCAL_MODULE:= libLLVMAsmPrinter
diff --git a/lib/MC/Android.mk b/lib/MC/Android.mk
index 002888d..658cdbb 100644
--- a/lib/MC/Android.mk
+++ b/lib/MC/Android.mk
@@ -12,16 +12,18 @@
MCContext.cpp \
MCDisassembler.cpp \
MCDwarf.cpp \
- MCELFStreamer.cpp \
+ MCELF.cpp \
+ MCELFObjectTargetWriter.cpp \
+ MCELFStreamer.cpp \
MCExpr.cpp \
MCInst.cpp \
MCInstPrinter.cpp \
MCLabel.cpp \
MCLoggingStreamer.cpp \
+ MCMachObjectTargetWriter.cpp \
MCMachOStreamer.cpp \
MCNullStreamer.cpp \
- MCObjectFormat.cpp \
- MCObjectStreamer.cpp \
+ MCObjectStreamer.cpp\
MCObjectWriter.cpp \
MCSection.cpp \
MCSectionCOFF.cpp \
diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index 9b73488..7af2025 100644
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -1,10 +1,11 @@
LOCAL_PATH:= $(call my-dir)
support_SRC_FILES := \
+ Allocator.cpp \
APFloat.cpp \
APInt.cpp \
APSInt.cpp \
- Allocator.cpp \
+ Atomic.cpp \
CommandLine.cpp \
ConstantRange.cpp \
CrashRecoveryContext.cpp \
@@ -12,19 +13,33 @@
Debug.cpp \
DeltaAlgorithm.cpp \
Dwarf.cpp \
+ DynamicLibrary.cpp \
+ Errno.cpp \
ErrorHandling.cpp \
FileUtilities.cpp \
FoldingSet.cpp \
FormattedStream.cpp \
GraphWriter.cpp \
+ Host.cpp \
+ IntervalMap.cpp \
+ IntEqClasses.cpp\
IsInf.cpp \
IsNAN.cpp \
ManagedStatic.cpp \
+ Memory.cpp \
MemoryBuffer.cpp \
MemoryObject.cpp \
+ Mutex.cpp \
+ Path.cpp \
+ PathV2.cpp \
PluginLoader.cpp \
PrettyStackTrace.cpp \
+ Process.cpp \
+ Program.cpp \
Regex.cpp \
+ RWMutex.cpp \
+ SearchForAddressOfSpecialSymbol.cpp \
+ Signals.cpp \
SmallPtrSet.cpp \
SmallVector.cpp \
SourceMgr.cpp \
@@ -35,10 +50,14 @@
StringRef.cpp \
SystemUtils.cpp \
TargetRegistry.cpp \
+ Threading.cpp \
+ ThreadLocal.cpp \
Timer.cpp \
+ TimeValue.cpp \
ToolOutputFile.cpp \
Triple.cpp \
Twine.cpp \
+ Valgrind.cpp\
circular_raw_ostream.cpp \
raw_os_ostream.cpp \
raw_ostream.cpp \
@@ -46,7 +65,8 @@
regerror.c \
regexec.c \
regfree.c \
- regstrlcpy.c
+ regstrlcpy.c\
+ system_error.cpp
# For the host
# =====================================================
@@ -59,6 +79,8 @@
LOCAL_MODULE:= libLLVMSupport
+LOCAL_CFLAGS := -D__android__
+
LOCAL_MODULE_TAGS := optional
include $(LLVM_HOST_BUILD_MK)
@@ -72,6 +94,8 @@
LOCAL_MODULE:= libLLVMSupport
+LOCAL_CFLAGS := -D__android__
+
LOCAL_MODULE_TAGS := optional
include $(LLVM_DEVICE_BUILD_MK)
diff --git a/lib/System/Android.mk b/lib/System/Android.mk
deleted file mode 100644
index 73c779e..0000000
--- a/lib/System/Android.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-system_SRC_FILES := \
- Alarm.cpp \
- Atomic.cpp \
- Disassembler.cpp \
- Errno.cpp \
- Host.cpp \
- IncludeFile.cpp \
- Memory.cpp \
- Mutex.cpp \
- Path.cpp \
- Process.cpp \
- Program.cpp \
- RWMutex.cpp \
- Signals.cpp \
- ThreadLocal.cpp \
- Threading.cpp \
- TimeValue.cpp \
- Valgrind.cpp
-
-# For the host
-# =====================================================
-include $(CLEAR_VARS)
-
-REQUIRES_RTTI := 1
-
-LOCAL_SRC_FILES := $(system_SRC_FILES) \
- DynamicLibrary.cpp \
- SearchForAddressOfSpecialSymbol.cpp
-
-LOCAL_CFLAGS += -march=i686
-
-LOCAL_MODULE:= libLLVMSystem
-
-LOCAL_MODULE_TAGS := optional
-
-
-include $(LLVM_HOST_BUILD_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# For the device
-# =====================================================
-include $(CLEAR_VARS)
-
-REQUIRES_RTTI := 1
-
-LOCAL_SRC_FILES := $(system_SRC_FILES)
-
-LOCAL_CFLAGS := -D__android__
-
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_CFLAGS += -I bionic/libc/include
-endif
-
-LOCAL_MODULE:= libLLVMSystem
-
-LOCAL_MODULE_TAGS := optional
-
-include $(LLVM_DEVICE_BUILD_MK)
-include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index 51a257f..9bb6026 100644
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -25,8 +25,9 @@
ARMELFWriterInfo.cpp \
ARMExpandPseudoInsts.cpp \
ARMFastISel.cpp \
- ARMFrameInfo.cpp \
- ARMGlobalMerge.cpp \
+ ARMFrameLowering.cpp \
+ ARMGlobalMerge.cpp \
+ ARMHazardRecognizer.cpp \
ARMISelDAGToDAG.cpp \
ARMISelLowering.cpp \
ARMInstrInfo.cpp \
@@ -34,18 +35,19 @@
ARMLoadStoreOptimizer.cpp \
ARMMCAsmInfo.cpp \
ARMMCCodeEmitter.cpp\
- ARMMCInstLower.cpp \
+ ARMMCExpr.cpp \
+ ARMMCInstLower.cpp \
ARMRegisterInfo.cpp \
ARMSelectionDAGInfo.cpp \
ARMSubtarget.cpp \
ARMTargetMachine.cpp \
ARMTargetObjectFile.cpp \
InstPrinter/ARMInstPrinter.cpp \
+ MLxExpansionPass.cpp \
NEONMoveFix.cpp \
- Thumb1FrameInfo.cpp \
+ Thumb1FrameLowering.cpp \
Thumb1InstrInfo.cpp \
Thumb1RegisterInfo.cpp \
- Thumb2HazardRecognizer.cpp \
Thumb2ITBlockPass.cpp \
Thumb2InstrInfo.cpp \
Thumb2RegisterInfo.cpp \
diff --git a/lib/Target/Android.mk b/lib/Target/Android.mk
index 01b9129..09a33ad 100644
--- a/lib/Target/Android.mk
+++ b/lib/Target/Android.mk
@@ -4,13 +4,15 @@
Mangler.cpp \
SubtargetFeature.cpp \
Target.cpp \
+ TargetAsmInfo.cpp \
TargetAsmLexer.cpp \
TargetData.cpp \
TargetELFWriterInfo.cpp \
- TargetFrameInfo.cpp \
+ TargetFrameLowering.cpp \
TargetInstrInfo.cpp \
TargetIntrinsicInfo.cpp \
TargetLoweringObjectFile.cpp \
+ TargetLibraryInfo.cpp \
TargetMachine.cpp \
TargetRegisterInfo.cpp \
TargetSubtarget.cpp
diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index a30528b..d0e5334 100644
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -1,6 +1,8 @@
LOCAL_PATH := $(call my-dir)
x86_codegen_TBLGEN_TABLES := \
+ X86GenAsmWriter.inc \
+ X86GenAsmWriter1.inc \
X86GenRegisterInfo.h.inc \
X86GenRegisterNames.inc \
X86GenRegisterInfo.inc \
@@ -14,16 +16,18 @@
x86_codegen_SRC_FILES := \
SSEDomainFix.cpp \
X86AsmBackend.cpp \
+ X86AsmPrinter.cpp \
X86COFFMachineModuleInfo.cpp \
X86CodeEmitter.cpp \
X86ELFWriterInfo.cpp \
X86FastISel.cpp \
X86FloatingPoint.cpp\
- X86FrameInfo.cpp \
+ X86FrameLowering.cpp\
X86ISelDAGToDAG.cpp \
X86ISelLowering.cpp \
X86InstrInfo.cpp \
X86JITInfo.cpp \
+ X86MachObjectWriter.cpp \
X86MCAsmInfo.cpp \
X86MCCodeEmitter.cpp \
X86MCInstLower.cpp \
diff --git a/lib/Target/X86/InstPrinter/Android.mk b/lib/Target/X86/InstPrinter/Android.mk
index ccc219f..6f14bcd 100644
--- a/lib/Target/X86/InstPrinter/Android.mk
+++ b/lib/Target/X86/InstPrinter/Android.mk
@@ -26,7 +26,7 @@
LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-LOCAL_MODULE:= libLLVMX86InstPrinter
+LOCAL_MODULE:= libLLVMX86AsmPrinter
LOCAL_MODULE_TAGS := optional
@@ -48,7 +48,7 @@
LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-LOCAL_MODULE := libLLVMX86InstPrinter
+LOCAL_MODULE := libLLVMX86AsmPrinter
LOCAL_MODULE_TAGS := optional
diff --git a/lib/Target/X86/Utils/Android.mk b/lib/Target/X86/Utils/Android.mk
new file mode 100644
index 0000000..1c6694c
--- /dev/null
+++ b/lib/Target/X86/Utils/Android.mk
@@ -0,0 +1,22 @@
+LOCAL_PATH := $(call my-dir)
+
+# For the device only
+# =====================================================
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+TBLGEN_TABLES :=
+
+TBLGEN_TD_DIR := $(LOCAL_PATH)/..
+
+LOCAL_SRC_FILES := X86ShuffleDecode.cpp
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
+
+LOCAL_MODULE:= libLLVMX86Utils
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/lib/Transforms/IPO/Android.mk b/lib/Transforms/IPO/Android.mk
index e7376c7..e939382 100644
--- a/lib/Transforms/IPO/Android.mk
+++ b/lib/Transforms/IPO/Android.mk
@@ -19,7 +19,6 @@
LowerSetJmp.cpp \
MergeFunctions.cpp \
PartialInlining.cpp \
- PartialSpecialization.cpp \
PruneEH.cpp \
StripDeadPrototypes.cpp \
StripSymbols.cpp \
diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
index 29431ed..94f4651 100644
--- a/lib/Transforms/Instrumentation/Android.mk
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -6,7 +6,9 @@
LOCAL_SRC_FILES := \
EdgeProfiling.cpp \
+ Instrumentation.cpp \
ProfilingUtils.cpp \
+ PathProfiling.cpp \
OptimalEdgeProfiling.cpp
LOCAL_MODULE:= libLLVMInstrumentation
diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk
index 25dc32a..662c83c 100644
--- a/lib/Transforms/Scalar/Android.mk
+++ b/lib/Transforms/Scalar/Android.mk
@@ -8,12 +8,13 @@
CorrelatedValuePropagation.cpp \
DCE.cpp \
DeadStoreElimination.cpp \
- GEPSplitter.cpp \
+ EarlyCSE.cpp \
GVN.cpp \
IndVarSimplify.cpp \
JumpThreading.cpp \
LICM.cpp \
LoopDeletion.cpp \
+ LoopIdiomRecognize.cpp \
LoopRotation.cpp \
LoopStrengthReduce.cpp \
LoopUnrollPass.cpp \
@@ -26,7 +27,6 @@
Scalar.cpp \
ScalarReplAggregates.cpp \
SimplifyCFGPass.cpp \
- SimplifyHalfPowrLibCalls.cpp \
SimplifyLibCalls.cpp \
Sink.cpp \
TailDuplication.cpp \
diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk
index 55dadf5..07a2883 100644
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -23,6 +23,7 @@
PromoteMemoryToRegister.cpp \
SSAUpdater.cpp \
SimplifyCFG.cpp \
+ SimplifyInstructions.cpp \
UnifyFunctionExitNodes.cpp \
ValueMapper.cpp
diff --git a/lib/VMCore/Android.mk b/lib/VMCore/Android.mk
index 09b4a0b..6013dca 100644
--- a/lib/VMCore/Android.mk
+++ b/lib/VMCore/Android.mk
@@ -30,6 +30,7 @@
Type.cpp \
TypeSymbolTable.cpp \
Use.cpp \
+ User.cpp\
Value.cpp \
ValueSymbolTable.cpp \
ValueTypes.cpp \