diff options
| author | Shih-wei Liao <sliao@google.com> | 2012-03-22 11:33:00 -0700 |
|---|---|---|
| committer | Shih-wei Liao <sliao@google.com> | 2012-03-24 15:51:31 -0700 |
| commit | 3770f605b522e34ef4a1fabb4dcaa2e76a7a2d96 (patch) | |
| tree | 65300fe8cfe4b217c09509d60f567a284bb6bd3a | |
| parent | c59a7995d22e2889706810c90a20a51ecfec278b (diff) | |
| download | external_llvm-3770f605b522e34ef4a1fabb4dcaa2e76a7a2d96.zip external_llvm-3770f605b522e34ef4a1fabb4dcaa2e76a7a2d96.tar.gz external_llvm-3770f605b522e34ef4a1fabb4dcaa2e76a7a2d96.tar.bz2 | |
Migrate external/llvm to LLVM-153224-20120321.
Change-Id: I93619a538c59e5b1280d46534dac322fbccd14f7
| -rw-r--r-- | include/llvm/Support/ELF.h | 8 | ||||
| -rw-r--r-- | lib/Analysis/Android.mk | 1 | ||||
| -rw-r--r-- | lib/CodeGen/Android.mk | 1 | ||||
| -rw-r--r-- | lib/CodeGen/SelectionDAG/Android.mk | 1 | ||||
| -rw-r--r-- | lib/ExecutionEngine/JIT/Android.mk | 18 | ||||
| -rw-r--r-- | lib/Transforms/Instrumentation/Android.mk | 1 | ||||
| -rw-r--r-- | lib/Transforms/Utils/Android.mk | 1 |
7 files changed, 6 insertions, 25 deletions
diff --git a/include/llvm/Support/ELF.h b/include/llvm/Support/ELF.h index 7123432..5c5e4a1 100644 --- a/include/llvm/Support/ELF.h +++ b/include/llvm/Support/ELF.h @@ -734,18 +734,14 @@ enum { SHT_GROUP = 17, // Section group. SHT_SYMTAB_SHNDX = 18, // Indices for SHN_XINDEX entries. SHT_LOOS = 0x60000000, // Lowest operating system-specific type. + SHT_GNU_ATTRIBUTES= 0x6ffffff5, // Object attributes. + SHT_GNU_HASH = 0x6ffffff6, // GNU style dynamic hash table. SHT_GNU_verdef = 0x6ffffffd, // GNU version definitions. SHT_GNU_verneed = 0x6ffffffe, // GNU version references. SHT_GNU_versym = 0x6fffffff, // GNU symbol versions table. SHT_HIOS = 0x6fffffff, // Highest operating system-specific type. SHT_LOPROC = 0x70000000, // Lowest processor architecture-specific type. - SHT_GNU_ATTRIBUTES = 0x6ffffff5, // Object attributes. - SHT_GNU_HASH = 0x6ffffff6, // GNU style dynamic hash table. - SHT_GNU_verdef = 0x6ffffffd, // Versions defined by file. - SHT_GNU_verneed = 0x6ffffffe, // Versions needed by file. - SHT_GNU_versym = 0x6fffffff, // Symbol versions. - // Fixme: All this is duplicated in MCSectionELF. Why?? // Exception Index table SHT_ARM_EXIDX = 0x70000001U, diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk index e493ba7..aa90805 100644 --- a/lib/Analysis/Android.mk +++ b/lib/Analysis/Android.mk @@ -12,6 +12,7 @@ analysis_SRC_FILES := \ BranchProbabilityInfo.cpp \ CFGPrinter.cpp \ CaptureTracking.cpp \ + CodeMetrics.cpp \ ConstantFolding.cpp \ DIBuilder.cpp \ DbgInfoPrinter.cpp \ diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk index fe1eff1..5378e2e 100644 --- a/lib/CodeGen/Android.mk +++ b/lib/CodeGen/Android.mk @@ -80,7 +80,6 @@ codegen_SRC_FILES := \ RegisterScavenging.cpp \ RenderMachineFunction.cpp \ ScheduleDAG.cpp \ - ScheduleDAGEmit.cpp \ ScheduleDAGInstrs.cpp \ ScheduleDAGPrinter.cpp \ ScoreboardHazardRecognizer.cpp \ diff --git a/lib/CodeGen/SelectionDAG/Android.mk b/lib/CodeGen/SelectionDAG/Android.mk index 329a82a..3f28e08 100644 --- a/lib/CodeGen/SelectionDAG/Android.mk +++ b/lib/CodeGen/SelectionDAG/Android.mk @@ -19,6 +19,7 @@ codegen_selectiondag_SRC_FILES := \ ScheduleDAGVLIW.cpp \ SelectionDAG.cpp \ SelectionDAGBuilder.cpp \ + SelectionDAGDumper.cpp \ SelectionDAGISel.cpp \ SelectionDAGPrinter.cpp \ TargetLowering.cpp \ diff --git a/lib/ExecutionEngine/JIT/Android.mk b/lib/ExecutionEngine/JIT/Android.mk index c978266..02cef81 100644 --- a/lib/ExecutionEngine/JIT/Android.mk +++ b/lib/ExecutionEngine/JIT/Android.mk @@ -5,12 +5,10 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - Intercept.cpp \ JIT.cpp \ JITDwarfEmitter.cpp \ JITEmitter.cpp \ - JITMemoryManager.cpp \ - OProfileJITEventListener.cpp + JITMemoryManager.cpp LOCAL_MODULE:= libLLVMJIT @@ -18,17 +16,3 @@ LOCAL_MODULE_TAGS := optional include $(LLVM_HOST_BUILD_MK) include $(BUILD_HOST_STATIC_LIBRARY) - -# For the device -# ===================================================== -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - JITMemoryManager.cpp - -LOCAL_MODULE:= libLLVMJIT - -LOCAL_MODULE_TAGS := optional - -include $(LLVM_DEVICE_BUILD_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk index 592e77e..c4df8ac 100644 --- a/lib/Transforms/Instrumentation/Android.mk +++ b/lib/Transforms/Instrumentation/Android.mk @@ -3,6 +3,7 @@ LOCAL_PATH:= $(call my-dir) instrumentation_SRC_FILES := \ AddressSanitizer.cpp \ EdgeProfiling.cpp \ + FunctionBlackList.cpp \ GCOVProfiling.cpp \ Instrumentation.cpp \ OptimalEdgeProfiling.cpp \ diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk index de40f3e..5a908d0 100644 --- a/lib/Transforms/Utils/Android.mk +++ b/lib/Transforms/Utils/Android.mk @@ -3,7 +3,6 @@ LOCAL_PATH:= $(call my-dir) transforms_utils_SRC_FILES := \ AddrModeMatcher.cpp \ BasicBlockUtils.cpp \ - BasicInliner.cpp \ BreakCriticalEdges.cpp \ BuildLibCalls.cpp \ CloneFunction.cpp \ |