From 804955f79a372b2f033b479720a7d72b6d77c48f Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 6 Feb 2014 11:29:28 -0800
Subject: [PATCH] Upgrade LLVM

Includes an upstream commit by pcwalton to improve codegen of our enums getting
moved around.
---
 mk/platform.mk                       | 6 +++---
 src/librustc/back/link.rs            | 2 --
 src/llvm                             | 2 +-
 src/rustllvm/llvm-auto-clean-trigger | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/mk/platform.mk b/mk/platform.mk
index 5a69013892c..a4a02786343 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -208,7 +208,7 @@ CFG_GCCISH_DEF_FLAG_arm-apple-darwin := -Wl,-exported_symbols_list,
 CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-darwin :=
 CFG_GCCISH_POST_LIB_FLAGS_arm-apple-darwin :=
 CFG_DEF_SUFFIX_arm-apple-darwin := .darwin.def
-CFG_LLC_FLAGS_arm-apple-darwin := -arm-enable-ehabi -arm-enable-ehabi-descriptors
+CFG_LLC_FLAGS_arm-apple-darwin :=
 CFG_INSTALL_NAME_arm-apple-darwin = -Wl,-install_name,@rpath/$(1)
 CFG_LIBUV_LINK_FLAGS_arm-apple-darwin =
 CFG_EXE_SUFFIX_arm-apple-darwin :=
@@ -290,7 +290,7 @@ CFG_GCCISH_DEF_FLAG_arm-linux-androideabi := -Wl,--export-dynamic,--dynamic-list
 CFG_GCCISH_PRE_LIB_FLAGS_arm-linux-androideabi := -Wl,-whole-archive
 CFG_GCCISH_POST_LIB_FLAGS_arm-linux-androideabi := -Wl,-no-whole-archive
 CFG_DEF_SUFFIX_arm-linux-androideabi := .android.def
-CFG_LLC_FLAGS_arm-linux-androideabi := -arm-enable-ehabi -arm-enable-ehabi-descriptors
+CFG_LLC_FLAGS_arm-linux-androideabi :=
 CFG_INSTALL_NAME_arm-linux-androideabi =
 CFG_LIBUV_LINK_FLAGS_arm-linux-androideabi =
 CFG_EXE_SUFFIX_arm-linux-androideabi :=
@@ -320,7 +320,7 @@ CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabihf := -Wl,--export-dynamic,--dynami
 CFG_GCCISH_PRE_LIB_FLAGS_arm-unknown-linux-gnueabihf := -Wl,-whole-archive
 CFG_GCCISH_POST_LIB_FLAGS_arm-unknown-linux-gnueabihf := -Wl,-no-whole-archive
 CFG_DEF_SUFFIX_arm-unknown-linux-gnueabihf := .linux.def
-CFG_LLC_FLAGS_arm-unknown-linux-gnueabihf := -arm-enable-ehabi -arm-enable-ehabi-descriptors
+CFG_LLC_FLAGS_arm-unknown-linux-gnueabihf :=
 CFG_INSTALL_NAME_ar,-unknown-linux-gnueabihf =
 CFG_LIBUV_LINK_FLAGS_arm-unknown-linux-gnueabihf =
 CFG_EXE_SUFFIX_arm-unknown-linux-gnueabihf :=
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
index 72ae70565a7..9d872b8d8f7 100644
--- a/src/librustc/back/link.rs
+++ b/src/librustc/back/link.rs
@@ -368,8 +368,6 @@ pub mod write {
                 llvm_c_strs.push(s);
             };
             add("rustc"); // fake program name
-            add("-arm-enable-ehabi");
-            add("-arm-enable-ehabi-descriptors");
             if vectorize_loop { add("-vectorize-loops"); }
             if vectorize_slp  { add("-vectorize-slp");   }
             if sess.time_llvm_passes() { add("-time-passes"); }
diff --git a/src/llvm b/src/llvm
index e1dabb48f0f..f5f1ffea207 160000
--- a/src/llvm
+++ b/src/llvm
@@ -1 +1 @@
-Subproject commit e1dabb48f0f898d1a808b3de3a26f5ee3735c7dd
+Subproject commit f5f1ffea207b6b380127ff34f14015ae005d1413
diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger
index 5b16a89b69f..bb7cad6eab6 100644
--- a/src/rustllvm/llvm-auto-clean-trigger
+++ b/src/rustllvm/llvm-auto-clean-trigger
@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
 # The actual contents of this file do not matter, but to trigger a change on the
 # build bots then the contents should be changed so git updates the mtime.
-2014-01-27
+2014-02-11