aboutsummaryrefslogtreecommitdiffstats
path: root/lib/CodeGen
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2012-09-13 19:09:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-13 19:09:21 -0700
commit356eedbdcc13dcfdf56bfee99da582532d134370 (patch)
tree4c816050f64e6b7de0984adb5cd3a0a6723c3703 /lib/CodeGen
parent78c041bd883d86c81c42b98f326660277e6d0d9a (diff)
parent68aeecc773d36c4be9adf32d1f09ec739574c880 (diff)
downloadexternal_llvm-356eedbdcc13dcfdf56bfee99da582532d134370.zip
external_llvm-356eedbdcc13dcfdf56bfee99da582532d134370.tar.gz
external_llvm-356eedbdcc13dcfdf56bfee99da582532d134370.tar.bz2
am 68aeecc7: Merge up through LLVM r163557.
* commit '68aeecc773d36c4be9adf32d1f09ec739574c880': Merge up through LLVM r163557.
Diffstat (limited to 'lib/CodeGen')
-rw-r--r--lib/CodeGen/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index 03cf03b..57c4a9b 100644
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -93,6 +93,7 @@ codegen_SRC_FILES := \
SpillPlacement.cpp \
Spiller.cpp \
SplitKit.cpp \
+ StackColoring.cpp \
StackProtector.cpp \
StackSlotColoring.cpp \
StrongPHIElimination.cpp \