Auto merge of #43313 - pftbest:fix_asm, r=alexcrichton

bors · bors · commit 6c949655de6b · 2017-07-21T15:42:17.000Z
[LLVM] Fix an assertion when a weak symbol is defined in global_asm. This change will fix the issue from rust-embedded/svd2rust#130 cc @japaric r? @alexcrichton
diff --git a/src/llvm b/src/llvm
@@ -1 +1 @@
-Subproject commit a5ef0696d7c103006d3cb1f4263bad0ca13adca8
+Subproject commit d9e7d2696e41983b6b5a0b4fac604b4e548a84d3
diff --git a/src/rustllvm/llvm-rebuild-trigger b/src/rustllvm/llvm-rebuild-trigger
@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be (optionally) 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.
-2017-07-12
+2017-07-18
