From 373aa5c665fe6df6b9c5586d397dc3617f25aab5 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Thu, 6 Feb 2014 23:41:26 -0800
Subject: Update LLVM for merge to 3.4.

Update config.h files.

Add RS SubtargetFeature for +long64 on ARM devices.

Adjust Android.mk for added/removed files:

+  Delinearization.cpp
-  PathNumbering.cpp
-  PathProfileInfo.cpp
-  PathProfileVerifier.cpp
-  ProfileDataLoader.cpp
-  ProfileDataLoaderPass.cpp
-  ProfileEstimatorPass.cpp
-  ProfileInfo.cpp
-  ProfileInfoLoader.cpp
-  ProfileInfoLoaderPass.cpp
-  ProfileVerifierPass.cpp

+  LiveRegUnits.cpp
-  ShrinkWrapping.cpp
+  StackMaps.cpp
-  StrongPHIElimination.cpp

+  DIEHash.cpp

+  LegacyPassManager.cpp

+  ELF.cpp

+  Unicode.cpp

-  MipsOptimizeMathLibCalls.cpp

-  MipsELFStreamer.cpp
+  MipsTargetStreamer.cpp

-  EdgeProfiling.cpp
+  DataFlowSanitizer.cpp
+  DebugIR.cpp
-  OptimalEdgeProfiling.cpp
-  PathProfiling.cpp
-  ProfilingUtils.cpp

-  BasicBlockPlacement.cpp
+  LoopRerollPass.cpp
+  PartiallyInlineLibCalls.cpp
+  SampleProfile.cpp

+  GlobalStatus.cpp

Change-Id: I17dcf0bf53a1720acd8226ae3e30d84993562a91
---
 host/include/llvm/Config/config.h      | 6 +++---
 host/include/llvm/Config/llvm-config.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'host')

diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h
index c889158..6e2bea5 100644
--- a/host/include/llvm/Config/config.h
+++ b/host/include/llvm/Config/config.h
@@ -646,7 +646,7 @@
 #define LLVM_VERSION_MAJOR 3
 
 /* Minor version of the LLVM API */
-#define LLVM_VERSION_MINOR 3
+#define LLVM_VERSION_MINOR 4
 
 /* Define if the OS needs help to load dependent libraries for dlopen(). */
 /* #undef LTDL_DLOPEN_DEPLIBS */
@@ -679,13 +679,13 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 3.3"
+#define PACKAGE_STRING "LLVM 3.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "llvm"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.3"
+#define PACKAGE_VERSION "3.4"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
diff --git a/host/include/llvm/Config/llvm-config.h b/host/include/llvm/Config/llvm-config.h
index 8637f41..5f3596e 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 3
+#define LLVM_VERSION_MINOR 4
 
 #include "llvm/Config/llvm-platform-config.h"
 
-- 
cgit v1.1