Update LLVM for merge to r187913.

Add HAVE_FUTIMENS to */include/llvm/Config/config.h

Update version number to 3.3 (even though this is tracking 3.4)

Removed lib/Archive

Added lib/Option

Android.mk changes:
- PathV2.cpp
- SimplifyLibCalls.cpp
- BlackList.cpp
- VecUtils.cpp
+ MD5.cpp
+ CFG.cpp
+ SpecialCaseList.cpp
+ MachOUniversal.cpp
+ StructurizeCFG.cpp

Change-Id: I8ee072cd0d4210a6a5492c0e6663f8464ff21386

15 files changed, 34 insertions, 18 deletions

diff --git a/Android.mk b/Android.mk
index c495e6c..475c8ce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,7 +8,6 @@ include $(CLEAR_VARS)
 subdirs := \
   lib/Analysis \
   lib/Analysis/IPA \
-  lib/Archive \
   lib/AsmParser \
   lib/Bitcode/Reader \
   lib/Bitcode/Writer \
@@ -22,6 +21,7 @@ subdirs := \
   lib/MC \
   lib/MC/MCParser \
   lib/Object \
+  lib/Option \
   lib/Support \
   lib/TableGen \
   lib/Target \
diff --git a/README.android b/README.android
index f12faa7..3cac705 100644
--- a/README.android
+++ b/README.android
@@ -21,8 +21,9 @@
 * For Jellybean: Synced to upstream r155090
 * For Jellybean MR1: Synced to upstream r162314
 * For Jellybean MR2: Synced to upstream r177342
-* For Key Lime Pie: Synced to upstream r183849
+* For Key Lime Pie: Synced to upstream r187913
 
+* Recent downstreaming on 2013/8/8: Synced to r187913 (Contact srhines for merge questions.)
 * Recent downstreaming on 2013/6/13: Synced to r183849 (Contact srhines for merge questions.)
 * Recent downstreaming on 2013/5/3: Synced to r180947 (Contact srhines for merge questions.)
 * Recent downstreaming on 2013/3/18: Synced to r177342 (Contact srhines for merge questions.)
diff --git a/device/include/llvm/Config/config.h b/device/include/llvm/Config/config.h
index e0ee708..cb28ba5 100644
--- a/device/include/llvm/Config/config.h
+++ b/device/include/llvm/Config/config.h
@@ -147,6 +147,9 @@
 /* Define to 1 if you have the `fmodf' function. */
 #define HAVE_FMODF 1
 
+/* Define to 1 if you have the `futimens' function. */
+#define HAVE_FUTIMENS 1
+
 /* Define to 1 if you have the `getcwd' function. */
 #define HAVE_GETCWD 1
 
diff --git a/device/include/llvm/Config/llvm-config.h b/device/include/llvm/Config/llvm-config.h
index ca49e77..e809281 100644
--- a/device/include/llvm/Config/llvm-config.h
+++ b/device/include/llvm/Config/llvm-config.h
@@ -87,7 +87,7 @@
 #define LLVM_VERSION_MAJOR 3
 
 /* Minor version of the LLVM API */
-#define LLVM_VERSION_MINOR 1
+#define LLVM_VERSION_MINOR 3
 
 #include "llvm/Config/llvm-platform-config.h"
 
diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h
index e6c59c6..17577c6 100644
--- a/host/include/llvm/Config/config.h
+++ b/host/include/llvm/Config/config.h
@@ -144,6 +144,9 @@
 /* Define to 1 if you have the `fmodf' function. */
 #define HAVE_FMODF 1
 
+/* Define to 1 if you have the `futimens' function. */
+#define HAVE_FUTIMENS 1
+
 /* Define to 1 if you have the `getcwd' function. */
 #define HAVE_GETCWD 1
 
diff --git a/host/include/llvm/Config/llvm-config.h b/host/include/llvm/Config/llvm-config.h
index 964a00a..8637f41 100644
--- a/host/include/llvm/Config/llvm-config.h
+++ b/host/include/llvm/Config/llvm-config.h
@@ -95,7 +95,7 @@
 #define LLVM_VERSION_MAJOR 3
 
 /* Minor version of the LLVM API */
-#define LLVM_VERSION_MINOR 1
+#define LLVM_VERSION_MINOR 3
 
 #include "llvm/Config/llvm-platform-config.h"
 
diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index 74fa9d7..7e0bccc 100644
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -10,6 +10,7 @@ analysis_SRC_FILES := \
   BasicAliasAnalysis.cpp \
   BlockFrequencyInfo.cpp \
   BranchProbabilityInfo.cpp \
