From 68aeecc773d36c4be9adf32d1f09ec739574c880 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Mon, 10 Sep 2012 20:13:51 -0700
Subject: Merge up through LLVM r163557.

Updated Android.mk source files for Analysis, CodeGen, Target/Mips,
Transforms/Instrumentation, and Transforms/Utils.

Change-Id: I232a895e3ad9ec0c4a66f4308a11bb794b67940f
---
 lib/Transforms/Instrumentation/Android.mk | 2 +-
 lib/Transforms/Utils/Android.mk           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/Transforms')

diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
index cc7a9da..a6512bf 100644
--- a/lib/Transforms/Instrumentation/Android.mk
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -2,9 +2,9 @@ LOCAL_PATH:= $(call my-dir)
 
 instrumentation_SRC_FILES := \
   AddressSanitizer.cpp \
+  BlackList.cpp \
   BoundsChecking.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 5a908d0..c3f0789 100644
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -5,6 +5,7 @@ transforms_utils_SRC_FILES := \
   BasicBlockUtils.cpp \
   BreakCriticalEdges.cpp \
   BuildLibCalls.cpp \
+  BypassSlowDivision.cpp \
   CloneFunction.cpp \
   CloneModule.cpp \
   CmpInstAnalysis.cpp \
-- 
cgit v1.1