+  CFG.cpp \
   CFGPrinter.cpp \
   CaptureTracking.cpp \
   CodeMetrics.cpp \
diff --git a/lib/Object/Android.mk b/lib/Object/Android.mk
index e4f499d..09dcda6 100644
--- a/lib/Object/Android.mk
+++ b/lib/Object/Android.mk
@@ -7,6 +7,7 @@ object_SRC_FILES := \
   ELFObjectFile.cpp \
   Error.cpp \
   MachOObjectFile.cpp \
+  MachOUniversal.cpp \
   Object.cpp \
   ObjectFile.cpp
 
diff --git a/lib/Archive/Android.mk b/lib/Option/Android.mk
index e679f60..a90af3c 100644
--- a/lib/Archive/Android.mk
+++ b/lib/Option/Android.mk
@@ -1,17 +1,23 @@
 LOCAL_PATH:= $(call my-dir)
 
-archive_SRC_FILES := \
-	Archive.cpp \
-	ArchiveReader.cpp \
-	ArchiveWriter.cpp
+option_SRC_FILES := \
+    Arg.cpp \
+    ArgList.cpp \
+    Option.cpp \
+    OptTable.cpp
 
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(archive_SRC_FILES)
+# FIXME: This only requires RTTI because tblgen uses it.  Fix that.
+REQUIRES_RTTI := 1
 
-LOCAL_MODULE:= libLLVMArchive
+LOCAL_SRC_FILES := $(option_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMOption
+
+LOCAL_CFLAGS := -D__android__
 
 LOCAL_MODULE_TAGS := optional
 
@@ -22,9 +28,11 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(archive_SRC_FILES)
+LOCAL_SRC_FILES := $(option_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMOption
 
-LOCAL_MODULE := libLLVMArchive
+LOCAL_CFLAGS := -D__android__
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index 11c6b36..f07ad12 100644
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -35,13 +35,13 @@ support_SRC_FILES := \
   IsNAN.cpp \
   Locale.cpp \
   LockFileManager.cpp \
+  MD5.cpp \
   ManagedStatic.cpp \
   Memory.cpp \
   MemoryBuffer.cpp \
   MemoryObject.cpp \
   Mutex.cpp \
   Path.cpp \
-  PathV2.cpp \
   PluginLoader.cpp \
   PrettyStackTrace.cpp \
   Process.cpp \
diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
index 9736619..7182e50 100644
--- a/lib/Transforms/Instrumentation/Android.mk
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -2,7 +2,6 @@ LOCAL_PATH:= $(call my-dir)
 
 instrumentation_SRC_FILES := \
   AddressSanitizer.cpp \
-  BlackList.cpp \
   BoundsChecking.cpp \
   EdgeProfiling.cpp \
   GCOVProfiling.cpp \
diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk
index c20b9d9..d2e1478 100644
--- a/lib/Transforms/Scalar/Android.mk
+++ b/lib/Transforms/Scalar/Android.mk
@@ -30,8 +30,8 @@ transforms_scalar_SRC_FILES := \
   Scalar.cpp \
   ScalarReplAggregates.cpp \
   SimplifyCFGPass.cpp \
-  SimplifyLibCalls.cpp \
   Sink.cpp \
+  StructurizeCFG.cpp \
   TailRecursionElimination.cpp
 
 # For the host
diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk
index df87208..9bf9ef3 100644
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -29,6 +29,7 @@ transforms_utils_SRC_FILES := \
   SimplifyIndVar.cpp \
   SimplifyInstructions.cpp \
   SimplifyLibCalls.cpp \
+  SpecialCaseList.cpp \
   UnifyFunctionExitNodes.cpp \
   Utils.cpp \
   ValueMapper.cpp
diff --git a/lib/Transforms/Vectorize/Android.mk b/lib/Transforms/Vectorize/Android.mk
index 58698fe..2778900 100644
--- a/lib/Transforms/Vectorize/Android.mk
+++ b/lib/Transforms/Vectorize/Android.mk
@@ -4,8 +4,7 @@ transforms_vectorize_SRC_FILES := \
   BBVectorize.cpp \
   LoopVectorize.cpp \
   SLPVectorizer.cpp \
-  Vectorize.cpp \
-  VecUtils.cpp
+  Vectorize.cpp
 
 # For the host
 # =====================================================
diff --git a/shared_llvm.mk b/shared_llvm.mk
index 3fac2f5..128bc6b 100644
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -51,8 +51,8 @@ llvm_post_static_libraries := \
   libLLVMMC \
   libLLVMMCParser \
   libLLVMCore \
-  libLLVMArchive \
   libLLVMAsmParser \
+  libLLVMOption \
   libLLVMSupport \
   libLLVMVectorize